diff options
| author | bors <bors@rust-lang.org> | 2020-07-08 15:56:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-07-08 15:56:23 +0000 |
| commit | e12a316b01f22289d3e7701f129f92b313a98a9d (patch) | |
| tree | efdd43375d0d8b3cc9d1ca5dc5aac10e6a5f9529 | |
| parent | ac856922f80e9ef8cd95c3004699e4bc8fa0c978 (diff) | |
| parent | c41fcad90843b4bff2209618663a2ed38c50a7f9 (diff) | |
Auto merge of #5776 - flip1995:rustup, r=flip1995
Rustup changelog: none r? @ghost
| -rw-r--r-- | clippy_lints/src/escape.rs | 2 | ||||
| -rw-r--r-- | clippy_lints/src/needless_pass_by_value.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/clippy_lints/src/escape.rs b/clippy_lints/src/escape.rs index d40cdfcca9f..b10181062ff 100644 --- a/clippy_lints/src/escape.rs +++ b/clippy_lints/src/escape.rs @@ -150,7 +150,7 @@ impl<'a, 'tcx> Delegate<'tcx> for EscapeDelegate<'a, 'tcx> { return; } - if is_non_trait_box(cmt.place.ty) && !self.is_large_box(cmt.place.ty) { + if is_non_trait_box(cmt.place.ty()) && !self.is_large_box(cmt.place.ty()) { self.set.insert(cmt.hir_id); } return; diff --git a/clippy_lints/src/needless_pass_by_value.rs b/clippy_lints/src/needless_pass_by_value.rs index e72f9c77fe9..f9db6ca0aa8 100644 --- a/clippy_lints/src/needless_pass_by_value.rs +++ b/clippy_lints/src/needless_pass_by_value.rs @@ -110,7 +110,7 @@ impl<'tcx> LateLintPass<'tcx> for NeedlessPassByValue { let fn_def_id = cx.tcx.hir().local_def_id(hir_id); - let preds = traits::elaborate_predicates(cx.tcx, cx.param_env.caller_bounds.iter()) + let preds = traits::elaborate_predicates(cx.tcx, cx.param_env.caller_bounds().iter()) .filter(|p| !p.is_global()) .filter_map(|obligation| { if let ty::PredicateKind::Trait(poly_trait_ref, _) = obligation.predicate.kind() { |