From 218caa410aa38c29984be31a5229b9fa717560ee Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:19:13 +0200 Subject: Merging upstream version 1.68.2+dfsg1. Signed-off-by: Daniel Baumann --- src/test/ui/modules/auxiliary/dummy_lib.rs | 2 -- src/test/ui/modules/auxiliary/two_macros_2.rs | 3 -- src/test/ui/modules/issue-56411-aux.rs | 5 --- src/test/ui/modules/issue-56411.rs | 18 ----------- src/test/ui/modules/issue-56411.stderr | 33 ------------------- src/test/ui/modules/mod-inside-fn.rs | 13 -------- src/test/ui/modules/mod-view-items.rs | 14 -------- src/test/ui/modules/mod_dir_implicit.rs | 8 ----- .../mod_dir_implicit_aux/compiletest-ignore-dir | 0 src/test/ui/modules/mod_dir_implicit_aux/mod.rs | 2 -- src/test/ui/modules/mod_dir_path.rs | 23 -------------- src/test/ui/modules/mod_dir_path2.rs | 12 ------- src/test/ui/modules/mod_dir_path3.rs | 11 ------- src/test/ui/modules/mod_dir_path_multi.rs | 17 ---------- src/test/ui/modules/mod_dir_recursive.rs | 14 -------- src/test/ui/modules/mod_dir_simple.rs | 10 ------ .../modules/mod_dir_simple/compiletest-ignore-dir | 0 .../ui/modules/mod_dir_simple/load_another_mod.rs | 3 -- src/test/ui/modules/mod_dir_simple/test.rs | 2 -- src/test/ui/modules/mod_file.rs | 10 ------ src/test/ui/modules/mod_file_aux.rs | 4 --- src/test/ui/modules/mod_file_with_path_attr.rs | 11 ------- .../compiletest-ignore-dir | 0 .../float-template/inst_f32.rs | 3 -- .../float-template/inst_f64.rs | 3 -- .../float-template/inst_float.rs | 3 -- src/test/ui/modules/path-invalid-form.rs | 4 --- src/test/ui/modules/path-invalid-form.stderr | 8 ----- src/test/ui/modules/path-macro.rs | 8 ----- src/test/ui/modules/path-macro.stderr | 8 ----- src/test/ui/modules/path-no-file-name.rs | 7 ---- src/test/ui/modules/path-no-file-name.stderr | 8 ----- src/test/ui/modules/special_module_name.rs | 8 ----- src/test/ui/modules/special_module_name.stderr | 37 ---------------------- src/test/ui/modules/special_module_name_ignore.rs | 9 ------ 35 files changed, 321 deletions(-) delete mode 100644 src/test/ui/modules/auxiliary/dummy_lib.rs delete mode 100644 src/test/ui/modules/auxiliary/two_macros_2.rs delete mode 100644 src/test/ui/modules/issue-56411-aux.rs delete mode 100644 src/test/ui/modules/issue-56411.rs delete mode 100644 src/test/ui/modules/issue-56411.stderr delete mode 100644 src/test/ui/modules/mod-inside-fn.rs delete mode 100644 src/test/ui/modules/mod-view-items.rs delete mode 100644 src/test/ui/modules/mod_dir_implicit.rs delete mode 100644 src/test/ui/modules/mod_dir_implicit_aux/compiletest-ignore-dir delete mode 100644 src/test/ui/modules/mod_dir_implicit_aux/mod.rs delete mode 100644 src/test/ui/modules/mod_dir_path.rs delete mode 100644 src/test/ui/modules/mod_dir_path2.rs delete mode 100644 src/test/ui/modules/mod_dir_path3.rs delete mode 100644 src/test/ui/modules/mod_dir_path_multi.rs delete mode 100644 src/test/ui/modules/mod_dir_recursive.rs delete mode 100644 src/test/ui/modules/mod_dir_simple.rs delete mode 100644 src/test/ui/modules/mod_dir_simple/compiletest-ignore-dir delete mode 100644 src/test/ui/modules/mod_dir_simple/load_another_mod.rs delete mode 100644 src/test/ui/modules/mod_dir_simple/test.rs delete mode 100644 src/test/ui/modules/mod_file.rs delete mode 100644 src/test/ui/modules/mod_file_aux.rs delete mode 100644 src/test/ui/modules/mod_file_with_path_attr.rs delete mode 100644 src/test/ui/modules/module-polymorphism3-files/compiletest-ignore-dir delete mode 100644 src/test/ui/modules/module-polymorphism3-files/float-template/inst_f32.rs delete mode 100644 src/test/ui/modules/module-polymorphism3-files/float-template/inst_f64.rs delete mode 100644 src/test/ui/modules/module-polymorphism3-files/float-template/inst_float.rs delete mode 100644 src/test/ui/modules/path-invalid-form.rs delete mode 100644 src/test/ui/modules/path-invalid-form.stderr delete mode 100644 src/test/ui/modules/path-macro.rs delete mode 100644 src/test/ui/modules/path-macro.stderr delete mode 100644 src/test/ui/modules/path-no-file-name.rs delete mode 100644 src/test/ui/modules/path-no-file-name.stderr delete mode 100644 src/test/ui/modules/special_module_name.rs delete mode 100644 src/test/ui/modules/special_module_name.stderr delete mode 100644 src/test/ui/modules/special_module_name_ignore.rs (limited to 'src/test/ui/modules') diff --git a/src/test/ui/modules/auxiliary/dummy_lib.rs b/src/test/ui/modules/auxiliary/dummy_lib.rs deleted file mode 100644 index ef805c1f0..000000000 --- a/src/test/ui/modules/auxiliary/dummy_lib.rs +++ /dev/null @@ -1,2 +0,0 @@ -#[allow(dead_code)] -pub struct Dummy; diff --git a/src/test/ui/modules/auxiliary/two_macros_2.rs b/src/test/ui/modules/auxiliary/two_macros_2.rs deleted file mode 100644 index 8ad2c0f12..000000000 --- a/src/test/ui/modules/auxiliary/two_macros_2.rs +++ /dev/null @@ -1,3 +0,0 @@ -macro_rules! macro_one { ($($t:tt)*) => ($($t)*) } - -macro_rules! macro_two { ($($t:tt)*) => ($($t)*) } diff --git a/src/test/ui/modules/issue-56411-aux.rs b/src/test/ui/modules/issue-56411-aux.rs deleted file mode 100644 index c8e5a0598..000000000 --- a/src/test/ui/modules/issue-56411-aux.rs +++ /dev/null @@ -1,5 +0,0 @@ -// check-pass - -struct T {} - -fn main() {} diff --git a/src/test/ui/modules/issue-56411.rs b/src/test/ui/modules/issue-56411.rs deleted file mode 100644 index 0a20f5fe9..000000000 --- a/src/test/ui/modules/issue-56411.rs +++ /dev/null @@ -1,18 +0,0 @@ -macro_rules! import { - ( $(($path:expr, $name:ident)),* ) => { - $( - #[path = $path] - mod $name; - pub use self::$name; - //~^ ERROR the name `issue_56411_aux` is defined multiple times - //~| ERROR `issue_56411_aux` is only public within the crate, and cannot be re-exported outside - - )* - } -} - -import!(("issue-56411-aux.rs", issue_56411_aux)); - -fn main() { - println!("Hello, world!"); -} diff --git a/src/test/ui/modules/issue-56411.stderr b/src/test/ui/modules/issue-56411.stderr deleted file mode 100644 index 6732a8a3d..000000000 --- a/src/test/ui/modules/issue-56411.stderr +++ /dev/null @@ -1,33 +0,0 @@ -error[E0255]: the name `issue_56411_aux` is defined multiple times - --> $DIR/issue-56411.rs:6:21 - | -LL | mod $name; - | ---------- previous definition of the module `issue_56411_aux` here -LL | pub use self::$name; - | ^^^^^^^^^^^ - | | - | `issue_56411_aux` reimported here - | you can use `as` to change the binding name of the import -... -LL | import!(("issue-56411-aux.rs", issue_56411_aux)); - | ------------------------------------------------ in this macro invocation - | - = note: `issue_56411_aux` must be defined only once in the type namespace of this module - = note: this error originates in the macro `import` (in Nightly builds, run with -Z macro-backtrace for more info) - -error[E0365]: `issue_56411_aux` is only public within the crate, and cannot be re-exported outside - --> $DIR/issue-56411.rs:6:21 - | -LL | pub use self::$name; - | ^^^^^^^^^^^ re-export of crate public `issue_56411_aux` -... -LL | import!(("issue-56411-aux.rs", issue_56411_aux)); - | ------------------------------------------------ in this macro invocation - | - = note: consider declaring type or module `issue_56411_aux` with `pub` - = note: this error originates in the macro `import` (in Nightly builds, run with -Z macro-backtrace for more info) - -error: aborting due to 2 previous errors - -Some errors have detailed explanations: E0255, E0365. -For more information about an error, try `rustc --explain E0255`. diff --git a/src/test/ui/modules/mod-inside-fn.rs b/src/test/ui/modules/mod-inside-fn.rs deleted file mode 100644 index 93050c891..000000000 --- a/src/test/ui/modules/mod-inside-fn.rs +++ /dev/null @@ -1,13 +0,0 @@ -// run-pass - -fn f() -> isize { - mod m { - pub fn g() -> isize { 720 } - } - - m::g() -} - -pub fn main() { - assert_eq!(f(), 720); -} diff --git a/src/test/ui/modules/mod-view-items.rs b/src/test/ui/modules/mod-view-items.rs deleted file mode 100644 index db2b30366..000000000 --- a/src/test/ui/modules/mod-view-items.rs +++ /dev/null @@ -1,14 +0,0 @@ -// run-pass -// Test view items inside non-file-level mods - -// This is a regression test for an issue where we were failing to -// pretty-print such view items. If that happens again, this should -// begin failing. - -// pretty-expanded FIXME #23616 - -mod m { - pub fn f() -> Vec { Vec::new() } -} - -pub fn main() { let _x = m::f(); } diff --git a/src/test/ui/modules/mod_dir_implicit.rs b/src/test/ui/modules/mod_dir_implicit.rs deleted file mode 100644 index d6ea6a98b..000000000 --- a/src/test/ui/modules/mod_dir_implicit.rs +++ /dev/null @@ -1,8 +0,0 @@ -// run-pass -// ignore-pretty issue #37195 - -mod mod_dir_implicit_aux; - -pub fn main() { - assert_eq!(mod_dir_implicit_aux::foo(), 10); -} diff --git a/src/test/ui/modules/mod_dir_implicit_aux/compiletest-ignore-dir b/src/test/ui/modules/mod_dir_implicit_aux/compiletest-ignore-dir deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/test/ui/modules/mod_dir_implicit_aux/mod.rs b/src/test/ui/modules/mod_dir_implicit_aux/mod.rs deleted file mode 100644 index 4f1eb85e4..000000000 --- a/src/test/ui/modules/mod_dir_implicit_aux/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -// run-pass -pub fn foo() -> isize { 10 } diff --git a/src/test/ui/modules/mod_dir_path.rs b/src/test/ui/modules/mod_dir_path.rs deleted file mode 100644 index 70f592d0c..000000000 --- a/src/test/ui/modules/mod_dir_path.rs +++ /dev/null @@ -1,23 +0,0 @@ -// run-pass -#![allow(unused_macros)] -// ignore-pretty issue #37195 - -mod mod_dir_simple { - #[path = "test.rs"] - pub mod syrup; -} - -pub fn main() { - assert_eq!(mod_dir_simple::syrup::foo(), 10); - - #[path = "auxiliary"] - mod foo { - mod two_macros_2; - } - - #[path = "auxiliary"] - mod bar { - macro_rules! m { () => { mod two_macros_2; } } - m!(); - } -} diff --git a/src/test/ui/modules/mod_dir_path2.rs b/src/test/ui/modules/mod_dir_path2.rs deleted file mode 100644 index c3e3e1d63..000000000 --- a/src/test/ui/modules/mod_dir_path2.rs +++ /dev/null @@ -1,12 +0,0 @@ -// run-pass -// ignore-pretty issue #37195 - -#[path = "mod_dir_simple"] -mod pancakes { - #[path = "test.rs"] - pub mod syrup; -} - -pub fn main() { - assert_eq!(pancakes::syrup::foo(), 10); -} diff --git a/src/test/ui/modules/mod_dir_path3.rs b/src/test/ui/modules/mod_dir_path3.rs deleted file mode 100644 index fed70c1bc..000000000 --- a/src/test/ui/modules/mod_dir_path3.rs +++ /dev/null @@ -1,11 +0,0 @@ -// run-pass -// ignore-pretty issue #37195 - -#[path = "mod_dir_simple"] -mod pancakes { - pub mod test; -} - -pub fn main() { - assert_eq!(pancakes::test::foo(), 10); -} diff --git a/src/test/ui/modules/mod_dir_path_multi.rs b/src/test/ui/modules/mod_dir_path_multi.rs deleted file mode 100644 index 2b805141a..000000000 --- a/src/test/ui/modules/mod_dir_path_multi.rs +++ /dev/null @@ -1,17 +0,0 @@ -// run-pass -// ignore-pretty issue #37195 - -#[path = "mod_dir_simple"] -mod biscuits { - pub mod test; -} - -#[path = "mod_dir_simple"] -mod gravy { - pub mod test; -} - -pub fn main() { - assert_eq!(biscuits::test::foo(), 10); - assert_eq!(gravy::test::foo(), 10); -} diff --git a/src/test/ui/modules/mod_dir_recursive.rs b/src/test/ui/modules/mod_dir_recursive.rs deleted file mode 100644 index b109d13d1..000000000 --- a/src/test/ui/modules/mod_dir_recursive.rs +++ /dev/null @@ -1,14 +0,0 @@ -// run-pass -// ignore-pretty issue #37195 - -// Testing that the parser for each file tracks its modules -// and paths independently. The load_another_mod module should -// not try to reuse the 'mod_dir_simple' path. - -mod mod_dir_simple { - pub mod load_another_mod; -} - -pub fn main() { - assert_eq!(mod_dir_simple::load_another_mod::test::foo(), 10); -} diff --git a/src/test/ui/modules/mod_dir_simple.rs b/src/test/ui/modules/mod_dir_simple.rs deleted file mode 100644 index 1d92c968a..000000000 --- a/src/test/ui/modules/mod_dir_simple.rs +++ /dev/null @@ -1,10 +0,0 @@ -// run-pass -// ignore-pretty issue #37195 - -mod mod_dir_simple { - pub mod test; -} - -pub fn main() { - assert_eq!(mod_dir_simple::test::foo(), 10); -} diff --git a/src/test/ui/modules/mod_dir_simple/compiletest-ignore-dir b/src/test/ui/modules/mod_dir_simple/compiletest-ignore-dir deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/test/ui/modules/mod_dir_simple/load_another_mod.rs b/src/test/ui/modules/mod_dir_simple/load_another_mod.rs deleted file mode 100644 index f96b546aa..000000000 --- a/src/test/ui/modules/mod_dir_simple/load_another_mod.rs +++ /dev/null @@ -1,3 +0,0 @@ -// run-pass -#[path = "test.rs"] -pub mod test; diff --git a/src/test/ui/modules/mod_dir_simple/test.rs b/src/test/ui/modules/mod_dir_simple/test.rs deleted file mode 100644 index 4f1eb85e4..000000000 --- a/src/test/ui/modules/mod_dir_simple/test.rs +++ /dev/null @@ -1,2 +0,0 @@ -// run-pass -pub fn foo() -> isize { 10 } diff --git a/src/test/ui/modules/mod_file.rs b/src/test/ui/modules/mod_file.rs deleted file mode 100644 index 0ca52889e..000000000 --- a/src/test/ui/modules/mod_file.rs +++ /dev/null @@ -1,10 +0,0 @@ -// run-pass -// ignore-pretty issue #37195 - -// Testing that a plain .rs file can load modules from other source files - -mod mod_file_aux; - -pub fn main() { - assert_eq!(mod_file_aux::foo(), 10); -} diff --git a/src/test/ui/modules/mod_file_aux.rs b/src/test/ui/modules/mod_file_aux.rs deleted file mode 100644 index 6d052272e..000000000 --- a/src/test/ui/modules/mod_file_aux.rs +++ /dev/null @@ -1,4 +0,0 @@ -// run-pass -// ignore-test Not a test. Used by other tests - -pub fn foo() -> isize { 10 } diff --git a/src/test/ui/modules/mod_file_with_path_attr.rs b/src/test/ui/modules/mod_file_with_path_attr.rs deleted file mode 100644 index 48e253ead..000000000 --- a/src/test/ui/modules/mod_file_with_path_attr.rs +++ /dev/null @@ -1,11 +0,0 @@ -// run-pass -// ignore-pretty issue #37195 - -// Testing that a plain .rs file can load modules from other source files - -#[path = "mod_file_aux.rs"] -mod m; - -pub fn main() { - assert_eq!(m::foo(), 10); -} diff --git a/src/test/ui/modules/module-polymorphism3-files/compiletest-ignore-dir b/src/test/ui/modules/module-polymorphism3-files/compiletest-ignore-dir deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/test/ui/modules/module-polymorphism3-files/float-template/inst_f32.rs b/src/test/ui/modules/module-polymorphism3-files/float-template/inst_f32.rs deleted file mode 100644 index 49d2b3d4b..000000000 --- a/src/test/ui/modules/module-polymorphism3-files/float-template/inst_f32.rs +++ /dev/null @@ -1,3 +0,0 @@ -// run-pass - -pub type T = f32; diff --git a/src/test/ui/modules/module-polymorphism3-files/float-template/inst_f64.rs b/src/test/ui/modules/module-polymorphism3-files/float-template/inst_f64.rs deleted file mode 100644 index e2aad480e..000000000 --- a/src/test/ui/modules/module-polymorphism3-files/float-template/inst_f64.rs +++ /dev/null @@ -1,3 +0,0 @@ -// run-pass - -pub type T = f64; diff --git a/src/test/ui/modules/module-polymorphism3-files/float-template/inst_float.rs b/src/test/ui/modules/module-polymorphism3-files/float-template/inst_float.rs deleted file mode 100644 index 5828718cd..000000000 --- a/src/test/ui/modules/module-polymorphism3-files/float-template/inst_float.rs +++ /dev/null @@ -1,3 +0,0 @@ -// run-pass - -pub type T = float; diff --git a/src/test/ui/modules/path-invalid-form.rs b/src/test/ui/modules/path-invalid-form.rs deleted file mode 100644 index 713ef4a79..000000000 --- a/src/test/ui/modules/path-invalid-form.rs +++ /dev/null @@ -1,4 +0,0 @@ -#[path = 123] //~ ERROR malformed `path` attribute -mod foo; - -fn main() {} diff --git a/src/test/ui/modules/path-invalid-form.stderr b/src/test/ui/modules/path-invalid-form.stderr deleted file mode 100644 index 7e8aa44ef..000000000 --- a/src/test/ui/modules/path-invalid-form.stderr +++ /dev/null @@ -1,8 +0,0 @@ -error: malformed `path` attribute input - --> $DIR/path-invalid-form.rs:1:1 - | -LL | #[path = 123] - | ^^^^^^^^^^^^^ help: must be of the form: `#[path = "file"]` - -error: aborting due to previous error - diff --git a/src/test/ui/modules/path-macro.rs b/src/test/ui/modules/path-macro.rs deleted file mode 100644 index ce2d1e2da..000000000 --- a/src/test/ui/modules/path-macro.rs +++ /dev/null @@ -1,8 +0,0 @@ -macro_rules! foo { - () => {"bar.rs"}; -} - -#[path = foo!()] //~ ERROR malformed `path` attribute -mod abc; - -fn main() {} diff --git a/src/test/ui/modules/path-macro.stderr b/src/test/ui/modules/path-macro.stderr deleted file mode 100644 index 9a2e01ea2..000000000 --- a/src/test/ui/modules/path-macro.stderr +++ /dev/null @@ -1,8 +0,0 @@ -error: malformed `path` attribute input - --> $DIR/path-macro.rs:5:1 - | -LL | #[path = foo!()] - | ^^^^^^^^^^^^^^^^ help: must be of the form: `#[path = "file"]` - -error: aborting due to previous error - diff --git a/src/test/ui/modules/path-no-file-name.rs b/src/test/ui/modules/path-no-file-name.rs deleted file mode 100644 index f62cd2a9e..000000000 --- a/src/test/ui/modules/path-no-file-name.rs +++ /dev/null @@ -1,7 +0,0 @@ -// normalize-stderr-test: "\.:.*\(" -> ".: $$ACCESS_DENIED_MSG (" -// normalize-stderr-test: "os error \d+" -> "os error $$ACCESS_DENIED_CODE" - -#[path = "."] -mod m; //~ ERROR couldn't read - -fn main() {} diff --git a/src/test/ui/modules/path-no-file-name.stderr b/src/test/ui/modules/path-no-file-name.stderr deleted file mode 100644 index 32a213c68..000000000 --- a/src/test/ui/modules/path-no-file-name.stderr +++ /dev/null @@ -1,8 +0,0 @@ -error: couldn't read $DIR/.: $ACCESS_DENIED_MSG (os error $ACCESS_DENIED_CODE) - --> $DIR/path-no-file-name.rs:5:1 - | -LL | mod m; - | ^^^^^^ - -error: aborting due to previous error - diff --git a/src/test/ui/modules/special_module_name.rs b/src/test/ui/modules/special_module_name.rs deleted file mode 100644 index 15c59b2da..000000000 --- a/src/test/ui/modules/special_module_name.rs +++ /dev/null @@ -1,8 +0,0 @@ -mod lib; -//~^ WARN found module declaration for lib.rs -//~| ERROR file not found for module `lib` -mod main; -//~^ WARN found module declaration for main.rs -//~| ERROR file not found for module `main` - -fn main() {} diff --git a/src/test/ui/modules/special_module_name.stderr b/src/test/ui/modules/special_module_name.stderr deleted file mode 100644 index bc4b4f1b3..000000000 --- a/src/test/ui/modules/special_module_name.stderr +++ /dev/null @@ -1,37 +0,0 @@ -error[E0583]: file not found for module `lib` - --> $DIR/special_module_name.rs:1:1 - | -LL | mod lib; - | ^^^^^^^^ - | - = help: to create the module `lib`, create file "$DIR/lib.rs" or "$DIR/lib/mod.rs" - -error[E0583]: file not found for module `main` - --> $DIR/special_module_name.rs:4:1 - | -LL | mod main; - | ^^^^^^^^^ - | - = help: to create the module `main`, create file "$DIR/main.rs" or "$DIR/main/mod.rs" - -warning: found module declaration for lib.rs - --> $DIR/special_module_name.rs:1:1 - | -LL | mod lib; - | ^^^^^^^^ - | - = note: lib.rs is the root of this crate's library target - = help: to refer to it from other targets, use the library's name as the path - = note: `#[warn(special_module_name)]` on by default - -warning: found module declaration for main.rs - --> $DIR/special_module_name.rs:4:1 - | -LL | mod main; - | ^^^^^^^^^ - | - = note: a binary crate cannot be used as library - -error: aborting due to 2 previous errors; 2 warnings emitted - -For more information about this error, try `rustc --explain E0583`. diff --git a/src/test/ui/modules/special_module_name_ignore.rs b/src/test/ui/modules/special_module_name_ignore.rs deleted file mode 100644 index 07cea9b2b..000000000 --- a/src/test/ui/modules/special_module_name_ignore.rs +++ /dev/null @@ -1,9 +0,0 @@ -// run-pass - -#[path = "auxiliary/dummy_lib.rs"] -mod lib; - -#[path = "auxiliary/dummy_lib.rs"] -mod main; - -fn main() {} -- cgit v1.2.3