rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #3404 from matthiaskrgr/rustup

Browse Source 
rustup https://github.com/rust-lang/rust/pull/55330/
This commit is contained in:
Philipp Hansch
2018-11-03 20:06:48 +01:00
committed by GitHub
parent 486300b89d b59b60c8ae
commit 71ec4ff636
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
clippy_lints/src/map_unit_fn.rs
View File

@@ -106,7 +106,7 @@ fn is_unit_function(cx: &LateContext<'_, '_>, expr: &hir::Expr) -> bool {
let ty = cx.tables.expr_ty(expr); let ty = cx.tables.expr_ty(expr);
if let ty::FnDef(id, _) = ty.sty { if let ty::FnDef(id, _) = ty.sty {
if let Some(fn_type) = cx.tcx.fn_sig(id).no_late_bound_regions() { if let Some(fn_type) = cx.tcx.fn_sig(id).no_bound_vars() {
return is_unit_type(fn_type.output()); return is_unit_type(fn_type.output());
} }
} }

2
clippy_lints/src/needless_pass_by_value.rs
View File

@@ -125,7 +125,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NeedlessPassByValue {
.filter(|p| !p.is_global()) .filter(|p| !p.is_global())
.filter_map(|pred| { .filter_map(|pred| {
if let ty::Predicate::Trait(poly_trait_ref) = pred { if let ty::Predicate::Trait(poly_trait_ref) = pred {
if poly_trait_ref.def_id() == sized_trait || poly_trait_ref.skip_binder().has_escaping_regions() { if poly_trait_ref.def_id() == sized_trait || poly_trait_ref.skip_binder().has_escaping_bound_vars() {
return None; return None;
} }
Some(poly_trait_ref) Some(poly_trait_ref)