reorder: use versionsort for self/super/crate as name

Just for consistency with other use-statement parts.

Author: tanriol

rustfmt-core/rustfmt-lib/src/imports.rs

@@ -655,12 +655,7 @@ impl Ord for UseSegment {
         match (self, other) {
             (&Slf(ref a), &Slf(ref b))
             | (&Super(ref a), &Super(ref b))
-            | (&Crate(ref a), &Crate(ref b)) => match (a, b) {
-                (Some(sa), Some(sb)) => {
-                    sa.trim_start_matches("r#").cmp(sb.trim_start_matches("r#"))
-                }
-                (_, _) => a.cmp(b),
-            },
+            | (&Crate(ref a), &Crate(ref b)) => compare_opt_ident_as_versions(&a, &b),
             (&Glob, &Glob) => Ordering::Equal,
             (&Ident(ref pia, ref aa), &Ident(ref pib, ref ab)) => {
                 let ia = pia.trim_start_matches("r#");

rustfmt-core/rustfmt-lib/tests/source/imports-reorder.rs

@@ -7,3 +7,5 @@ use {ab, ac, aa, Z, b};
 // The sort order shall follow versionsort
 use {u8, u128, u64, u16, u32};
 use {v1, v0200, v0030, v0002, v02000, v02001};
+// Order by alias should use versionsort too
+use {crate as crate10, crate as crate2, crate as crate1};

rustfmt-core/rustfmt-lib/tests/target/imports-reorder.rs

@@ -7,3 +7,5 @@ use {aa, ab, ac, b, Z};
 // The sort order shall follow versionsort
 use {u8, u16, u32, u64, u128};
 use {v0002, v0030, v0200, v02000, v02001, v1};
+// Order by alias should use versionsort too
+use {crate as crate1, crate as crate2, crate as crate10};