bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove trivial Binder::dummy calls

Browse source
This commit is contained in:
Michael Goulet 2024-05-15 12:52:12 -04:00
parent 6d817365e5
commit 7b3d6dad20
9 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_hir_typeck/src/method/probe.rs
View file

@ -1496,7 +1496,7 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
} }
} }
trait_predicate = Some(ty::Binder::dummy(trait_ref).upcast(self.tcx)); trait_predicate = Some(trait_ref.upcast(self.tcx));
} }
ObjectCandidate(poly_trait_ref) | WhereClauseCandidate(poly_trait_ref) => { ObjectCandidate(poly_trait_ref) | WhereClauseCandidate(poly_trait_ref) => {
let trait_ref = self.instantiate_binder_with_fresh_vars( let trait_ref = self.instantiate_binder_with_fresh_vars(

2
compiler/rustc_infer/src/traits/engine.rs
View file

@ -26,7 +26,7 @@ pub trait TraitEngine<'tcx>: 'tcx {
cause, cause,
recursion_depth: 0, recursion_depth: 0,
param_env, param_env,
predicate: ty::Binder::dummy(trait_ref).upcast(infcx.tcx), predicate: trait_ref.upcast(infcx.tcx),
}, },
); );
} }

2
compiler/rustc_lint/src/builtin.rs
View file

@ -734,7 +734,7 @@ fn type_implements_negative_copy_modulo_regions<'tcx>(
cause: traits::ObligationCause::dummy(), cause: traits::ObligationCause::dummy(),
param_env, param_env,
recursion_depth: 0, recursion_depth: 0,
predicate: ty::Binder::dummy(pred).upcast(tcx), predicate: pred.upcast(tcx),
}; };
tcx.infer_ctxt().build().predicate_must_hold_modulo_regions(&obligation) tcx.infer_ctxt().build().predicate_must_hold_modulo_regions(&obligation)

2
compiler/rustc_trait_selection/src/infer.rs
View file

@ -63,7 +63,7 @@ impl<'tcx> InferCtxt<'tcx> {
cause: traits::ObligationCause::dummy(), cause: traits::ObligationCause::dummy(),
param_env, param_env,
recursion_depth: 0, recursion_depth: 0,
predicate: ty::Binder::dummy(trait_ref).upcast(self.tcx), predicate: trait_ref.upcast(self.tcx),
}; };
self.evaluate_obligation(&obligation).unwrap_or(traits::EvaluationResult::EvaluatedToErr) self.evaluate_obligation(&obligation).unwrap_or(traits::EvaluationResult::EvaluatedToErr)
} }

2
compiler/rustc_trait_selection/src/traits/engine.rs
View file

@ -96,7 +96,7 @@ impl<'a, 'tcx> ObligationCtxt<'a, 'tcx> {
cause, cause,
recursion_depth: 0, recursion_depth: 0,
param_env, param_env,
predicate: ty::Binder::dummy(trait_ref).upcast(tcx), predicate: trait_ref.upcast(tcx),
}); });
} }

2
compiler/rustc_trait_selection/src/traits/mod.rs
View file

@ -457,7 +457,7 @@ fn instantiate_and_check_impossible_predicates<'tcx>(
// associated items. // associated items.
if let Some(trait_def_id) = tcx.trait_of_item(key.0) { if let Some(trait_def_id) = tcx.trait_of_item(key.0) {
let trait_ref = ty::TraitRef::from_method(tcx, trait_def_id, key.1); let trait_ref = ty::TraitRef::from_method(tcx, trait_def_id, key.1);
predicates.push(ty::Binder::dummy(trait_ref).upcast(tcx)); predicates.push(trait_ref.upcast(tcx));
} }
predicates.retain(|predicate| !predicate.has_param()); predicates.retain(|predicate| !predicate.has_param());

2
compiler/rustc_trait_selection/src/traits/select/confirmation.rs
View file

@ -1259,7 +1259,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
// being cast to `Foo + 'a` outlives `'a`: // being cast to `Foo + 'a` outlives `'a`:
let outlives = ty::OutlivesPredicate(source, r); let outlives = ty::OutlivesPredicate(source, r);
nested.push(predicate_to_obligation( nested.push(predicate_to_obligation(
ty::Binder::dummy(ty::ClauseKind::TypeOutlives(outlives)).upcast(tcx), ty::ClauseKind::TypeOutlives(outlives).upcast(tcx),
)); ));
ImplSource::Builtin(BuiltinImplSource::Misc, nested) ImplSource::Builtin(BuiltinImplSource::Misc, nested)

2
src/librustdoc/clean/blanket_impl.rs
View file

@ -64,7 +64,7 @@ pub(crate) fn synthesize_blanket_impls(
.instantiate(tcx, impl_args) .instantiate(tcx, impl_args)
.predicates .predicates
.into_iter() .into_iter()
.chain(Some(ty::Binder::dummy(impl_trait_ref).upcast(tcx))); .chain(Some(impl_trait_ref.upcast(tcx)));
for predicate in predicates { for predicate in predicates {
let obligation = traits::Obligation::new( let obligation = traits::Obligation::new(
tcx, tcx,

2
src/tools/clippy/clippy_utils/src/ty.rs
View file

@ -311,7 +311,7 @@ pub fn implements_trait_with_env_from_iter<'tcx>(
cause: ObligationCause::dummy(), cause: ObligationCause::dummy(),
param_env, param_env,
recursion_depth: 0, recursion_depth: 0,
predicate: Binder::dummy(trait_ref).upcast(tcx), predicate: trait_ref.upcast(tcx),
}; };
infcx infcx
.evaluate_obligation(&obligation) .evaluate_obligation(&obligation)