Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 56 deletions

diff --git a/src/test/ui/privacy/privacy-ns1.rs b/src/test/ui/privacy/privacy-ns1.rs
deleted file mode 100644
index 1af5b857e..000000000
--- a/src/test/ui/privacy/privacy-ns1.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-// Check we do the correct privacy checks when we import a name and there is an
-// item with that name in both the value and type namespaces.
-
-#![allow(dead_code)]
-#![allow(unused_imports)]
-
-
-// public type, private value
-pub mod foo1 {
-    pub trait Bar {
-    }
-    pub struct Baz;
-
-    fn Bar() { }
-}
-
-fn test_glob1() {
-    use foo1::*;
-
-    Bar();  //~ ERROR expected function, tuple struct or tuple variant, found trait `Bar`
-}
-
-// private type, public value
-pub mod foo2 {
-    trait Bar {
-    }
-    pub struct Baz;
-
-    pub fn Bar() { }
-}
-
-fn test_glob2() {
-    use foo2::*;
-
-    let _x: Box<Bar>;
-    //~^ ERROR constant provided when a type was expected
-}
-
-// neither public
-pub mod foo3 {
-    trait Bar {
-    }
-    pub struct Baz;
-
-    fn Bar() { }
-}
-
-fn test_glob3() {
-    use foo3::*;
-
-    Bar();  //~ ERROR cannot find function, tuple struct or tuple variant `Bar` in this scope
-    let _x: Box<Bar>;  //~ ERROR cannot find type `Bar` in this scope
-}
-
-fn main() {
-}