From ce428cf6a3624c5cf197cfafd3976378b2b174f3 Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Tue, 31 Mar 2026 13:42:35 +0000 Subject: [PATCH] fix: rename rustfmt test modules to avoid case-insensitive path collisions Cloning the repo on Windows leads to this warning: warning: the following paths have collided (e.g. case-sensitive paths on a case-insensitive filesystem) and only one from the same colliding group is in the working tree: 'src/tools/rustfmt/tests/source/reorder_modules/ABCD/mod.rs' 'src/tools/rustfmt/tests/source/reorder_modules/abcd/mod.rs' 'src/tools/rustfmt/tests/source/reorder_modules/ZYXW/mod.rs' 'src/tools/rustfmt/tests/source/reorder_modules/zyxw/mod.rs' 'src/tools/rustfmt/tests/target/reorder_modules/ABCD/mod.rs' 'src/tools/rustfmt/tests/target/reorder_modules/abcd/mod.rs' 'src/tools/rustfmt/tests/target/reorder_modules/ZYXW/mod.rs' 'src/tools/rustfmt/tests/target/reorder_modules/zyxw/mod.rs' Rename the lowercase variants (abcd -> abcde, zyxw -> zyxwv) to avoid case-insensitive collisions while preserving test intent. --- .../tests/source/reorder_modules/{abcd => abcde}/mod.rs | 0 .../source/reorder_modules/disabled_style_edition_2024.rs | 8 ++++---- .../source/reorder_modules/disabled_style_edition_2027.rs | 8 ++++---- .../source/reorder_modules/enabled_style_edition_2015.rs | 8 ++++---- .../source/reorder_modules/enabled_style_edition_2024.rs | 8 ++++---- .../source/reorder_modules/enabled_style_edition_2027.rs | 8 ++++---- .../tests/source/reorder_modules/{zyxw => zyxwv}/mod.rs | 0 .../tests/target/reorder_modules/{abcd => abcde}/mod.rs | 0 .../target/reorder_modules/disabled_style_edition_2024.rs | 8 ++++---- .../target/reorder_modules/disabled_style_edition_2027.rs | 8 ++++---- .../target/reorder_modules/enabled_style_edition_2015.rs | 8 ++++---- .../target/reorder_modules/enabled_style_edition_2024.rs | 8 ++++---- .../target/reorder_modules/enabled_style_edition_2027.rs | 8 ++++---- .../tests/target/reorder_modules/{zyxw => zyxwv}/mod.rs | 0 14 files changed, 40 insertions(+), 40 deletions(-) rename src/tools/rustfmt/tests/source/reorder_modules/{abcd => abcde}/mod.rs (100%) rename src/tools/rustfmt/tests/source/reorder_modules/{zyxw => zyxwv}/mod.rs (100%) rename src/tools/rustfmt/tests/target/reorder_modules/{abcd => abcde}/mod.rs (100%) rename src/tools/rustfmt/tests/target/reorder_modules/{zyxw => zyxwv}/mod.rs (100%) diff --git a/src/tools/rustfmt/tests/source/reorder_modules/abcd/mod.rs b/src/tools/rustfmt/tests/source/reorder_modules/abcde/mod.rs similarity index 100% rename from src/tools/rustfmt/tests/source/reorder_modules/abcd/mod.rs rename to src/tools/rustfmt/tests/source/reorder_modules/abcde/mod.rs diff --git a/src/tools/rustfmt/tests/source/reorder_modules/disabled_style_edition_2024.rs b/src/tools/rustfmt/tests/source/reorder_modules/disabled_style_edition_2024.rs index d97f9a6da7425..81b969e89eff4 100644 --- a/src/tools/rustfmt/tests/source/reorder_modules/disabled_style_edition_2024.rs +++ b/src/tools/rustfmt/tests/source/reorder_modules/disabled_style_edition_2024.rs @@ -5,9 +5,9 @@ mod x86; mod v0s; mod v001; mod x87; -mod zyxw; +mod zyxwv; mod A2; -mod ZYXW; +mod zyxwv; mod w5s009t; mod u8; mod x86_128; @@ -33,10 +33,10 @@ mod v09; mod u256; mod ZY_XW; mod _abcd; -mod ABCD; +mod abcde; mod Z_YXW; mod u64; -mod abcd; +mod abcde; mod ZYXW_; mod u16; mod uz; diff --git a/src/tools/rustfmt/tests/source/reorder_modules/disabled_style_edition_2027.rs b/src/tools/rustfmt/tests/source/reorder_modules/disabled_style_edition_2027.rs index f5f0cb6357f74..9765340ccee50 100644 --- a/src/tools/rustfmt/tests/source/reorder_modules/disabled_style_edition_2027.rs +++ b/src/tools/rustfmt/tests/source/reorder_modules/disabled_style_edition_2027.rs @@ -5,9 +5,9 @@ mod x86; mod v0s; mod v001; mod x87; -mod zyxw; +mod zyxwv; mod A2; -mod ZYXW; +mod zyxwv; mod w5s009t; mod u8; mod x86_128; @@ -33,10 +33,10 @@ mod v09; mod u256; mod ZY_XW; mod _abcd; -mod ABCD; +mod abcde; mod Z_YXW; mod u64; -mod abcd; +mod abcde; mod ZYXW_; mod u16; mod uz; diff --git a/src/tools/rustfmt/tests/source/reorder_modules/enabled_style_edition_2015.rs b/src/tools/rustfmt/tests/source/reorder_modules/enabled_style_edition_2015.rs index 0243a1da849a7..7d140347a31c2 100644 --- a/src/tools/rustfmt/tests/source/reorder_modules/enabled_style_edition_2015.rs +++ b/src/tools/rustfmt/tests/source/reorder_modules/enabled_style_edition_2015.rs @@ -5,9 +5,9 @@ mod x86; mod v0s; mod v001; mod x87; -mod zyxw; +mod zyxwv; mod A2; -mod ZYXW; +mod zyxwv; mod w5s009t; mod u8; mod x86_128; @@ -33,10 +33,10 @@ mod v09; mod u256; mod ZY_XW; mod _abcd; -mod ABCD; +mod abcde; mod Z_YXW; mod u64; -mod abcd; +mod abcde; mod ZYXW_; mod u16; mod uz; diff --git a/src/tools/rustfmt/tests/source/reorder_modules/enabled_style_edition_2024.rs b/src/tools/rustfmt/tests/source/reorder_modules/enabled_style_edition_2024.rs index 6a9a5c8d60771..84619a4c9b176 100644 --- a/src/tools/rustfmt/tests/source/reorder_modules/enabled_style_edition_2024.rs +++ b/src/tools/rustfmt/tests/source/reorder_modules/enabled_style_edition_2024.rs @@ -5,9 +5,9 @@ mod x86; mod v0s; mod v001; mod x87; -mod zyxw; +mod zyxwv; mod A2; -mod ZYXW; +mod zyxwv; mod w5s009t; mod u8; mod x86_128; @@ -33,10 +33,10 @@ mod v09; mod u256; mod ZY_XW; mod _abcd; -mod ABCD; +mod abcde; mod Z_YXW; mod u64; -mod abcd; +mod abcde; mod ZYXW_; mod u16; mod uz; diff --git a/src/tools/rustfmt/tests/source/reorder_modules/enabled_style_edition_2027.rs b/src/tools/rustfmt/tests/source/reorder_modules/enabled_style_edition_2027.rs index 46f6abe93120f..1f9489cdda418 100644 --- a/src/tools/rustfmt/tests/source/reorder_modules/enabled_style_edition_2027.rs +++ b/src/tools/rustfmt/tests/source/reorder_modules/enabled_style_edition_2027.rs @@ -5,9 +5,9 @@ mod x86; mod v0s; mod v001; mod x87; -mod zyxw; +mod zyxwv; mod A2; -mod ZYXW; +mod zyxwv; mod w5s009t; mod u8; mod x86_128; @@ -33,10 +33,10 @@ mod v09; mod u256; mod ZY_XW; mod _abcd; -mod ABCD; +mod abcde; mod Z_YXW; mod u64; -mod abcd; +mod abcde; mod ZYXW_; mod u16; mod uz; diff --git a/src/tools/rustfmt/tests/source/reorder_modules/zyxw/mod.rs b/src/tools/rustfmt/tests/source/reorder_modules/zyxwv/mod.rs similarity index 100% rename from src/tools/rustfmt/tests/source/reorder_modules/zyxw/mod.rs rename to src/tools/rustfmt/tests/source/reorder_modules/zyxwv/mod.rs diff --git a/src/tools/rustfmt/tests/target/reorder_modules/abcd/mod.rs b/src/tools/rustfmt/tests/target/reorder_modules/abcde/mod.rs similarity index 100% rename from src/tools/rustfmt/tests/target/reorder_modules/abcd/mod.rs rename to src/tools/rustfmt/tests/target/reorder_modules/abcde/mod.rs diff --git a/src/tools/rustfmt/tests/target/reorder_modules/disabled_style_edition_2024.rs b/src/tools/rustfmt/tests/target/reorder_modules/disabled_style_edition_2024.rs index d97f9a6da7425..81b969e89eff4 100644 --- a/src/tools/rustfmt/tests/target/reorder_modules/disabled_style_edition_2024.rs +++ b/src/tools/rustfmt/tests/target/reorder_modules/disabled_style_edition_2024.rs @@ -5,9 +5,9 @@ mod x86; mod v0s; mod v001; mod x87; -mod zyxw; +mod zyxwv; mod A2; -mod ZYXW; +mod zyxwv; mod w5s009t; mod u8; mod x86_128; @@ -33,10 +33,10 @@ mod v09; mod u256; mod ZY_XW; mod _abcd; -mod ABCD; +mod abcde; mod Z_YXW; mod u64; -mod abcd; +mod abcde; mod ZYXW_; mod u16; mod uz; diff --git a/src/tools/rustfmt/tests/target/reorder_modules/disabled_style_edition_2027.rs b/src/tools/rustfmt/tests/target/reorder_modules/disabled_style_edition_2027.rs index f5f0cb6357f74..9765340ccee50 100644 --- a/src/tools/rustfmt/tests/target/reorder_modules/disabled_style_edition_2027.rs +++ b/src/tools/rustfmt/tests/target/reorder_modules/disabled_style_edition_2027.rs @@ -5,9 +5,9 @@ mod x86; mod v0s; mod v001; mod x87; -mod zyxw; +mod zyxwv; mod A2; -mod ZYXW; +mod zyxwv; mod w5s009t; mod u8; mod x86_128; @@ -33,10 +33,10 @@ mod v09; mod u256; mod ZY_XW; mod _abcd; -mod ABCD; +mod abcde; mod Z_YXW; mod u64; -mod abcd; +mod abcde; mod ZYXW_; mod u16; mod uz; diff --git a/src/tools/rustfmt/tests/target/reorder_modules/enabled_style_edition_2015.rs b/src/tools/rustfmt/tests/target/reorder_modules/enabled_style_edition_2015.rs index b3831df6d86cd..43856c14c93cf 100644 --- a/src/tools/rustfmt/tests/target/reorder_modules/enabled_style_edition_2015.rs +++ b/src/tools/rustfmt/tests/target/reorder_modules/enabled_style_edition_2015.rs @@ -2,8 +2,8 @@ // rustfmt-reorder_modules: true mod A2; -mod ABCD; -mod ZYXW; +mod abcde; +mod zyxwv; mod ZYXW_; mod ZY_XW; mod ZY_XW; @@ -11,7 +11,7 @@ mod Z_YXW; mod _ZYXW; mod _abcd; mod a1; -mod abcd; +mod abcde; mod u128; mod u16; mod u256; @@ -44,4 +44,4 @@ mod x86_128; mod x86_32; mod x86_64; mod x87; -mod zyxw; +mod zyxwv; diff --git a/src/tools/rustfmt/tests/target/reorder_modules/enabled_style_edition_2024.rs b/src/tools/rustfmt/tests/target/reorder_modules/enabled_style_edition_2024.rs index addc555aa0ed4..df4954f3dedbd 100644 --- a/src/tools/rustfmt/tests/target/reorder_modules/enabled_style_edition_2024.rs +++ b/src/tools/rustfmt/tests/target/reorder_modules/enabled_style_edition_2024.rs @@ -2,8 +2,8 @@ // rustfmt-reorder_modules: true mod A2; -mod ABCD; -mod ZYXW; +mod abcde; +mod zyxwv; mod ZYXW_; mod ZY_XW; mod ZY_XW; @@ -11,7 +11,7 @@ mod Z_YXW; mod _ZYXW; mod _abcd; mod a1; -mod abcd; +mod abcde; mod u128; mod u16; mod u256; @@ -44,4 +44,4 @@ mod x86_128; mod x86_32; mod x86_64; mod x87; -mod zyxw; +mod zyxwv; diff --git a/src/tools/rustfmt/tests/target/reorder_modules/enabled_style_edition_2027.rs b/src/tools/rustfmt/tests/target/reorder_modules/enabled_style_edition_2027.rs index 44acabd75f54b..b49398296f868 100644 --- a/src/tools/rustfmt/tests/target/reorder_modules/enabled_style_edition_2027.rs +++ b/src/tools/rustfmt/tests/target/reorder_modules/enabled_style_edition_2027.rs @@ -4,14 +4,14 @@ mod _ZYXW; mod _abcd; mod A2; -mod ABCD; +mod abcde; mod Z_YXW; mod ZY_XW; mod ZY_XW; -mod ZYXW; +mod zyxwv; mod ZYXW_; mod a1; -mod abcd; +mod abcde; mod u_zzz; mod u8; mod u16; @@ -44,4 +44,4 @@ mod x86_32; mod x86_64; mod x86_128; mod x87; -mod zyxw; +mod zyxwv; diff --git a/src/tools/rustfmt/tests/target/reorder_modules/zyxw/mod.rs b/src/tools/rustfmt/tests/target/reorder_modules/zyxwv/mod.rs similarity index 100% rename from src/tools/rustfmt/tests/target/reorder_modules/zyxw/mod.rs rename to src/tools/rustfmt/tests/target/reorder_modules/zyxwv/mod.rs