From 7fb5c0b0c960b12737be8bf904cd926b1898ea0c Mon Sep 17 00:00:00 2001 From: Alexander Regueiro Date: Tue, 27 Nov 2018 23:03:09 +0000 Subject: [PATCH] Cosmetic improvements --- src/reorder.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/reorder.rs b/src/reorder.rs index a865247e8056..89bafccd6ed2 100644 --- a/src/reorder.rs +++ b/src/reorder.rs @@ -37,15 +37,15 @@ use std::cmp::{Ord, Ordering}; fn compare_items(a: &ast::Item, b: &ast::Item) -> Ordering { match (&a.node, &b.node) { (&ast::ItemKind::Mod(..), &ast::ItemKind::Mod(..)) => { - a.ident.name.as_str().cmp(&b.ident.name.as_str()) + a.ident.as_str().cmp(&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.name.as_str(), |symbol| symbol.as_str()); + a_name.map_or_else(|| a.ident.as_str(), |symbol| symbol.as_str()); let b_orig_name = - b_name.map_or_else(|| b.ident.name.as_str(), |symbol| symbol.as_str()); + b_name.map_or_else(|| b.ident.as_str(), |symbol| symbol.as_str()); let result = a_orig_name.cmp(&b_orig_name); if result != Ordering::Equal { return result; @@ -57,7 +57,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.name.as_str().cmp(&b.ident.name.as_str()), + (Some(..), Some(..)) => a.ident.as_str().cmp(&b.ident.as_str()), } } _ => unreachable!(),