Try to fix a build regression before it happens

kennytm · Apr 9, 2018 · e784712 · e784712
1 parent f146711
commit e784712
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/imports.rs b/src/imports.rs
@@ -309,19 +309,24 @@ impl UseTree {
             }
         }
 
+        let mut done = false;
         if aliased_self {
-            match self.path.last() {
+            match self.path.last_mut() {
                 Some(UseSegment::Ident(_, ref mut old_rename)) => {
                     assert!(old_rename.is_none());
-                    if let UseSegment::Slf(Some(rename)) = last {
+                    if let UseSegment::Slf(Some(rename)) = last.clone() {
                         *old_rename = Some(rename);
-                        return self;
+                        done = true;
                     }
                 }
                 _ => unreachable!(),
             }
         }
 
+        if done {
+            return self;
+        }
+
         // Normalise foo::{bar} -> foo::bar
         if let UseSegment::List(ref list) = last {
             if list.len() == 1 {