Merging upstream version 1.68.2+dfsg1.

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

8 files changed, 0 insertions, 117 deletions

diff --git a/src/test/ui/definition-reachable/auxiliary/field-method-macro.rs b/src/test/ui/definition-reachable/auxiliary/field-method-macro.rs
deleted file mode 100644
index 30ba70bdf..000000000
--- a/src/test/ui/definition-reachable/auxiliary/field-method-macro.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-#![feature(decl_macro)]
-
-mod n {
-    pub struct B(pub(crate) p::C);
-    impl B {
-        pub fn new() -> Self {
-            B(p::C)
-        }
-    }
-    mod p {
-        pub struct C;
-
-        impl C {
-            pub fn foo(&self) -> i32 {
-                33
-            }
-        }
-    }
-}
-
-pub macro m() {
-    n::B::new().0.foo()
-}
diff --git a/src/test/ui/definition-reachable/auxiliary/nested-fn-macro.rs b/src/test/ui/definition-reachable/auxiliary/nested-fn-macro.rs
deleted file mode 100644
index a39e8c986..000000000
--- a/src/test/ui/definition-reachable/auxiliary/nested-fn-macro.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#![feature(decl_macro)]
-
-mod n {
-    pub(crate) mod p {
-        pub fn f() -> i32 { 12 }
-    }
-}
-
-pub macro m() {
-    n::p::f()
-}
diff --git a/src/test/ui/definition-reachable/auxiliary/private-use-macro.rs b/src/test/ui/definition-reachable/auxiliary/private-use-macro.rs
deleted file mode 100644
index 4f283d9c1..000000000
--- a/src/test/ui/definition-reachable/auxiliary/private-use-macro.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#![feature(decl_macro)]
-
-mod n {
-    pub static S: i32 = 57;
-}
-
-use n::S;
-
-pub macro m() {
-    S
-}
diff --git a/src/test/ui/definition-reachable/field-method.rs b/src/test/ui/definition-reachable/field-method.rs
deleted file mode 100644
index 60e895a2f..000000000
--- a/src/test/ui/definition-reachable/field-method.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Check that functions accessible through a field visible to a macro are
-// considered reachable
-
-// aux-build:nested-fn-macro.rs
-// run-pass
-
-extern crate nested_fn_macro;
-
-fn main() {
-    assert_eq!(nested_fn_macro::m!(), 12);
-}
diff --git a/src/test/ui/definition-reachable/nested-fn.rs b/src/test/ui/definition-reachable/nested-fn.rs
deleted file mode 100644
index b665b049f..000000000
--- a/src/test/ui/definition-reachable/nested-fn.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Check that functions visible to macros through paths with >2 segments are
-// considered reachable
-
-// aux-build:field-method-macro.rs
-// run-pass
-
-extern crate field_method_macro;
-
-fn main() {
-    assert_eq!(field_method_macro::m!(), 33);
-}
diff --git a/src/test/ui/definition-reachable/private-non-types.rs b/src/test/ui/definition-reachable/private-non-types.rs
deleted file mode 100644
index a601dabcb..000000000
--- a/src/test/ui/definition-reachable/private-non-types.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Check that we don't require stability annotations for private modules,
-// imports and fields that are accessible to opaque macros.
-
-// check-pass
-
-#![feature(decl_macro, staged_api)]
-#![stable(feature = "test", since = "1.0.0")]
-
-extern crate std as local_std;
-use local_std::marker::Copy as LocalCopy;
-mod private_mod {
-    #[stable(feature = "test", since = "1.0.0")]
-    pub struct A {
-        pub(crate) f: i32,
-    }
-}
-
-#[stable(feature = "test", since = "1.0.0")]
-pub macro m() {}
-
-fn main() {}
diff --git a/src/test/ui/definition-reachable/private-types.rs b/src/test/ui/definition-reachable/private-types.rs
deleted file mode 100644
index 02c1224f4..000000000
--- a/src/test/ui/definition-reachable/private-types.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Check that type privacy is taken into account when considering reachability
-
-// check-pass
-
-#![feature(decl_macro, staged_api)]
-#![stable(feature = "test", since = "1.0.0")]
-
-// Type privacy should prevent use of these in other crates, so we shouldn't
-// need a stability annotation.
-fn private_function() {}
-struct PrivateStruct { f: () }
-enum PrivateEnum { V }
-union PrivateUnion { g: () }
-trait PrivateTrait {}
-
-#[stable(feature = "test", since = "1.0.0")]
-pub macro m() {}
-
-fn main() {}
diff --git a/src/test/ui/definition-reachable/private-use.rs b/src/test/ui/definition-reachable/private-use.rs
deleted file mode 100644
index 02cff0475..000000000
--- a/src/test/ui/definition-reachable/private-use.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// Check that private use statements can be used by
-
-// run-pass
-// aux-build:private-use-macro.rs
-
-extern crate private_use_macro;
-
-fn main() {
-    assert_eq!(private_use_macro::m!(), 57);
-}