From ca35ca839582d74f045a4a1eb9e1a82e29f0e032 Mon Sep 17 00:00:00 2001 From: Taylor Cramer Date: Thu, 18 Oct 2018 17:11:51 -0700 Subject: 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 --- .../non_modrs_mods_and_inline_mods/non_modrs_mods_and_inline_mods.rs | 5 +++++ src/test/ui/non_modrs_mods_and_inline_mods/x.rs | 5 +++++ src/test/ui/non_modrs_mods_and_inline_mods/x/y/z/mod.rs | 1 + 3 files changed, 11 insertions(+) create mode 100644 src/test/ui/non_modrs_mods_and_inline_mods/non_modrs_mods_and_inline_mods.rs create mode 100644 src/test/ui/non_modrs_mods_and_inline_mods/x.rs create mode 100644 src/test/ui/non_modrs_mods_and_inline_mods/x/y/z/mod.rs (limited to 'src/test') 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 -- cgit 1.4.1-3-g733a5