Auto merge of #5776 - flip1995:rustup, r=flip1995

Rustup changelog: none r? @ghost
rust-lang · Jul 8, 2020 · e12a316 · e12a316
2 parents ac85692 + c41fcad
commit e12a316
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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() {