Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-11-24 05:33:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #679 from mcarton/rustup

Browse source 
Rustup to 1.8.0-nightly (57c357d89 2016-02-16)
This commit is contained in:
Martin Carton 2016-02-17 15:53:28 +01:00
commit 7250738edf
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/misc_early.rs
View file

@ -43,7 +43,7 @@ impl LintPass for MiscEarly {
impl EarlyLintPass for MiscEarly {
fn check_pat(&mut self, cx: &EarlyContext, pat: &Pat) {
if let PatStruct(ref npat, ref pfields, _) = pat.node {
if let PatKind::Struct(ref npat, ref pfields, _) = pat.node {
let mut wilds = 0;
let type_name = match npat.segments.last() {
Some(elem) => format!("{}", elem.identifier.name),
@ -51,7 +51,7 @@ impl EarlyLintPass for MiscEarly {
};
for field in pfields {
if field.node.pat.node == PatWild {
if field.node.pat.node == PatKind::Wild {
wilds += 1;
}
}
@ -67,14 +67,14 @@ impl EarlyLintPass for MiscEarly {
let mut normal = vec![];
for field in pfields {
if field.node.pat.node != PatWild {
if field.node.pat.node != PatKind::Wild {
if let Ok(n) = cx.sess().codemap().span_to_snippet(field.span) {
normal.push(n);
}
}
}
for field in pfields {
if field.node.pat.node == PatWild {
if field.node.pat.node == PatKind::Wild {
wilds -= 1;
if wilds > 0 {
span_lint(cx,
@ -101,7 +101,7 @@ impl EarlyLintPass for MiscEarly {
let mut registered_names: HashMap<String, Span> = HashMap::new();
for ref arg in &decl.inputs {
if let PatIdent(_, sp_ident, None) = arg.pat.node {
if let PatKind::Ident(_, sp_ident, None) = arg.pat.node {
let arg_name = sp_ident.node.to_string();
if arg_name.starts_with('_') {

2
src/returns.rs
View file

@ -97,7 +97,7 @@ impl ReturnPass {
let StmtKind::Decl(ref decl, _) = stmt.node,
let DeclKind::Local(ref local) = decl.node,
let Some(ref initexpr) = local.init,
let PatIdent(_, Spanned { node: id, .. }, _) = local.pat.node,
let PatKind::Ident(_, Spanned { node: id, .. }, _) = local.pat.node,
let ExprKind::Path(_, ref path) = retexpr.node,
match_path_ast(path, &[&id.name.as_str()])
], {