Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 14 deletions

diff --git a/src/test/ui/hygiene/hygiene-dodging-1.rs b/src/test/ui/hygiene/hygiene-dodging-1.rs
deleted file mode 100644
index 69e47e82b..000000000
--- a/src/test/ui/hygiene/hygiene-dodging-1.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// run-pass
-#![allow(unused_must_use)]
-
-mod x {
-    pub fn g() -> usize {14}
-}
-
-pub fn main(){
-    // should *not* shadow the module x:
-    let x = 9;
-    // use it to avoid warnings:
-    x+3;
-    assert_eq!(x::g(),14);
-}