Skip to content

Commit 0c2fe71

Browse files
committed
reorder: use versionsort for self/super/crate as name
Just for consistency with other use-statement parts.
1 parent 8effa5d commit 0c2fe71

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

src/imports.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ impl Ord for UseSegment {
645645
match (self, other) {
646646
(&Slf(ref a), &Slf(ref b))
647647
| (&Super(ref a), &Super(ref b))
648-
| (&Crate(ref a), &Crate(ref b)) => a.cmp(b),
648+
| (&Crate(ref a), &Crate(ref b)) => compare_as_opt_versions(&a, &b),
649649
(&Glob, &Glob) => Ordering::Equal,
650650
(&Ident(ref ia, ref aa), &Ident(ref ib, ref ab)) => {
651651
// snake_case < CamelCase < UPPER_SNAKE_CASE

tests/source/imports-reorder.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ use {ab, ac, aa, Z, b};
77
// The sort order shall follow versionsort
88
use {u8, u128, u64, u16, u32};
99
use {v1, v0200, v0030, v0002, v02000, v02001};
10+
// Order by alias should use versionsort too
11+
use {crate as crate10, crate as crate2, crate as crate1};

tests/target/imports-reorder.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ use {aa, ab, ac, b, Z};
77
// The sort order shall follow versionsort
88
use {u8, u16, u32, u64, u128};
99
use {v0002, v0030, v0200, v02000, v02001, v1};
10+
// Order by alias should use versionsort too
11+
use {crate as crate1, crate as crate2, crate as crate10};

0 commit comments

Comments
 (0)