Rustup to rustc 1.40.0-nightly (237d54ff6 2019-10-15)

This commit is contained in:
Manish Goregaokar 2019-10-15 12:29:28 -07:00
parent 778ace37e5
commit 608d09c26c
2 changed files with 10 additions and 4 deletions

View File

@ -255,7 +255,10 @@ fn simplify_not(cx: &LateContext<'_, '_>, expr: &Expr) -> Option<String> {
.iter()
.cloned()
.flat_map(|(a, b)| vec![(a, b), (b, a)])
.find(|&(a, _)| a == path.ident.name.as_str())
.find(|&(a, _)| {
let path: &str = &path.ident.name.as_str();
a == path
})
.and_then(|(_, neg_method)| Some(format!("{}.{}()", snippet_opt(cx, args[0].span)?, neg_method)))
},
_ => None,

View File

@ -462,9 +462,12 @@ fn check_must_use_candidate<'a, 'tcx>(
}
fn must_use_attr(attrs: &[Attribute]) -> Option<&Attribute> {
attrs
.iter()
.find(|attr| attr.ident().map_or(false, |ident| "must_use" == &ident.as_str()))
attrs.iter().find(|attr| {
attr.ident().map_or(false, |ident| {
let ident: &str = &ident.as_str();
"must_use" == ident
})
})
}
fn returns_unit(decl: &hir::FnDecl) -> bool {