bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

also run rustfmt on clippy-lints

Browse source
This commit is contained in:
Oliver Schneider 2016-12-20 18:21:30 +01:00
parent 4d0864b277
commit 4a4e1ea2c5
No known key found for this signature in database
GPG key ID: 56D6EEA0FC67AC46
72 changed files with 1017 additions and 1204 deletions
Download patch file Download diff file Expand all files Collapse all files

19
clippy_lints/src/regex.rs
View file

@ -145,7 +145,7 @@ fn str_span(base: Span, s: &str, c: usize) -> Span {
hi: base.lo + BytePos(h as u32),
..base
}
}
},
_ => base,
}
}
@ -172,17 +172,18 @@ fn is_trivial_regex(s: &regex_syntax::Expr) -> Option<&'static str> {
(&Expr::Literal { .. }, &Expr::EndText) => Some("consider using `str::ends_with`"),
_ => None,
}
}
},
3 => {
if let (&Expr::StartText, &Expr::Literal {..}, &Expr::EndText) = (&exprs[0], &exprs[1], &exprs[2]) {
if let (&Expr::StartText, &Expr::Literal { .. }, &Expr::EndText) =
(&exprs[0], &exprs[1], &exprs[2]) {
Some("consider using `==` on `str`s")
} else {
None
}
}
},
_ => None,
}
}
},
_ => None,
}
}
@ -213,14 +214,14 @@ fn check_regex(cx: &LateContext, expr: &Expr, utf8: bool) {
"trivial regex",
&format!("consider using {}", repl));
}
}
},
Err(e) => {
span_lint(cx,
INVALID_REGEX,
str_span(expr.span, r, e.position()),
&format!("regex syntax error: {}",
e.description()));
}
},
}
}
} else if let Some(r) = const_str(cx, expr) {
@ -233,7 +234,7 @@ fn check_regex(cx: &LateContext, expr: &Expr, utf8: bool) {
"trivial regex",
&format!("consider using {}", repl));
}
}
},
Err(e) => {
span_lint(cx,
INVALID_REGEX,
@ -241,7 +242,7 @@ fn check_regex(cx: &LateContext, expr: &Expr, utf8: bool) {
&format!("regex syntax error on position {}: {}",
e.position(),
e.description()));
}
},
}
}
}