reorder: use versionsort for mod and extern crate

Author: tanriol

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

@@ -141,14 +141,14 @@ where
 fn compare_items(a: &ast::Item, b: &ast::Item) -> Ordering {
     match (&a.kind, &b.kind) {
         (&ast::ItemKind::Mod(..), &ast::ItemKind::Mod(..)) => {
-            a.ident.as_str().cmp(&b.ident.as_str())
+            compare_as_versions(&a.ident.as_str(), &b.ident.as_str())
         }
         (&ast::ItemKind::ExternCrate(ref a_name), &ast::ItemKind::ExternCrate(ref b_name)) => {
             // `extern crate foo as bar;`
             //               ^^^ Comparing this.
             let a_orig_name = a_name.map_or_else(|| a.ident.as_str(), rustc_span::Symbol::as_str);
             let b_orig_name = b_name.map_or_else(|| b.ident.as_str(), rustc_span::Symbol::as_str);
-            let result = a_orig_name.cmp(&b_orig_name);
+            let result = compare_as_versions(&a_orig_name, &b_orig_name);
             if result != Ordering::Equal {
                 return result;
             }
@@ -159,7 +159,7 @@ fn compare_items(a: &ast::Item, b: &ast::Item) -> Ordering {
                 (Some(..), None) => Ordering::Greater,
                 (None, Some(..)) => Ordering::Less,
                 (None, None) => Ordering::Equal,
-                (Some(..), Some(..)) => a.ident.as_str().cmp(&b.ident.as_str()),
+                (Some(..), Some(..)) => compare_as_versions(&a.ident.as_str(), &b.ident.as_str()),
             }
         }
         _ => unreachable!(),

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

@@ -30,3 +30,14 @@ mod test {}
 
 use test::{a as aa, c};
 use test::{self as bb, b};
+
+#[path = "empty_file.rs"]
+mod v10;
+#[path = "empty_file.rs"]
+mod v2;
+
+extern crate crate10;
+extern crate crate2;
+
+extern crate my as c10;
+extern crate my as c2;

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

@@ -29,3 +29,14 @@ mod test {}
 
 use test::{self as bb, b};
 use test::{a as aa, c};
+
+#[path = "empty_file.rs"]
+mod v2;
+#[path = "empty_file.rs"]
+mod v10;
+
+extern crate crate2;
+extern crate crate10;
+
+extern crate my as c2;
+extern crate my as c10;