diff options
| author | bors <bors@rust-lang.org> | 2018-10-28 13:13:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-10-28 13:13:55 +0000 |
| commit | 4f5cfa611d392e87166dfe053ca253c3e822d835 (patch) | |
| tree | fe2f5727a9d012bd90378a38ee9cf499f4ab1a73 /src/test | |
| parent | 1982f1887ad524951f24c12a6cc7bf05148aec14 (diff) | |
| parent | ca35ca839582d74f045a4a1eb9e1a82e29f0e032 (diff) | |
| download | rust-4f5cfa611d392e87166dfe053ca253c3e822d835.tar.gz rust-4f5cfa611d392e87166dfe053ca253c3e822d835.zip | |
Auto merge of #55192 - cramertj:nested-mod, r=petrochenkov
Fix ordering of nested modules in non-mod.rs mods
Flatten relative offset into directory path before adding inline
(mod x { ... }) module names to the current directory path.
Fix #55094
Diffstat (limited to 'src/test')
3 files changed, 11 insertions, 0 deletions
diff --git a/src/test/ui/non_modrs_mods_and_inline_mods/non_modrs_mods_and_inline_mods.rs b/src/test/ui/non_modrs_mods_and_inline_mods/non_modrs_mods_and_inline_mods.rs new file mode 100644 index 00000000000..25a9c2ed98e --- /dev/null +++ b/src/test/ui/non_modrs_mods_and_inline_mods/non_modrs_mods_and_inline_mods.rs @@ -0,0 +1,5 @@ +// compile-pass + +mod x; + +fn main() {} diff --git a/src/test/ui/non_modrs_mods_and_inline_mods/x.rs b/src/test/ui/non_modrs_mods_and_inline_mods/x.rs new file mode 100644 index 00000000000..a39a7c6d9b3 --- /dev/null +++ b/src/test/ui/non_modrs_mods_and_inline_mods/x.rs @@ -0,0 +1,5 @@ +// ignore-test: not a test + +pub mod y { + pub mod z; +} diff --git a/src/test/ui/non_modrs_mods_and_inline_mods/x/y/z/mod.rs b/src/test/ui/non_modrs_mods_and_inline_mods/x/y/z/mod.rs new file mode 100644 index 00000000000..e8442a47f2c --- /dev/null +++ b/src/test/ui/non_modrs_mods_and_inline_mods/x/y/z/mod.rs @@ -0,0 +1 @@ +// ignore-test: not a test |