Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 98 deletions

diff --git a/src/test/ui/deprecation/auxiliary/deprecation-lint.rs b/src/test/ui/deprecation/auxiliary/deprecation-lint.rs
deleted file mode 100644
index 948bf1cb7..000000000
--- a/src/test/ui/deprecation/auxiliary/deprecation-lint.rs
+++ /dev/null
@@ -1,98 +0,0 @@
-#![feature(deprecated)]
-
-#[deprecated(since = "1.0.0", note = "text")]
-pub fn deprecated() {}
-#[deprecated(since = "1.0.0", note = "text")]
-pub fn deprecated_text() {}
-
-pub struct MethodTester;
-
-impl MethodTester {
-    #[deprecated(since = "1.0.0", note = "text")]
-    pub fn method_deprecated(&self) {}
-    #[deprecated(since = "1.0.0", note = "text")]
-    pub fn method_deprecated_text(&self) {}
-}
-
-pub trait Trait {
-    #[deprecated(since = "1.0.0", note = "text")]
-    fn trait_deprecated(&self) {}
-    #[deprecated(since = "1.0.0", note = "text")]
-    fn trait_deprecated_text(&self) {}
-}
-
-#[deprecated(since = "1.0.0", note = "text")]
-pub trait DeprecatedTrait { fn dummy(&self) { } }
-
-impl Trait for MethodTester {}
-
-#[deprecated(since = "1.0.0", note = "text")]
-pub struct DeprecatedStruct {
-    pub i: isize
-}
-
-#[deprecated(since = "1.0.0", note = "text")]
-pub struct DeprecatedUnitStruct;
-
-pub enum Enum {
-    #[deprecated(since = "1.0.0", note = "text")]
-    DeprecatedVariant,
-}
-
-#[deprecated(since = "1.0.0", note = "text")]
-pub struct DeprecatedTupleStruct(pub isize);
-
-pub mod nested {
-    #[deprecated(since = "1.0.0", note = "text")]
-    pub struct DeprecatedStruct {
-        pub i: isize
-    }
-
-    #[deprecated(since = "1.0.0", note = "text")]
-    pub struct DeprecatedUnitStruct;
-
-    pub enum Enum {
-        #[deprecated(since = "1.0.0", note = "text")]
-        DeprecatedVariant,
-    }
-
-    #[deprecated(since = "1.0.0", note = "text")]
-    pub struct DeprecatedTupleStruct(pub isize);
-}
-
-pub struct Stable {
-    #[deprecated(since = "1.0.0", note = "text")]
-    pub override2: u8,
-}
-
-pub struct Stable2(pub u8, pub u8, #[deprecated(since = "1.0.0", note = "text")] pub u8);
-
-#[deprecated(since = "1.0.0", note = "text")]
-pub struct Deprecated {
-    pub inherit: u8,
-}
-
-#[deprecated(since = "1.0.0", note = "text")]
-pub struct Deprecated2(pub u8,
-                       pub u8,
-                       pub u8);
-
-#[deprecated(since = "1.0.0", note = "text")]
-pub mod deprecated_mod {
-    pub fn deprecated() {}
-}
-
-#[macro_export]
-macro_rules! macro_test {
-    () => (deprecated());
-}
-
-#[macro_export]
-macro_rules! macro_test_arg {
-    ($func:expr) => ($func);
-}
-
-#[macro_export]
-macro_rules! macro_test_arg_nested {
-    ($func:ident) => (macro_test_arg!($func()));
-}