Skip to content

Commit f29a334

Browse files
kylematsudakylematsuda
committed
change impl_trait_ref query to return EarlyBinder; remove bound_impl_trait_ref query; add EarlyBinder to impl_trait_ref in metadata
1 parent be130b5 commit f29a334

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+108
-127
lines changed

‎compiler/rustc_hir_analysis/src/astconv/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -2059,7 +2059,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
20592059
(_, Res::SelfTyAlias { alias_to: impl_def_id, is_trait_impl: true, .. }) => {
20602060
// `Self` in an impl of a trait -- we have a concrete self type and a
20612061
// trait reference.
2062-
let Some(trait_ref) = tcx.bound_impl_trait_ref(impl_def_id) else {
2062+
let Some(trait_ref) = tcx.impl_trait_ref(impl_def_id) else {
20632063
// A cycle error occurred, most likely.
20642064
let guar = tcx.sess.delay_span_bug(span, "expected cycle error");
20652065
return Err(guar);
@@ -2155,7 +2155,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
21552155
.is_accessible_from(self.item_def_id(), tcx)
21562156
&& tcx.all_impls(*trait_def_id)
21572157
.any(|impl_def_id| {
2158-
let trait_ref = tcx.bound_impl_trait_ref(impl_def_id);
2158+
let trait_ref = tcx.impl_trait_ref(impl_def_id);
21592159
trait_ref.map_or(false, |trait_ref| {
21602160
let impl_ = trait_ref.subst(
21612161
tcx,
@@ -2308,7 +2308,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
23082308
&& tcx.impl_polarity(impl_def_id) != ty::ImplPolarity::Negative
23092309
})
23102310
.filter_map(|impl_def_id| tcx.impl_trait_ref(impl_def_id))
2311-
.map(|impl_| impl_.self_ty())
2311+
.map(|impl_| impl_.subst_identity().self_ty())
23122312
// We don't care about blanket impls.
23132313
.filter(|self_ty| !self_ty.has_non_region_param())
23142314
.map(|self_ty| tcx.erase_regions(self_ty).to_string())

‎compiler/rustc_hir_analysis/src/check/check.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ fn check_item_type(tcx: TyCtxt<'_>, id: hir::ItemId) {
535535
return;
536536
};
537537
debug!("ItemKind::Impl {} with id {:?}", it.ident, it.owner_id);
538-
if let Some(impl_trait_ref) = tcx.bound_impl_trait_ref(it.owner_id.to_def_id()) {
538+
if let Some(impl_trait_ref) = tcx.impl_trait_ref(it.owner_id) {
539539
check_impl_items_against_trait(
540540
tcx,
541541
it.span,

‎compiler/rustc_hir_analysis/src/check/compare_impl_item.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ pub(super) fn collect_return_position_impl_trait_in_trait_tys<'tcx>(
617617
let impl_m = tcx.opt_associated_item(def_id).unwrap();
618618
let trait_m = tcx.opt_associated_item(impl_m.trait_item_def_id.unwrap()).unwrap();
619619
let impl_trait_ref =
620-
tcx.bound_impl_trait_ref(impl_m.impl_container(tcx).unwrap()).unwrap().subst_identity();
620+
tcx.impl_trait_ref(impl_m.impl_container(tcx).unwrap()).unwrap().subst_identity();
621621
let param_env = tcx.param_env(def_id);
622622

623623
// First, check a few of the same things as `compare_impl_method`,
@@ -1686,7 +1686,7 @@ pub(super) fn compare_impl_const_raw(
16861686
let impl_const_item = tcx.associated_item(impl_const_item_def);
16871687
let trait_const_item = tcx.associated_item(trait_const_item_def);
16881688
let impl_trait_ref =
1689-
tcx.bound_impl_trait_ref(impl_const_item.container_id(tcx)).unwrap().subst_identity();
1689+
tcx.impl_trait_ref(impl_const_item.container_id(tcx)).unwrap().subst_identity();
16901690
debug!("compare_const_impl(impl_trait_ref={:?})", impl_trait_ref);
16911691

16921692
let impl_c_span = tcx.def_span(impl_const_item_def.to_def_id());

‎compiler/rustc_hir_analysis/src/check/wfcheck.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ fn check_item<'tcx>(tcx: TyCtxt<'tcx>, item: &'tcx hir::Item<'tcx>) {
181181
// for `T`
182182
hir::ItemKind::Impl(ref impl_) => {
183183
let is_auto = tcx
184-
.bound_impl_trait_ref(def_id.into())
184+
.impl_trait_ref(def_id)
185185
.map_or(false, |trait_ref| tcx.trait_is_auto(trait_ref.skip_binder().def_id));
186186
if let (hir::Defaultness::Default { .. }, true) = (impl_.defaultness, is_auto) {
187187
let sp = impl_.of_trait.as_ref().map_or(item.span, |t| t.path.span);
@@ -1253,8 +1253,7 @@ fn check_impl<'tcx>(
12531253
// `#[rustc_reservation_impl]` impls are not real impls and
12541254
// therefore don't need to be WF (the trait's `Self: Trait` predicate
12551255
// won't hold).
1256-
let trait_ref =
1257-
tcx.bound_impl_trait_ref(item.owner_id.to_def_id()).unwrap().subst_identity();
1256+
let trait_ref = tcx.impl_trait_ref(item.owner_id).unwrap().subst_identity();
12581257
let trait_ref = wfcx.normalize(
12591258
ast_trait_ref.path.span,
12601259
Some(WellFormedLoc::Ty(item.hir_id().expect_owner().def_id)),

‎compiler/rustc_hir_analysis/src/coherence/builtin.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ fn visit_implementation_of_dispatch_from_dyn(tcx: TyCtxt<'_>, impl_did: LocalDef
192192
let source = tcx.type_of(impl_did);
193193
assert!(!source.has_escaping_bound_vars());
194194
let target = {
195-
let trait_ref = tcx.bound_impl_trait_ref(impl_did.into()).unwrap().subst_identity();
195+
let trait_ref = tcx.impl_trait_ref(impl_did).unwrap().subst_identity();
196196
assert_eq!(trait_ref.def_id, dispatch_from_dyn_trait);
197197

198198
trait_ref.substs.type_at(1)
@@ -354,7 +354,7 @@ pub fn coerce_unsized_info<'tcx>(tcx: TyCtxt<'tcx>, impl_did: DefId) -> CoerceUn
354354
});
355355

356356
let source = tcx.type_of(impl_did);
357-
let trait_ref = tcx.bound_impl_trait_ref(impl_did.into()).unwrap().subst_identity();
357+
let trait_ref = tcx.impl_trait_ref(impl_did).unwrap().subst_identity();
358358
assert_eq!(trait_ref.def_id, coerce_unsized_trait);
359359
let target = trait_ref.substs.type_at(1);
360360
debug!("visit_implementation_of_coerce_unsized: {:?} -> {:?} (bound)", source, target);

‎compiler/rustc_hir_analysis/src/coherence/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ fn coherent_trait(tcx: TyCtxt<'_>, def_id: DefId) {
128128

129129
let impls = tcx.hir().trait_impls(def_id);
130130
for &impl_def_id in impls {
131-
let trait_ref = tcx.bound_impl_trait_ref(impl_def_id.into()).unwrap().subst_identity();
131+
let trait_ref = tcx.impl_trait_ref(impl_def_id).unwrap().subst_identity();
132132

133133
check_impl(tcx, impl_def_id, trait_ref);
134134
check_object_overlap(tcx, impl_def_id, trait_ref);

‎compiler/rustc_hir_analysis/src/coherence/orphan.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pub(crate) fn orphan_check_impl(
2121
tcx: TyCtxt<'_>,
2222
impl_def_id: LocalDefId,
2323
) -> Result<(), ErrorGuaranteed> {
24-
let trait_ref = tcx.bound_impl_trait_ref(impl_def_id.into()).unwrap().skip_binder();
24+
let trait_ref = tcx.impl_trait_ref(impl_def_id).unwrap().skip_binder();
2525
trait_ref.error_reported()?;
2626

2727
let ret = do_orphan_check_impl(tcx, trait_ref, impl_def_id);

‎compiler/rustc_hir_analysis/src/coherence/unsafety.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ pub(super) fn check_item(tcx: TyCtxt<'_>, def_id: LocalDefId) {
1313
let item = tcx.hir().expect_item(def_id);
1414
let hir::ItemKind::Impl(ref impl_) = item.kind else { bug!() };
1515

16-
if let Some(trait_ref) =
17-
tcx.bound_impl_trait_ref(item.owner_id.to_def_id()).map(|t| t.subst_identity())
18-
{
16+
if let Some(trait_ref) = tcx.impl_trait_ref(item.owner_id).map(|t| t.subst_identity()) {
1917
let trait_def = tcx.trait_def(trait_ref.def_id);
2018
let unsafe_attr =
2119
impl_.generics.params.iter().find(|p| p.pure_wrt_drop).map(|_| "may_dangle");

‎compiler/rustc_hir_analysis/src/collect.rs

+13-9
Original file line numberDiff line numberDiff line change
@@ -1339,18 +1339,22 @@ fn suggest_impl_trait<'tcx>(
13391339
None
13401340
}
13411341

1342-
fn impl_trait_ref(tcx: TyCtxt<'_>, def_id: DefId) -> Option<ty::TraitRef<'_>> {
1342+
fn impl_trait_ref(tcx: TyCtxt<'_>, def_id: DefId) -> Option<ty::EarlyBinder<ty::TraitRef<'_>>> {
13431343
let icx = ItemCtxt::new(tcx, def_id);
13441344
let item = tcx.hir().expect_item(def_id.expect_local());
13451345
match item.kind {
1346-
hir::ItemKind::Impl(ref impl_) => impl_.of_trait.as_ref().map(|ast_trait_ref| {
1347-
let selfty = tcx.type_of(def_id);
1348-
icx.astconv().instantiate_mono_trait_ref(
1349-
ast_trait_ref,
1350-
selfty,
1351-
check_impl_constness(tcx, impl_.constness, ast_trait_ref),
1352-
)
1353-
}),
1346+
hir::ItemKind::Impl(ref impl_) => impl_
1347+
.of_trait
1348+
.as_ref()
1349+
.map(|ast_trait_ref| {
1350+
let selfty = tcx.type_of(def_id);
1351+
icx.astconv().instantiate_mono_trait_ref(
1352+
ast_trait_ref,
1353+
selfty,
1354+
check_impl_constness(tcx, impl_.constness, ast_trait_ref),
1355+
)
1356+
})
1357+
.map(ty::EarlyBinder),
13541358
_ => bug!(),
13551359
}
13561360
}

‎compiler/rustc_hir_analysis/src/collect/predicates_of.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,8 @@ fn gather_explicit_predicates_of(tcx: TyCtxt<'_>, def_id: DefId) -> ty::GenericP
8787
Node::Item(item) => match item.kind {
8888
ItemKind::Impl(ref impl_) => {
8989
if impl_.defaultness.is_default() {
90-
is_default_impl_trait = tcx
91-
.bound_impl_trait_ref(def_id)
92-
.map(|t| ty::Binder::dummy(t.subst_identity()));
90+
is_default_impl_trait =
91+
tcx.impl_trait_ref(def_id).map(|t| ty::Binder::dummy(t.subst_identity()));
9392
}
9493
&impl_.generics
9594
}
@@ -253,7 +252,7 @@ fn gather_explicit_predicates_of(tcx: TyCtxt<'_>, def_id: DefId) -> ty::GenericP
253252
// for details.
254253
if let Node::Item(&Item { kind: ItemKind::Impl { .. }, .. }) = node {
255254
let self_ty = tcx.type_of(def_id);
256-
let trait_ref = tcx.bound_impl_trait_ref(def_id).map(ty::EarlyBinder::subst_identity);
255+
let trait_ref = tcx.impl_trait_ref(def_id).map(ty::EarlyBinder::subst_identity);
257256
cgp::setup_constraining_predicates(
258257
tcx,
259258
&mut predicates,

‎compiler/rustc_hir_analysis/src/collect/type_of.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ pub(super) fn type_of(tcx: TyCtxt<'_>, def_id: DefId) -> Ty<'_> {
286286
}
287287
}
288288
ImplItemKind::Type(ty) => {
289-
if tcx.bound_impl_trait_ref(tcx.hir().get_parent_item(hir_id).to_def_id()).is_none() {
289+
if tcx.impl_trait_ref(tcx.hir().get_parent_item(hir_id)).is_none() {
290290
check_feature_inherent_assoc_ty(tcx, item.span);
291291
}
292292

‎compiler/rustc_hir_analysis/src/impl_wf_check.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@ fn enforce_impl_params_are_constrained(tcx: TyCtxt<'_>, impl_def_id: LocalDefId)
8585
}
8686
let impl_generics = tcx.generics_of(impl_def_id);
8787
let impl_predicates = tcx.predicates_of(impl_def_id);
88-
let impl_trait_ref =
89-
tcx.bound_impl_trait_ref(impl_def_id.into()).map(ty::EarlyBinder::subst_identity);
88+
let impl_trait_ref = tcx.impl_trait_ref(impl_def_id).map(ty::EarlyBinder::subst_identity);
9089

9190
let mut input_parameters = cgp::parameters_for_impl(impl_self_ty, impl_trait_ref);
9291
cgp::identify_constrained_generic_params(

‎compiler/rustc_hir_analysis/src/impl_wf_check/min_specialization.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ pub(super) fn check_min_specialization(tcx: TyCtxt<'_>, impl_def_id: LocalDefId)
8989
}
9090

9191
fn parent_specialization_node(tcx: TyCtxt<'_>, impl1_def_id: LocalDefId) -> Option<Node> {
92-
let trait_ref = tcx.bound_impl_trait_ref(impl1_def_id.into())?;
92+
let trait_ref = tcx.impl_trait_ref(impl1_def_id)?;
9393
let trait_def = tcx.trait_def(trait_ref.skip_binder().def_id);
9494

9595
let impl2_node = trait_def.ancestors(tcx, impl1_def_id.to_def_id()).ok()?.nth(1)?;
@@ -207,7 +207,7 @@ fn unconstrained_parent_impl_substs<'tcx>(
207207
let impl_generic_predicates = tcx.predicates_of(impl_def_id);
208208
let mut unconstrained_parameters = FxHashSet::default();
209209
let mut constrained_params = FxHashSet::default();
210-
let impl_trait_ref = tcx.bound_impl_trait_ref(impl_def_id).map(ty::EarlyBinder::subst_identity);
210+
let impl_trait_ref = tcx.impl_trait_ref(impl_def_id).map(ty::EarlyBinder::subst_identity);
211211

212212
// Unfortunately the functions in `constrained_generic_parameters` don't do
213213
// what we want here. We want only a list of constrained parameters while
@@ -370,7 +370,7 @@ fn check_predicates<'tcx>(
370370
});
371371

372372
// Include the well-formed predicates of the type parameters of the impl.
373-
for arg in tcx.bound_impl_trait_ref(impl1_def_id.into()).unwrap().subst_identity().substs {
373+
for arg in tcx.impl_trait_ref(impl1_def_id).unwrap().subst_identity().substs {
374374
let infcx = &tcx.infer_ctxt().build();
375375
let obligations = wf::obligations(
376376
infcx,

‎compiler/rustc_hir_typeck/src/method/confirm.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ impl<'a, 'tcx> ConfirmContext<'a, 'tcx> {
240240
probe::InherentImplPick => {
241241
let impl_def_id = pick.item.container_id(self.tcx);
242242
assert!(
243-
self.tcx.bound_impl_trait_ref(impl_def_id).is_none(),
243+
self.tcx.impl_trait_ref(impl_def_id).is_none(),
244244
"impl {:?} is not an inherent impl",
245245
impl_def_id
246246
);

‎compiler/rustc_hir_typeck/src/method/suggest.rs

+4-5
Original file line numberDiff line numberDiff line change
@@ -1036,7 +1036,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
10361036
// Provide the best span we can. Use the item, if local to crate, else
10371037
// the impl, if local to crate (item may be defaulted), else nothing.
10381038
let Some(item) = self.associated_value(impl_did, item_name).or_else(|| {
1039-
let impl_trait_ref = self.tcx.bound_impl_trait_ref(impl_did)?;
1039+
let impl_trait_ref = self.tcx.impl_trait_ref(impl_did)?;
10401040
self.associated_value(impl_trait_ref.skip_binder().def_id, item_name)
10411041
}) else {
10421042
continue;
@@ -1052,7 +1052,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
10521052

10531053
let impl_ty = self.tcx.at(span).type_of(impl_did);
10541054

1055-
let insertion = match self.tcx.bound_impl_trait_ref(impl_did) {
1055+
let insertion = match self.tcx.impl_trait_ref(impl_did) {
10561056
None => String::new(),
10571057
Some(trait_ref) => {
10581058
format!(
@@ -1088,7 +1088,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
10881088
err.note(&note_str);
10891089
}
10901090
if let Some(sugg_span) = sugg_span
1091-
&& let Some(trait_ref) = self.tcx.bound_impl_trait_ref(impl_did) {
1091+
&& let Some(trait_ref) = self.tcx.impl_trait_ref(impl_did) {
10921092
let path = self.tcx.def_path_str(trait_ref.skip_binder().def_id);
10931093

10941094
let ty = match item.kind {
@@ -2584,8 +2584,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
25842584
self.tcx.impl_polarity(*imp_did) == ty::ImplPolarity::Negative
25852585
})
25862586
.any(|imp_did| {
2587-
let imp =
2588-
self.tcx.bound_impl_trait_ref(imp_did).unwrap().subst_identity();
2587+
let imp = self.tcx.impl_trait_ref(imp_did).unwrap().subst_identity();
25892588
let imp_simp =
25902589
simplify_type(self.tcx, imp.self_ty(), TreatParams::AsPlaceholder);
25912590
imp_simp.map_or(false, |s| s == simp_rcvr_ty)

‎compiler/rustc_infer/src/infer/error_reporting/note.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
317317
self.tcx.associated_item(impl_item_def_id).impl_container(self.tcx) else { return; };
318318
let Some(trait_ref) = self
319319
.tcx
320-
.bound_impl_trait_ref(impl_def_id)
320+
.impl_trait_ref(impl_def_id)
321321
else { return; };
322322
let trait_substs = trait_ref
323323
.subst_identity()

‎compiler/rustc_lint/src/nonstandard_style.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ pub fn method_context(cx: &LateContext<'_>, id: hir::HirId) -> MethodLateContext
2626
let item = cx.tcx.associated_item(def_id);
2727
match item.container {
2828
ty::TraitContainer => MethodLateContext::TraitAutoImpl,
29-
ty::ImplContainer => match cx.tcx.bound_impl_trait_ref(item.container_id(cx.tcx)) {
29+
ty::ImplContainer => match cx.tcx.impl_trait_ref(item.container_id(cx.tcx)) {
3030
Some(_) => MethodLateContext::TraitImpl,
3131
None => MethodLateContext::PlainImpl,
3232
},

‎compiler/rustc_lint/src/pass_by_value.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ impl<'tcx> LateLintPass<'tcx> for PassByValue {
2424
match &ty.kind {
2525
TyKind::Ref(_, hir::MutTy { ty: inner_ty, mutbl: hir::Mutability::Not }) => {
2626
if let Some(impl_did) = cx.tcx.impl_of_method(ty.hir_id.owner.to_def_id()) {
27-
if cx.tcx.bound_impl_trait_ref(impl_did).is_some() {
27+
if cx.tcx.impl_trait_ref(impl_did).is_some() {
2828
return;
2929
}
3030
}

‎compiler/rustc_metadata/src/rmeta/encoder.rs

+4-8
Original file line numberDiff line numberDiff line change
@@ -1555,8 +1555,7 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
15551555
self.tables.impl_defaultness.set(def_id.index, *defaultness);
15561556
self.tables.constness.set(def_id.index, *constness);
15571557

1558-
let trait_ref =
1559-
self.tcx.bound_impl_trait_ref(def_id).map(ty::EarlyBinder::skip_binder);
1558+
let trait_ref = self.tcx.impl_trait_ref(def_id).map(ty::EarlyBinder::skip_binder);
15601559
if let Some(trait_ref) = trait_ref {
15611560
let trait_def = self.tcx.trait_def(trait_ref.def_id);
15621561
if let Ok(mut an) = trait_def.ancestors(self.tcx, def_id) {
@@ -1633,9 +1632,7 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
16331632
}
16341633
}
16351634
if let hir::ItemKind::Impl { .. } = item.kind {
1636-
if let Some(trait_ref) =
1637-
self.tcx.bound_impl_trait_ref(def_id).map(ty::EarlyBinder::subst_identity)
1638-
{
1635+
if let Some(trait_ref) = self.tcx.impl_trait_ref(def_id) {
16391636
record!(self.tables.impl_trait_ref[def_id] <- trait_ref);
16401637
}
16411638
}
@@ -1901,9 +1898,8 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
19011898

19021899
for id in tcx.hir().items() {
19031900
if matches!(tcx.def_kind(id.owner_id), DefKind::Impl) {
1904-
if let Some(trait_ref) = tcx
1905-
.bound_impl_trait_ref(id.owner_id.to_def_id())
1906-
.map(ty::EarlyBinder::subst_identity)
1901+
if let Some(trait_ref) =
1902+
tcx.impl_trait_ref(id.owner_id).map(ty::EarlyBinder::subst_identity)
19071903
{
19081904
let simplified_self_ty = fast_reject::simplify_type(
19091905
self.tcx,

‎compiler/rustc_metadata/src/rmeta/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ define_tables! {
359359
variances_of: Table<DefIndex, LazyArray<ty::Variance>>,
360360
fn_sig: Table<DefIndex, LazyValue<ty::PolyFnSig<'static>>>,
361361
codegen_fn_attrs: Table<DefIndex, LazyValue<CodegenFnAttrs>>,
362-
impl_trait_ref: Table<DefIndex, LazyValue<ty::TraitRef<'static>>>,
362+
impl_trait_ref: Table<DefIndex, LazyValue<ty::EarlyBinder<ty::TraitRef<'static>>>>,
363363
const_param_default: Table<DefIndex, LazyValue<ty::EarlyBinder<rustc_middle::ty::Const<'static>>>>,
364364
object_lifetime_default: Table<DefIndex, LazyValue<ObjectLifetimeDefault>>,
365365
optimized_mir: Table<DefIndex, LazyValue<mir::Body<'static>>>,

‎compiler/rustc_middle/src/hir/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ impl<'tcx> TyCtxt<'tcx> {
101101
}
102102

103103
pub fn impl_subject(self, def_id: DefId) -> ImplSubject<'tcx> {
104-
self.bound_impl_trait_ref(def_id)
104+
self.impl_trait_ref(def_id)
105105
.map(|t| t.subst_identity())
106106
.map(ImplSubject::Trait)
107107
.unwrap_or_else(|| ImplSubject::Inherent(self.type_of(def_id)))

‎compiler/rustc_middle/src/query/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@ rustc_queries! {
737737

738738
/// Given an `impl_id`, return the trait it implements.
739739
/// Return `None` if this is an inherent impl.
740-
query impl_trait_ref(impl_id: DefId) -> Option<ty::TraitRef<'tcx>> {
740+
query impl_trait_ref(impl_id: DefId) -> Option<ty::EarlyBinder<ty::TraitRef<'tcx>>> {
741741
desc { |tcx| "computing trait implemented by `{}`", tcx.def_path_str(impl_id) }
742742
cache_on_disk_if { impl_id.is_local() }
743743
separate_provide_extern

‎compiler/rustc_middle/src/ty/context.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1027,7 +1027,7 @@ impl<'tcx> TyCtxt<'tcx> {
10271027
/// Checks if the bound region is in Impl Item.
10281028
pub fn is_bound_region_in_impl_item(self, suitable_region_binding_scope: LocalDefId) -> bool {
10291029
let container_id = self.parent(suitable_region_binding_scope.to_def_id());
1030-
if self.bound_impl_trait_ref(container_id).is_some() {
1030+
if self.impl_trait_ref(container_id).is_some() {
10311031
// For now, we do not try to target impls of traits. This is
10321032
// because this message is going to suggest that the user
10331033
// change the fn signature, but they may not be free to do so,

0 commit comments

Comments
 (0)