From 64d98f8ee037282c35007b64c2649055c56af1db Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:19:03 +0200 Subject: Merging upstream version 1.68.2+dfsg1. Signed-off-by: Daniel Baumann --- src/test/ui/missing_non_modrs_mod/foo.rs | 4 ---- src/test/ui/missing_non_modrs_mod/foo_inline.rs | 5 ----- src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod.rs | 2 -- .../ui/missing_non_modrs_mod/missing_non_modrs_mod.stderr | 11 ----------- .../ui/missing_non_modrs_mod/missing_non_modrs_mod_inline.rs | 2 -- .../missing_non_modrs_mod/missing_non_modrs_mod_inline.stderr | 11 ----------- 6 files changed, 35 deletions(-) delete mode 100644 src/test/ui/missing_non_modrs_mod/foo.rs delete mode 100644 src/test/ui/missing_non_modrs_mod/foo_inline.rs delete mode 100644 src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod.rs delete mode 100644 src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod.stderr delete mode 100644 src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod_inline.rs delete mode 100644 src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod_inline.stderr (limited to 'src/test/ui/missing_non_modrs_mod') diff --git a/src/test/ui/missing_non_modrs_mod/foo.rs b/src/test/ui/missing_non_modrs_mod/foo.rs deleted file mode 100644 index 4f41316c8..000000000 --- a/src/test/ui/missing_non_modrs_mod/foo.rs +++ /dev/null @@ -1,4 +0,0 @@ -// -// ignore-test this is just a helper for the real test in this dir - -mod missing; diff --git a/src/test/ui/missing_non_modrs_mod/foo_inline.rs b/src/test/ui/missing_non_modrs_mod/foo_inline.rs deleted file mode 100644 index df60629ec..000000000 --- a/src/test/ui/missing_non_modrs_mod/foo_inline.rs +++ /dev/null @@ -1,5 +0,0 @@ -// ignore-test this is just a helper for the real test in this dir - -mod inline { - mod missing; -} diff --git a/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod.rs b/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod.rs deleted file mode 100644 index 4ff975af6..000000000 --- a/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod foo; -fn main() {} diff --git a/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod.stderr b/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod.stderr deleted file mode 100644 index 31e4206a5..000000000 --- a/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod.stderr +++ /dev/null @@ -1,11 +0,0 @@ -error[E0583]: file not found for module `missing` - --> $DIR/foo.rs:4:1 - | -LL | mod missing; - | ^^^^^^^^^^^^ - | - = help: to create the module `missing`, create file "$DIR/foo/missing.rs" or "$DIR/foo/missing/mod.rs" - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0583`. diff --git a/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod_inline.rs b/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod_inline.rs deleted file mode 100644 index 9ebb4f1bd..000000000 --- a/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod_inline.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod foo_inline; -fn main() {} diff --git a/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod_inline.stderr b/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod_inline.stderr deleted file mode 100644 index 9d252398b..000000000 --- a/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod_inline.stderr +++ /dev/null @@ -1,11 +0,0 @@ -error[E0583]: file not found for module `missing` - --> $DIR/foo_inline.rs:4:5 - | -LL | mod missing; - | ^^^^^^^^^^^^ - | - = help: to create the module `missing`, create file "$DIR/foo_inline/inline/missing.rs" or "$DIR/foo_inline/inline/missing/mod.rs" - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0583`. -- cgit v1.2.3