Relocate modules_and_files_visibility/mod_file_disambig.rs to

modules/mod_file_disambig.rs

add

fix

Author: reddevilmidzy

tests/ui/README.md

@@ -957,10 +957,6 @@ Tests on the module system.
 
 **FIXME**: `tests/ui/imports/` should probably be merged with this.
 
-## `tests/ui/modules_and_files_visibility/`
-
-**FIXME**: Merge with `tests/ui/modules/`.
-
 ## `tests/ui/moves`
 
 Tests on moves (destructive moves).

tests/ui/modules/mod_file_aux.rs

@@ -1,3 +1,4 @@
 //@ ignore-auxiliary (used by `./mod_file_with_path_attr.rs` and `mod_file.rs` and `mod_file_correct_spans.rs`)
+// ignore-tidy-linelength
 
 pub fn foo() -> isize { 10 }

tests/ui/modules/mod_file_disambig.rs

@@ -0,0 +1,5 @@
+//! related issue <https://github.com/rust-lang/rust/issues/4116>
+
+mod mod_file_disambig_aux; //~ ERROR file for module `mod_file_disambig_aux` found at both
+
+fn main() {}

tests/ui/modules/mod_file_disambig.stderr

@@ -0,0 +1,11 @@
+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:3:1
+   |
+LL | mod mod_file_disambig_aux;
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = help: delete or rename one of them to remove the ambiguity
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0761`.