Merge pull request #2889 from topecongiro/issue-2888

Handle imports with items whose name contains digits

src/imports.rs

@@ -597,7 +597,8 @@ fn cmp(&self, other: &UseSegment) -> Ordering {
         use self::UseSegment::*;
 
         fn is_upper_snake_case(s: &str) -> bool {
-            s.chars().all(|c| c.is_uppercase() || c == '_')
+            s.chars()
+                .all(|c| c.is_uppercase() || c == '_' || c.is_numeric())
         }
 
         match (self, other) {

tests/source/imports.rs

@@ -98,3 +98,6 @@ fn test() {
 // #2670
 #[macro_use]
 use imports_with_attr;
+
+// #2888
+use std::f64::consts::{SQRT_2, E, PI};

tests/target/imports.rs

@@ -120,3 +120,6 @@ fn test() {
 // #2670
 #[macro_use]
 use imports_with_attr;
+
+// #2888
+use std::f64::consts::{E, PI, SQRT_2};