Fix libsyntax updates

[rust.git] / src / reorder.rs

diff --git a/src/reorder.rs b/src/reorder.rs
index 5595fa5b237ba6373575dc9c577daa55502fc6e2..b216313f3b034816862942f1c7cd9268743b5a8e 100644 (file)
--- a/src/reorder.rs
+++ b/src/reorder.rs
@@ -321,11 +321,13 @@ fn from_ast(a: &ast::UseTree) -> UseTree {
             }
             UseTreeKind::Simple(ref rename) => {
                 let mut name = (*path_to_imported_ident(&a.prefix).name.as_str()).to_owned();
-                let alias = if &name == &*rename.name.as_str() {
-                    None
-                } else {
-                    Some((&*rename.name.as_str()).to_owned())
-                };
+                let alias = rename.and_then(|ident| {
+                    if ident == path_to_imported_ident(&a.prefix) {
+                        None
+                    } else {
+                        Some(ident.to_string())
+                    }
+                });
 
                 let segment = if &name == "self" {
                     UseSegment::Slf(alias)