Merge pull request #3394 from phansch/rustup

Fix clippy build failure on latest master
This commit is contained in:
Manish Goregaokar 2018-11-01 13:57:27 -07:00 committed by GitHub
commit a20599ab57
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -424,7 +424,7 @@ impl<'a, 'tcx> NonminimalBoolVisitor<'a, 'tcx> {
improvements.push(suggestion); improvements.push(suggestion);
} }
} }
let nonminimal_bool_lint = |suggestions| { let nonminimal_bool_lint = |suggestions: Vec<_>| {
span_lint_and_then( span_lint_and_then(
self.cx, self.cx,
NONMINIMAL_BOOL, NONMINIMAL_BOOL,
@ -434,7 +434,7 @@ impl<'a, 'tcx> NonminimalBoolVisitor<'a, 'tcx> {
db.span_suggestions_with_applicability( db.span_suggestions_with_applicability(
e.span, e.span,
"try", "try",
suggestions, suggestions.into_iter(),
// nonminimal_bool can produce minimal but // nonminimal_bool can produce minimal but
// not human readable expressions (#3141) // not human readable expressions (#3141)
Applicability::Unspecified, Applicability::Unspecified,