bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Replace some verbose match statements with their if let equivalent.

Browse source 
No semantic changes, no enabling `if let` where it wasn't already enabled.
This commit is contained in:
jfager 2014-11-29 16:41:21 -05:00
parent 6163581451
commit 232ffa039d
43 changed files with 880 additions and 1335 deletions
Download patch file Download diff file Expand all files Collapse all files

63
src/libsyntax/parse/parser.rs
View file

@ -178,11 +178,8 @@ macro_rules! maybe_whole (
}
_ => None
};
match found {
Some(token::Interpolated(token::$constructor(x))) => {
return x.clone()
}
_ => {}
if let Some(token::Interpolated(token::$constructor(x))) = found {
return x.clone();
}
}
);
@ -194,11 +191,8 @@ macro_rules! maybe_whole (
}
_ => None
};
match found {
Some(token::Interpolated(token::$constructor(x))) => {
return x
}
_ => {}
if let Some(token::Interpolated(token::$constructor(x))) = found {
return x;
}
}
);
@ -210,11 +204,8 @@ macro_rules! maybe_whole (
}
_ => None
};
match found {
Some(token::Interpolated(token::$constructor(x))) => {
return (*x).clone()
}
_ => {}
if let Some(token::Interpolated(token::$constructor(x))) = found {
return (*x).clone();
}
}
);
@ -226,11 +217,8 @@ macro_rules! maybe_whole (
}
_ => None
};
match found {
Some(token::Interpolated(token::$constructor(x))) => {
return Some(x.clone()),
}
_ => {}
if let Some(token::Interpolated(token::$constructor(x))) = found {
return Some(x.clone());
}
}
);
@ -242,11 +230,8 @@ macro_rules! maybe_whole (
}
_ => None
};
match found {
Some(token::Interpolated(token::$constructor(x))) => {
return IoviItem(x.clone())
}
_ => {}
if let Some(token::Interpolated(token::$constructor(x))) = found {
return IoviItem(x.clone());
}
}
);
@ -258,11 +243,8 @@ macro_rules! maybe_whole (
}
_ => None
};
match found {
Some(token::Interpolated(token::$constructor(x))) => {
return (Vec::new(), x)
}
_ => {}
if let Some(token::Interpolated(token::$constructor(x))) = found {
return (Vec::new(), x);
}
}
)
@ -469,15 +451,11 @@ impl<'a> Parser<'a> {
/// from anticipated input errors, discarding erroneous characters.
pub fn commit_expr(&mut self, e: &Expr, edible: &[token::Token], inedible: &[token::Token]) {
debug!("commit_expr {}", e);
match e.node {
ExprPath(..) => {
// might be unit-struct construction; check for recoverableinput error.
let mut expected = edible.iter().map(|x| x.clone()).collect::<Vec<_>>();
expected.push_all(inedible);
self.check_for_erroneous_unit_struct_expecting(
expected.as_slice());
}
_ => {}
if let ExprPath(..) = e.node {
// might be unit-struct construction; check for recoverableinput error.
let mut expected = edible.iter().map(|x| x.clone()).collect::<Vec<_>>();
expected.push_all(inedible);
self.check_for_erroneous_unit_struct_expecting(expected.as_slice());
}
self.expect_one_of(edible, inedible)
}
@ -1764,11 +1742,8 @@ impl<'a> Parser<'a> {
token::Interpolated(token::NtPath(_)) => Some(self.bump_and_get()),
_ => None,
};
match found {
Some(token::Interpolated(token::NtPath(box path))) => {
return path;
}
_ => {}
if let Some(token::Interpolated(token::NtPath(box path))) = found {
return path;
}
let lo = self.span.lo;