reorder: use versionsort for item names

Author: tanriol

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

@@ -23,6 +23,7 @@ use crate::expr::{
 use crate::lists::{definitive_tactic, itemize_list, write_list, ListFormatting, Separator};
 use crate::macros::{rewrite_macro, MacroPosition};
 use crate::overflow;
+use crate::reorder::compare_as_versions;
 use crate::rewrite::{Rewrite, RewriteContext};
 use crate::shape::{Indent, Shape};
 use crate::source_map::{LineRangeUtils, SpanUtils};
@@ -695,10 +696,10 @@ impl<'a> FmtVisitor<'a> {
                 (TyAlias(_, ref lty), TyAlias(_, ref rty))
                     if both_type(lty, rty) || both_opaque(lty, rty) =>
                 {
-                    a.ident.as_str().cmp(&b.ident.as_str())
+                    compare_as_versions(&a.ident.as_str(), &b.ident.as_str())
                 }
                 (Const(..), Const(..)) | (Macro(..), Macro(..)) => {
-                    a.ident.as_str().cmp(&b.ident.as_str())
+                    compare_as_versions(&a.ident.as_str(), &b.ident.as_str())
                 }
                 (Fn(..), Fn(..)) => a.span.lo().cmp(&b.span.lo()),
                 (TyAlias(_, ref ty), _) if is_type(ty) => Ordering::Less,

rustfmt-core/rustfmt-lib/tests/source/issue-2863.rs

@@ -22,4 +22,6 @@ impl<T> IntoIterator for SafeVec<T> {
     type E = impl Trait;
     const AnotherConst: i32 = 100;
     fn foo8() {println!("hello, world");}
+    const AnyConst10: i32 = 100;
+    const AnyConst2: i32 = 100;
 }

rustfmt-core/rustfmt-lib/tests/target/issue-2863.rs

@@ -13,6 +13,8 @@ impl<T> IntoIterator for SafeVec<T> {
     type F = impl Trait;
 
     const AnotherConst: i32 = 100;
+    const AnyConst2: i32 = 100;
+    const AnyConst10: i32 = 100;
     const SomeConst: i32 = 100;
 
     // comment on foo()