From: topecongiro Date: Fri, 15 Sep 2017 08:09:30 +0000 (+0900) Subject: Remove unnecessary references X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=0b5d524486f572bf876df8a3c1c821506916bb97;p=rust.git Remove unnecessary references --- diff --git a/src/expr.rs b/src/expr.rs index 0b9511e02ce..a18d2581735 100644 --- a/src/expr.rs +++ b/src/expr.rs @@ -294,7 +294,7 @@ fn needs_space_before_range(context: &RewriteContext, lhs: &ast::Expr) -> bool { Some(format!( "{}{}", "do catch ", - try_opt!(block.rewrite(&context, Shape::legacy(budget, shape.indent))) + try_opt!(block.rewrite(context, Shape::legacy(budget, shape.indent))) )) } } @@ -3004,17 +3004,17 @@ fn can_be_overflowed(&self, _: &RewriteContext, _: usize) -> bool { impl<'a> ToExpr for MacroArg { fn to_expr(&self) -> Option<&ast::Expr> { - match self { - &MacroArg::Expr(ref expr) => Some(expr), + match *self { + MacroArg::Expr(ref expr) => Some(expr), _ => None, } } fn can_be_overflowed(&self, context: &RewriteContext, len: usize) -> bool { - match self { - &MacroArg::Expr(ref expr) => can_be_overflowed_expr(context, expr, len), - &MacroArg::Ty(ref ty) => can_be_overflowed_type(context, ty, len), - &MacroArg::Pat(..) => false, + match *self { + MacroArg::Expr(ref expr) => can_be_overflowed_expr(context, expr, len), + MacroArg::Ty(ref ty) => can_be_overflowed_type(context, ty, len), + MacroArg::Pat(..) => false, } } } diff --git a/src/items.rs b/src/items.rs index 79a178dd363..f469ca8a11b 100644 --- a/src/items.rs +++ b/src/items.rs @@ -330,7 +330,7 @@ fn single_line_fn(&self, fn_str: &str, block: &ast::Block) -> Option { "" }; - format_expr(&e, ExprType::Statement, &self.get_context(), self.shape()) + format_expr(e, ExprType::Statement, &self.get_context(), self.shape()) .map(|s| s + suffix) .or_else(|| Some(self.snippet(e.span))) } diff --git a/src/lists.rs b/src/lists.rs index 8d9357a0cc1..42edc3d3d3c 100644 --- a/src/lists.rs +++ b/src/lists.rs @@ -114,7 +114,7 @@ pub struct ListItem { impl ListItem { pub fn inner_as_ref(&self) -> &str { - self.item.as_ref().map_or("", |s| &*s) + self.item.as_ref().map_or("", |s| s) } pub fn is_different_group(&self) -> bool { diff --git a/src/visitor.rs b/src/visitor.rs index 832883c2c3e..d2e94540240 100644 --- a/src/visitor.rs +++ b/src/visitor.rs @@ -340,7 +340,7 @@ pub fn visit_item(&mut self, item: &ast::Item) { } match item.node { - ast::ItemKind::Use(ref vp) => self.format_import(&item, vp), + ast::ItemKind::Use(ref vp) => self.format_import(item, vp), ast::ItemKind::Impl(..) => { let snippet = self.snippet(item.span); let where_span_end = snippet @@ -381,7 +381,7 @@ pub fn visit_item(&mut self, item: &ast::Item) { } ast::ItemKind::Mod(ref module) => { self.format_missing_with_indent(source!(self, item.span).lo()); - self.format_mod(module, &item.vis, item.span, item.ident, &attrs); + self.format_mod(module, &item.vis, item.span, item.ident, attrs); } ast::ItemKind::Mac(ref mac) => { self.visit_mac(mac, Some(item.ident), MacroPosition::Item);