Skip to content

Commit a61104e

Browse files
Remove trivial Binder::dummy calls
1 parent 32b55d4 commit a61104e

File tree

9 files changed

+9
-9
lines changed

9 files changed

+9
-9
lines changed

compiler/rustc_hir_typeck/src/method/probe.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1496,7 +1496,7 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
14961496
}
14971497
}
14981498

1499-
trait_predicate = Some(ty::Binder::dummy(trait_ref).upcast(self.tcx));
1499+
trait_predicate = Some(trait_ref.upcast(self.tcx));
15001500
}
15011501
ObjectCandidate(poly_trait_ref) | WhereClauseCandidate(poly_trait_ref) => {
15021502
let trait_ref = self.instantiate_binder_with_fresh_vars(

compiler/rustc_infer/src/traits/engine.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ pub trait TraitEngine<'tcx>: 'tcx {
2626
cause,
2727
recursion_depth: 0,
2828
param_env,
29-
predicate: ty::Binder::dummy(trait_ref).upcast(infcx.tcx),
29+
predicate: trait_ref.upcast(infcx.tcx),
3030
},
3131
);
3232
}

compiler/rustc_lint/src/builtin.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,7 @@ fn type_implements_negative_copy_modulo_regions<'tcx>(
734734
cause: traits::ObligationCause::dummy(),
735735
param_env,
736736
recursion_depth: 0,
737-
predicate: ty::Binder::dummy(pred).upcast(tcx),
737+
predicate: pred.upcast(tcx),
738738
};
739739

740740
tcx.infer_ctxt().build().predicate_must_hold_modulo_regions(&obligation)

compiler/rustc_trait_selection/src/infer.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ impl<'tcx> InferCtxt<'tcx> {
6363
cause: traits::ObligationCause::dummy(),
6464
param_env,
6565
recursion_depth: 0,
66-
predicate: ty::Binder::dummy(trait_ref).upcast(self.tcx),
66+
predicate: trait_ref.upcast(self.tcx),
6767
};
6868
self.evaluate_obligation(&obligation).unwrap_or(traits::EvaluationResult::EvaluatedToErr)
6969
}

compiler/rustc_trait_selection/src/traits/engine.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ impl<'a, 'tcx> ObligationCtxt<'a, 'tcx> {
9696
cause,
9797
recursion_depth: 0,
9898
param_env,
99-
predicate: ty::Binder::dummy(trait_ref).upcast(tcx),
99+
predicate: trait_ref.upcast(tcx),
100100
});
101101
}
102102

compiler/rustc_trait_selection/src/traits/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ fn instantiate_and_check_impossible_predicates<'tcx>(
457457
// associated items.
458458
if let Some(trait_def_id) = tcx.trait_of_item(key.0) {
459459
let trait_ref = ty::TraitRef::from_method(tcx, trait_def_id, key.1);
460-
predicates.push(ty::Binder::dummy(trait_ref).upcast(tcx));
460+
predicates.push(trait_ref.upcast(tcx));
461461
}
462462

463463
predicates.retain(|predicate| !predicate.has_param());

compiler/rustc_trait_selection/src/traits/select/confirmation.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1259,7 +1259,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
12591259
// being cast to `Foo + 'a` outlives `'a`:
12601260
let outlives = ty::OutlivesPredicate(source, r);
12611261
nested.push(predicate_to_obligation(
1262-
ty::Binder::dummy(ty::ClauseKind::TypeOutlives(outlives)).upcast(tcx),
1262+
ty::ClauseKind::TypeOutlives(outlives).upcast(tcx),
12631263
));
12641264

12651265
ImplSource::Builtin(BuiltinImplSource::Misc, nested)

src/librustdoc/clean/blanket_impl.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ pub(crate) fn synthesize_blanket_impls(
6464
.instantiate(tcx, impl_args)
6565
.predicates
6666
.into_iter()
67-
.chain(Some(ty::Binder::dummy(impl_trait_ref).upcast(tcx)));
67+
.chain(Some(impl_trait_ref.upcast(tcx)));
6868
for predicate in predicates {
6969
let obligation = traits::Obligation::new(
7070
tcx,

src/tools/clippy/clippy_utils/src/ty.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ pub fn implements_trait_with_env_from_iter<'tcx>(
311311
cause: ObligationCause::dummy(),
312312
param_env,
313313
recursion_depth: 0,
314-
predicate: Binder::dummy(trait_ref).upcast(tcx),
314+
predicate: trait_ref.upcast(tcx),
315315
};
316316
infcx
317317
.evaluate_obligation(&obligation)

0 commit comments

Comments
 (0)