Skip to content

Commit

Permalink
Fix match_ref_pats flagged by Clippy
Browse files Browse the repository at this point in the history
  • Loading branch information
@sanxiyn
sanxiyn committed Nov 17, 2015
1 parent c61e8fd commit 95f6ea9
Show file tree
Hide file tree
Showing 7 changed files with 57 additions and 57 deletions.
6 changes: 3 additions & 3 deletions src/libsyntax/ast.rs
View file
Expand Up @@ -1687,9 +1687,9 @@ pub enum Visibility {

impl Visibility {
pub fn inherit_from(&self, parent_visibility: Visibility) -> Visibility {
match self {
&Inherited => parent_visibility,
&Public => *self
match *self {
Inherited => parent_visibility,
Public => *self
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/libsyntax/ext/deriving/generic/ty.rs
View file
Expand Up @@ -242,8 +242,8 @@ impl<'a> LifetimeBounds<'a> {
cx.lifetime_def(span, cx.ident_of(*lt).name, bounds)
}).collect();
let ty_params = self.bounds.iter().map(|t| {
match t {
&(ref name, ref bounds) => {
match *t {
(ref name, ref bounds) => {
mk_ty_param(cx,
span,
*name,
Expand Down
6 changes: 3 additions & 3 deletions src/libsyntax/ext/quote.rs
View file
Expand Up @@ -63,9 +63,9 @@ pub mod rt {

impl<T: ToTokens> ToTokens for Option<T> {
fn to_tokens(&self, cx: &ExtCtxt) -> Vec<TokenTree> {
match self {
&Some(ref t) => t.to_tokens(cx),
&None => Vec::new(),
match *self {
Some(ref t) => t.to_tokens(cx),
None => Vec::new(),
}
}
}
Expand Down
34 changes: 17 additions & 17 deletions src/libsyntax/ext/tt/macro_parser.rs
View file
Expand Up @@ -107,16 +107,16 @@ enum TokenTreeOrTokenTreeVec {

impl TokenTreeOrTokenTreeVec {
fn len(&self) -> usize {
match self {
&TtSeq(ref v) => v.len(),
&Tt(ref tt) => tt.len(),
match *self {
TtSeq(ref v) => v.len(),
Tt(ref tt) => tt.len(),
}
}

fn get_tt(&self, index: usize) -> TokenTree {
match self {
&TtSeq(ref v) => v[index].clone(),
&Tt(ref tt) => tt.get_tt(index),
match *self {
TtSeq(ref v) => v[index].clone(),
Tt(ref tt) => tt.get_tt(index),
}
}
}
Expand Down Expand Up @@ -144,17 +144,17 @@ pub struct MatcherPos {

pub fn count_names(ms: &[TokenTree]) -> usize {
ms.iter().fold(0, |count, elt| {
count + match elt {
&TokenTree::Sequence(_, ref seq) => {
count + match *elt {
TokenTree::Sequence(_, ref seq) => {
seq.num_captures
}
&TokenTree::Delimited(_, ref delim) => {
TokenTree::Delimited(_, ref delim) => {
count_names(&delim.tts)
}
&TokenTree::Token(_, MatchNt(..)) => {
TokenTree::Token(_, MatchNt(..)) => {
1
}
&TokenTree::Token(_, _) => 0,
TokenTree::Token(_, _) => 0,
}
})
}
Expand Down Expand Up @@ -203,18 +203,18 @@ pub fn nameize(p_s: &ParseSess, ms: &[TokenTree], res: &[Rc<NamedMatch>])
-> HashMap<Name, Rc<NamedMatch>> {
fn n_rec(p_s: &ParseSess, m: &TokenTree, res: &[Rc<NamedMatch>],
ret_val: &mut HashMap<Name, Rc<NamedMatch>>, idx: &mut usize) {
match m {
&TokenTree::Sequence(_, ref seq) => {
match *m {
TokenTree::Sequence(_, ref seq) => {
for next_m in &seq.tts {
n_rec(p_s, next_m, res, ret_val, idx)
}
}
&TokenTree::Delimited(_, ref delim) => {
TokenTree::Delimited(_, ref delim) => {
for next_m in &delim.tts {
n_rec(p_s, next_m, res, ret_val, idx)
}
}
&TokenTree::Token(sp, MatchNt(bind_name, _, _, _)) => {
TokenTree::Token(sp, MatchNt(bind_name, _, _, _)) => {
match ret_val.entry(bind_name.name) {
Vacant(spot) => {
spot.insert(res[*idx].clone());
Expand All @@ -228,8 +228,8 @@ pub fn nameize(p_s: &ParseSess, ms: &[TokenTree], res: &[Rc<NamedMatch>])
}
}
}
&TokenTree::Token(_, SubstNt(..)) => panic!("Cannot fill in a NT"),
&TokenTree::Token(_, _) => (),
TokenTree::Token(_, SubstNt(..)) => panic!("Cannot fill in a NT"),
TokenTree::Token(_, _) => (),
}
}
let mut ret_val = HashMap::new();
Expand Down
36 changes: 18 additions & 18 deletions src/libsyntax/print/pprust.rs
View file
Expand Up @@ -1263,13 +1263,13 @@ impl<'a> State<'a> {
_ => {}
}

match opt_trait {
&Some(ref t) => {
match *opt_trait {
Some(ref t) => {
try!(self.print_trait_ref(t));
try!(space(&mut self.s));
try!(self.word_space("for"));
}
&None => {}
None => {}
}

try!(self.print_type(&**ty));
Expand Down Expand Up @@ -1499,10 +1499,10 @@ impl<'a> State<'a> {
try!(self.print_tt(tt));
// There should be no space between the module name and the following `::` in paths,
// otherwise imported macros get re-parsed from crate metadata incorrectly (#20701)
suppress_space = match tt {
&TokenTree::Token(_, token::Ident(_, token::ModName)) |
&TokenTree::Token(_, token::MatchNt(_, _, _, token::ModName)) |
&TokenTree::Token(_, token::SubstNt(_, token::ModName)) => true,
suppress_space = match *tt {
TokenTree::Token(_, token::Ident(_, token::ModName)) |
TokenTree::Token(_, token::MatchNt(_, _, _, token::ModName)) |
TokenTree::Token(_, token::SubstNt(_, token::ModName)) => true,
_ => false
}
}
Expand Down Expand Up @@ -2618,8 +2618,8 @@ impl<'a> State<'a> {
try!(self.rbox(0, Inconsistent));
let mut first = true;
if let Some(explicit_self) = opt_explicit_self {
let m = match explicit_self {
&ast::SelfStatic => ast::MutImmutable,
let m = match *explicit_self {
ast::SelfStatic => ast::MutImmutable,
_ => match decl.inputs[0].pat.node {
ast::PatIdent(ast::BindByValue(m), _, _) => m,
_ => ast::MutImmutable
Expand Down Expand Up @@ -2804,18 +2804,18 @@ impl<'a> State<'a> {
try!(self.word_space(","));
}

match predicate {
&ast::WherePredicate::BoundPredicate(ast::WhereBoundPredicate{ref bound_lifetimes,
ref bounded_ty,
ref bounds,
..}) => {
match *predicate {
ast::WherePredicate::BoundPredicate(ast::WhereBoundPredicate{ref bound_lifetimes,
ref bounded_ty,
ref bounds,
..}) => {
try!(self.print_formal_lifetime_list(bound_lifetimes));
try!(self.print_type(&**bounded_ty));
try!(self.print_bounds(":", bounds));
}
&ast::WherePredicate::RegionPredicate(ast::WhereRegionPredicate{ref lifetime,
ref bounds,
..}) => {
ast::WherePredicate::RegionPredicate(ast::WhereRegionPredicate{ref lifetime,
ref bounds,
..}) => {
try!(self.print_lifetime(lifetime));
try!(word(&mut self.s, ":"));

Expand All @@ -2827,7 +2827,7 @@ impl<'a> State<'a> {
}
}
}
&ast::WherePredicate::EqPredicate(ast::WhereEqPredicate{ref path, ref ty, ..}) => {
ast::WherePredicate::EqPredicate(ast::WhereEqPredicate{ref path, ref ty, ..}) => {
try!(self.print_path(path, false, 0));
try!(space(&mut self.s));
try!(self.word_space("="));
Expand Down
4 changes: 2 additions & 2 deletions src/libsyntax/test.rs
View file
Expand Up @@ -353,8 +353,8 @@ fn is_test_fn(cx: &TestCtxt, i: &ast::Item) -> bool {
let has_test_attr = attr::contains_name(&i.attrs, "test");

fn has_test_signature(i: &ast::Item) -> HasTestSignature {
match &i.node {
&ast::ItemFn(ref decl, _, _, _, ref generics, _) => {
match i.node {
ast::ItemFn(ref decl, _, _, _, ref generics, _) => {
let no_output = match decl.output {
ast::DefaultReturn(..) => true,
ast::Return(ref t) if t.node == ast::TyTup(vec![]) => true,
Expand Down
24 changes: 12 additions & 12 deletions src/libsyntax/visit.rs
View file
Expand Up @@ -496,25 +496,25 @@ pub fn walk_generics<'v, V: Visitor<'v>>(visitor: &mut V, generics: &'v Generics
}
walk_list!(visitor, visit_lifetime_def, &generics.lifetimes);
for predicate in &generics.where_clause.predicates {
match predicate {
&WherePredicate::BoundPredicate(WhereBoundPredicate{ref bounded_ty,
ref bounds,
ref bound_lifetimes,
..}) => {
match *predicate {
WherePredicate::BoundPredicate(WhereBoundPredicate{ref bounded_ty,
ref bounds,
ref bound_lifetimes,
..}) => {
visitor.visit_ty(bounded_ty);
walk_list!(visitor, visit_ty_param_bound, bounds);
walk_list!(visitor, visit_lifetime_def, bound_lifetimes);
}
&WherePredicate::RegionPredicate(WhereRegionPredicate{ref lifetime,
ref bounds,
..}) => {
WherePredicate::RegionPredicate(WhereRegionPredicate{ref lifetime,
ref bounds,
..}) => {
visitor.visit_lifetime(lifetime);
walk_list!(visitor, visit_lifetime, bounds);
}
&WherePredicate::EqPredicate(WhereEqPredicate{id,
ref path,
ref ty,
..}) => {
WherePredicate::EqPredicate(WhereEqPredicate{id,
ref path,
ref ty,
..}) => {
visitor.visit_path(path, id);
visitor.visit_ty(ty);
}
Expand Down

0 comments on commit 95f6ea9

Please sign in to comment.