Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 24 deletions

diff --git a/src/test/ui/proc-macro/edition-imports-2018.rs b/src/test/ui/proc-macro/edition-imports-2018.rs
deleted file mode 100644
index 5a77cd4ef..000000000
--- a/src/test/ui/proc-macro/edition-imports-2018.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// build-pass (FIXME(62277): could be check-pass?)
-// edition:2018
-// aux-build:edition-imports-2015.rs
-
-#[macro_use]
-extern crate edition_imports_2015;
-
-mod import {
-    pub struct Path;
-}
-mod absolute {
-    pub struct Path;
-}
-
-mod check {
-    #[derive(Derive2015)] // OK
-    struct S;
-
-    fn check() {
-        Path;
-    }
-}
-
-fn main() {}