From 698f8c2f01ea549d77d7dc3338a12e04c11057b9 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:02:58 +0200 Subject: Adding upstream version 1.64.0+dfsg1. Signed-off-by: Daniel Baumann --- .../ui/modules_and_files_visibility/mod_file_aux.rs | 3 +++ .../mod_file_correct_spans.rs | 8 ++++++++ .../mod_file_correct_spans.stderr | 9 +++++++++ .../modules_and_files_visibility/mod_file_disambig.rs | 6 ++++++ .../mod_file_disambig.stderr | 18 ++++++++++++++++++ .../mod_file_disambig_aux.rs | 1 + .../mod_file_disambig_aux/mod.rs | 1 + 7 files changed, 46 insertions(+) create mode 100644 src/test/ui/modules_and_files_visibility/mod_file_aux.rs create mode 100644 src/test/ui/modules_and_files_visibility/mod_file_correct_spans.rs create mode 100644 src/test/ui/modules_and_files_visibility/mod_file_correct_spans.stderr create mode 100644 src/test/ui/modules_and_files_visibility/mod_file_disambig.rs create mode 100644 src/test/ui/modules_and_files_visibility/mod_file_disambig.stderr create mode 100644 src/test/ui/modules_and_files_visibility/mod_file_disambig_aux.rs create mode 100644 src/test/ui/modules_and_files_visibility/mod_file_disambig_aux/mod.rs (limited to 'src/test/ui/modules_and_files_visibility') diff --git a/src/test/ui/modules_and_files_visibility/mod_file_aux.rs b/src/test/ui/modules_and_files_visibility/mod_file_aux.rs new file mode 100644 index 000000000..98f42c5cd --- /dev/null +++ b/src/test/ui/modules_and_files_visibility/mod_file_aux.rs @@ -0,0 +1,3 @@ +// ignore-test Not a test. Used by other tests + +pub fn foo() -> isize { 10 } diff --git a/src/test/ui/modules_and_files_visibility/mod_file_correct_spans.rs b/src/test/ui/modules_and_files_visibility/mod_file_correct_spans.rs new file mode 100644 index 000000000..c42d2eaa7 --- /dev/null +++ b/src/test/ui/modules_and_files_visibility/mod_file_correct_spans.rs @@ -0,0 +1,8 @@ +// Testing that the source_map is maintained correctly when parsing mods from external files + +mod mod_file_aux; + +fn main() { + assert!(mod_file_aux::bar() == 10); + //~^ ERROR cannot find function `bar` in module `mod_file_aux` +} diff --git a/src/test/ui/modules_and_files_visibility/mod_file_correct_spans.stderr b/src/test/ui/modules_and_files_visibility/mod_file_correct_spans.stderr new file mode 100644 index 000000000..73044752b --- /dev/null +++ b/src/test/ui/modules_and_files_visibility/mod_file_correct_spans.stderr @@ -0,0 +1,9 @@ +error[E0425]: cannot find function `bar` in module `mod_file_aux` + --> $DIR/mod_file_correct_spans.rs:6:27 + | +LL | assert!(mod_file_aux::bar() == 10); + | ^^^ not found in `mod_file_aux` + +error: aborting due to previous error + +For more information about this error, try `rustc --explain E0425`. diff --git a/src/test/ui/modules_and_files_visibility/mod_file_disambig.rs b/src/test/ui/modules_and_files_visibility/mod_file_disambig.rs new file mode 100644 index 000000000..e5958af17 --- /dev/null +++ b/src/test/ui/modules_and_files_visibility/mod_file_disambig.rs @@ -0,0 +1,6 @@ +mod mod_file_disambig_aux; //~ ERROR file for module `mod_file_disambig_aux` found at both + +fn main() { + assert_eq!(mod_file_aux::bar(), 10); + //~^ ERROR failed to resolve: use of undeclared crate or module `mod_file_aux` +} diff --git a/src/test/ui/modules_and_files_visibility/mod_file_disambig.stderr b/src/test/ui/modules_and_files_visibility/mod_file_disambig.stderr new file mode 100644 index 000000000..a2c993969 --- /dev/null +++ b/src/test/ui/modules_and_files_visibility/mod_file_disambig.stderr @@ -0,0 +1,18 @@ +error[E0761]: file for module `mod_file_disambig_aux` found at both "$DIR/mod_file_disambig_aux.rs" and "$DIR/mod_file_disambig_aux/mod.rs" + --> $DIR/mod_file_disambig.rs:1:1 + | +LL | mod mod_file_disambig_aux; + | ^^^^^^^^^^^^^^^^^^^^^^^^^^ + | + = help: delete or rename one of them to remove the ambiguity + +error[E0433]: failed to resolve: use of undeclared crate or module `mod_file_aux` + --> $DIR/mod_file_disambig.rs:4:16 + | +LL | assert_eq!(mod_file_aux::bar(), 10); + | ^^^^^^^^^^^^ use of undeclared crate or module `mod_file_aux` + +error: aborting due to 2 previous errors + +Some errors have detailed explanations: E0433, E0761. +For more information about an error, try `rustc --explain E0433`. diff --git a/src/test/ui/modules_and_files_visibility/mod_file_disambig_aux.rs b/src/test/ui/modules_and_files_visibility/mod_file_disambig_aux.rs new file mode 100644 index 000000000..3bf9609f4 --- /dev/null +++ b/src/test/ui/modules_and_files_visibility/mod_file_disambig_aux.rs @@ -0,0 +1 @@ +// ignore-test not a test. aux file diff --git a/src/test/ui/modules_and_files_visibility/mod_file_disambig_aux/mod.rs b/src/test/ui/modules_and_files_visibility/mod_file_disambig_aux/mod.rs new file mode 100644 index 000000000..3bf9609f4 --- /dev/null +++ b/src/test/ui/modules_and_files_visibility/mod_file_disambig_aux/mod.rs @@ -0,0 +1 @@ +// ignore-test not a test. aux file -- cgit v1.2.3