Skip to content

Commit 98b4a64

Browse files
borsbors
committed
Auto merge of rust-lang#117126 - matthiaskrgr:rollup-8huie8f, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - rust-lang#117081 (fix typos in comments) - rust-lang#117091 (`OptWithInfcx` naming nits, trait bound simplifications) - rust-lang#117092 (Add regression test for rust-lang#117058) - rust-lang#117093 (Update books) - rust-lang#117105 (remove change-id assertion in bootstrap test) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 07a4b7e + 9510e97 commit 98b4a64

File tree

22 files changed

+204
-99
lines changed

22 files changed

+204
-99
lines changed

‎compiler/rustc_const_eval/src/interpret/eval_context.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1010,7 +1010,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
10101010
// Just make this an efficient immediate.
10111011
// Note that not calling `layout_of` here does have one real consequence:
10121012
// if the type is too big, we'll only notice this when the local is actually initialized,
1013-
// which is a bit too late -- we should ideally notice this alreayd here, when the memory
1013+
// which is a bit too late -- we should ideally notice this already here, when the memory
10141014
// is conceptually allocated. But given how rare that error is and that this is a hot function,
10151015
// we accept this downside for now.
10161016
Operand::Immediate(Immediate::Uninit)

‎compiler/rustc_infer/src/infer/mod.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,9 @@ pub struct InferCtxt<'tcx> {
341341
next_trait_solver: bool,
342342
}
343343

344-
impl<'tcx> ty::InferCtxtLike<TyCtxt<'tcx>> for InferCtxt<'tcx> {
344+
impl<'tcx> ty::InferCtxtLike for InferCtxt<'tcx> {
345+
type Interner = TyCtxt<'tcx>;
346+
345347
fn universe_of_ty(&self, ty: ty::InferTy) -> Option<ty::UniverseIndex> {
346348
use InferTy::*;
347349
match ty {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::arena::Arena;
22
use rustc_data_structures::aligned::{align_of, Aligned};
33
use rustc_serialize::{Encodable, Encoder};
4-
use rustc_type_ir::{InferCtxtLike, OptWithInfcx};
4+
use rustc_type_ir::{InferCtxtLike, WithInfcx};
55
use std::alloc::Layout;
66
use std::cmp::Ordering;
77
use std::fmt;
@@ -121,8 +121,8 @@ impl<T: fmt::Debug> fmt::Debug for List<T> {
121121
}
122122
}
123123
impl<'tcx, T: super::DebugWithInfcx<TyCtxt<'tcx>>> super::DebugWithInfcx<TyCtxt<'tcx>> for List<T> {
124-
fn fmt<InfCtx: InferCtxtLike<TyCtxt<'tcx>>>(
125-
this: OptWithInfcx<'_, TyCtxt<'tcx>, InfCtx, &Self>,
124+
fn fmt<Infcx: InferCtxtLike<Interner = TyCtxt<'tcx>>>(
125+
this: WithInfcx<'_, Infcx, &Self>,
126126
f: &mut core::fmt::Formatter<'_>,
127127
) -> core::fmt::Result {
128128
fmt::Debug::fmt(&this.map(|this| this.as_slice()), f)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ use rustc_span::symbol::{kw, sym, Ident, Symbol};
5454
use rustc_span::{ExpnId, ExpnKind, Span};
5555
use rustc_target::abi::{Align, FieldIdx, Integer, IntegerType, VariantIdx};
5656
pub use rustc_target::abi::{ReprFlags, ReprOptions};
57-
pub use rustc_type_ir::{DebugWithInfcx, InferCtxtLike, OptWithInfcx};
57+
pub use rustc_type_ir::{DebugWithInfcx, InferCtxtLike, WithInfcx};
5858
pub use vtable::*;
5959

6060
use std::fmt::Debug;

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

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use crate::ty::visit::{TypeSuperVisitable, TypeVisitable, TypeVisitor};
1010
use crate::ty::{self, AliasTy, InferConst, Lift, Term, TermKind, Ty, TyCtxt};
1111
use rustc_hir::def::Namespace;
1212
use rustc_target::abi::TyAndLayout;
13-
use rustc_type_ir::{ConstKind, DebugWithInfcx, InferCtxtLike, OptWithInfcx};
13+
use rustc_type_ir::{ConstKind, DebugWithInfcx, InferCtxtLike, WithInfcx};
1414

1515
use std::fmt::{self, Debug};
1616
use std::ops::ControlFlow;
@@ -87,12 +87,12 @@ impl fmt::Debug for ty::FreeRegion {
8787

8888
impl<'tcx> fmt::Debug for ty::FnSig<'tcx> {
8989
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
90-
OptWithInfcx::new_no_ctx(self).fmt(f)
90+
WithInfcx::with_no_infcx(self).fmt(f)
9191
}
9292
}
9393
impl<'tcx> DebugWithInfcx<TyCtxt<'tcx>> for ty::FnSig<'tcx> {
94-
fn fmt<InfCtx: InferCtxtLike<TyCtxt<'tcx>>>(
95-
this: OptWithInfcx<'_, TyCtxt<'tcx>, InfCtx, &Self>,
94+
fn fmt<Infcx: InferCtxtLike<Interner = TyCtxt<'tcx>>>(
95+
this: WithInfcx<'_, Infcx, &Self>,
9696
f: &mut core::fmt::Formatter<'_>,
9797
) -> core::fmt::Result {
9898
let sig = this.data;
@@ -147,8 +147,8 @@ impl<'tcx> fmt::Debug for ty::TraitRef<'tcx> {
147147
}
148148

149149
impl<'tcx> ty::DebugWithInfcx<TyCtxt<'tcx>> for Ty<'tcx> {
150-
fn fmt<InfCtx: InferCtxtLike<TyCtxt<'tcx>>>(
151-
this: OptWithInfcx<'_, TyCtxt<'tcx>, InfCtx, &Self>,
150+
fn fmt<Infcx: InferCtxtLike<Interner = TyCtxt<'tcx>>>(
151+
this: WithInfcx<'_, Infcx, &Self>,
152152
f: &mut core::fmt::Formatter<'_>,
153153
) -> core::fmt::Result {
154154
this.data.fmt(f)
@@ -236,12 +236,12 @@ impl<'tcx> fmt::Debug for ty::PredicateKind<'tcx> {
236236

237237
impl<'tcx> fmt::Debug for AliasTy<'tcx> {
238238
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
239-
OptWithInfcx::new_no_ctx(self).fmt(f)
239+
WithInfcx::with_no_infcx(self).fmt(f)
240240
}
241241
}
242242
impl<'tcx> DebugWithInfcx<TyCtxt<'tcx>> for AliasTy<'tcx> {
243-
fn fmt<InfCtx: InferCtxtLike<TyCtxt<'tcx>>>(
244-
this: OptWithInfcx<'_, TyCtxt<'tcx>, InfCtx, &Self>,
243+
fn fmt<Infcx: InferCtxtLike<Interner = TyCtxt<'tcx>>>(
244+
this: WithInfcx<'_, Infcx, &Self>,
245245
f: &mut core::fmt::Formatter<'_>,
246246
) -> core::fmt::Result {
247247
f.debug_struct("AliasTy")
@@ -261,12 +261,12 @@ impl<'tcx> fmt::Debug for ty::InferConst<'tcx> {
261261
}
262262
}
263263
impl<'tcx> DebugWithInfcx<TyCtxt<'tcx>> for ty::InferConst<'tcx> {
264-
fn fmt<InfCtx: InferCtxtLike<TyCtxt<'tcx>>>(
265-
this: OptWithInfcx<'_, TyCtxt<'tcx>, InfCtx, &Self>,
264+
fn fmt<Infcx: InferCtxtLike<Interner = TyCtxt<'tcx>>>(
265+
this: WithInfcx<'_, Infcx, &Self>,
266266
f: &mut core::fmt::Formatter<'_>,
267267
) -> core::fmt::Result {
268268
use ty::InferConst::*;
269-
match this.infcx.and_then(|infcx| infcx.universe_of_ct(*this.data)) {
269+
match this.infcx.universe_of_ct(*this.data) {
270270
None => write!(f, "{:?}", this.data),
271271
Some(universe) => match *this.data {
272272
Var(vid) => write!(f, "?{}_{}c", vid.index, universe.index()),
@@ -281,12 +281,12 @@ impl<'tcx> DebugWithInfcx<TyCtxt<'tcx>> for ty::InferConst<'tcx> {
281281

282282
impl<'tcx> fmt::Debug for ty::consts::Expr<'tcx> {
283283
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
284-
OptWithInfcx::new_no_ctx(self).fmt(f)
284+
WithInfcx::with_no_infcx(self).fmt(f)
285285
}
286286
}
287287
impl<'tcx> DebugWithInfcx<TyCtxt<'tcx>> for ty::consts::Expr<'tcx> {
288-
fn fmt<InfCtx: InferCtxtLike<TyCtxt<'tcx>>>(
289-
this: OptWithInfcx<'_, TyCtxt<'tcx>, InfCtx, &Self>,
288+
fn fmt<Infcx: InferCtxtLike<Interner = TyCtxt<'tcx>>>(
289+
this: WithInfcx<'_, Infcx, &Self>,
290290
f: &mut core::fmt::Formatter<'_>,
291291
) -> core::fmt::Result {
292292
match this.data {
@@ -314,12 +314,12 @@ impl<'tcx> DebugWithInfcx<TyCtxt<'tcx>> for ty::consts::Expr<'tcx> {
314314

315315
impl<'tcx> fmt::Debug for ty::UnevaluatedConst<'tcx> {
316316
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
317-
OptWithInfcx::new_no_ctx(self).fmt(f)
317+
WithInfcx::with_no_infcx(self).fmt(f)
318318
}
319319
}
320320
impl<'tcx> DebugWithInfcx<TyCtxt<'tcx>> for ty::UnevaluatedConst<'tcx> {
321-
fn fmt<InfCtx: InferCtxtLike<TyCtxt<'tcx>>>(
322-
this: OptWithInfcx<'_, TyCtxt<'tcx>, InfCtx, &Self>,
321+
fn fmt<Infcx: InferCtxtLike<Interner = TyCtxt<'tcx>>>(
322+
this: WithInfcx<'_, Infcx, &Self>,
323323
f: &mut core::fmt::Formatter<'_>,
324324
) -> core::fmt::Result {
325325
f.debug_struct("UnevaluatedConst")
@@ -331,12 +331,12 @@ impl<'tcx> DebugWithInfcx<TyCtxt<'tcx>> for ty::UnevaluatedConst<'tcx> {
331331

332332
impl<'tcx> fmt::Debug for ty::Const<'tcx> {
333333
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
334-
OptWithInfcx::new_no_ctx(self).fmt(f)
334+
WithInfcx::with_no_infcx(self).fmt(f)
335335
}
336336
}
337337
impl<'tcx> DebugWithInfcx<TyCtxt<'tcx>> for ty::Const<'tcx> {
338-
fn fmt<InfCtx: InferCtxtLike<TyCtxt<'tcx>>>(
339-
this: OptWithInfcx<'_, TyCtxt<'tcx>, InfCtx, &Self>,
338+
fn fmt<Infcx: InferCtxtLike<Interner = TyCtxt<'tcx>>>(
339+
this: WithInfcx<'_, Infcx, &Self>,
340340
f: &mut core::fmt::Formatter<'_>,
341341
) -> core::fmt::Result {
342342
// If this is a value, we spend some effort to make it look nice.
@@ -392,8 +392,8 @@ impl<'tcx> fmt::Debug for GenericArg<'tcx> {
392392
}
393393
}
394394
impl<'tcx> DebugWithInfcx<TyCtxt<'tcx>> for GenericArg<'tcx> {
395-
fn fmt<InfCtx: InferCtxtLike<TyCtxt<'tcx>>>(
396-
this: OptWithInfcx<'_, TyCtxt<'tcx>, InfCtx, &Self>,
395+
fn fmt<Infcx: InferCtxtLike<Interner = TyCtxt<'tcx>>>(
396+
this: WithInfcx<'_, Infcx, &Self>,
397397
f: &mut core::fmt::Formatter<'_>,
398398
) -> core::fmt::Result {
399399
match this.data.unpack() {
@@ -410,29 +410,29 @@ impl<'tcx> fmt::Debug for Region<'tcx> {
410410
}
411411
}
412412
impl<'tcx> DebugWithInfcx<TyCtxt<'tcx>> for Region<'tcx> {
413-
fn fmt<InfCtx: InferCtxtLike<TyCtxt<'tcx>>>(
414-
this: OptWithInfcx<'_, TyCtxt<'tcx>, InfCtx, &Self>,
413+
fn fmt<Infcx: InferCtxtLike<Interner = TyCtxt<'tcx>>>(
414+
this: WithInfcx<'_, Infcx, &Self>,
415415
f: &mut core::fmt::Formatter<'_>,
416416
) -> core::fmt::Result {
417417
write!(f, "{:?}", &this.map(|data| data.kind()))
418418
}
419419
}
420420

421421
impl<'tcx> DebugWithInfcx<TyCtxt<'tcx>> for ty::RegionVid {
422-
fn fmt<InfCtx: InferCtxtLike<TyCtxt<'tcx>>>(
423-
this: OptWithInfcx<'_, TyCtxt<'tcx>, InfCtx, &Self>,
422+
fn fmt<Infcx: InferCtxtLike<Interner = TyCtxt<'tcx>>>(
423+
this: WithInfcx<'_, Infcx, &Self>,
424424
f: &mut core::fmt::Formatter<'_>,
425425
) -> core::fmt::Result {
426-
match this.infcx.and_then(|infcx| infcx.universe_of_lt(*this.data)) {
426+
match this.infcx.universe_of_lt(*this.data) {
427427
Some(universe) => write!(f, "'?{}_{}", this.data.index(), universe.index()),
428428
None => write!(f, "{:?}", this.data),
429429
}
430430
}
431431
}
432432

433433
impl<'tcx, T: DebugWithInfcx<TyCtxt<'tcx>>> DebugWithInfcx<TyCtxt<'tcx>> for ty::Binder<'tcx, T> {
434-
fn fmt<InfCtx: InferCtxtLike<TyCtxt<'tcx>>>(
435-
this: OptWithInfcx<'_, TyCtxt<'tcx>, InfCtx, &Self>,
434+
fn fmt<Infcx: InferCtxtLike<Interner = TyCtxt<'tcx>>>(
435+
this: WithInfcx<'_, Infcx, &Self>,
436436
f: &mut core::fmt::Formatter<'_>,
437437
) -> core::fmt::Result {
438438
f.debug_tuple("Binder")

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -683,8 +683,8 @@ pub enum ExistentialPredicate<'tcx> {
683683
}
684684

685685
impl<'tcx> DebugWithInfcx<TyCtxt<'tcx>> for ExistentialPredicate<'tcx> {
686-
fn fmt<InfCtx: rustc_type_ir::InferCtxtLike<TyCtxt<'tcx>>>(
687-
this: rustc_type_ir::OptWithInfcx<'_, TyCtxt<'tcx>, InfCtx, &Self>,
686+
fn fmt<Infcx: rustc_type_ir::InferCtxtLike<Interner = TyCtxt<'tcx>>>(
687+
this: rustc_type_ir::WithInfcx<'_, Infcx, &Self>,
688688
f: &mut core::fmt::Formatter<'_>,
689689
) -> core::fmt::Result {
690690
fmt::Debug::fmt(&this.data, f)

‎compiler/rustc_type_ir/src/const_kind.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ use std::fmt;
55
use std::hash;
66

77
use crate::{
8-
DebruijnIndex, DebugWithInfcx, HashStableContext, InferCtxtLike, Interner, OptWithInfcx,
9-
TyDecoder, TyEncoder,
8+
DebruijnIndex, DebugWithInfcx, HashStableContext, InferCtxtLike, Interner, TyDecoder,
9+
TyEncoder, WithInfcx,
1010
};
1111

1212
use self::ConstKind::*;
@@ -231,13 +231,13 @@ impl<I: Interner> Clone for ConstKind<I> {
231231

232232
impl<I: Interner> fmt::Debug for ConstKind<I> {
233233
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
234-
OptWithInfcx::new_no_ctx(self).fmt(f)
234+
WithInfcx::with_no_infcx(self).fmt(f)
235235
}
236236
}
237237

238238
impl<I: Interner> DebugWithInfcx<I> for ConstKind<I> {
239-
fn fmt<InfCtx: InferCtxtLike<I>>(
240-
this: OptWithInfcx<'_, I, InfCtx, &Self>,
239+
fn fmt<Infcx: InferCtxtLike<Interner = I>>(
240+
this: WithInfcx<'_, Infcx, &Self>,
241241
f: &mut core::fmt::Formatter<'_>,
242242
) -> core::fmt::Result {
243243
use ConstKind::*;

‎compiler/rustc_type_ir/src/debug.rs

Lines changed: 43 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3,47 +3,57 @@ use crate::{Interner, UniverseIndex};
33
use core::fmt;
44
use std::marker::PhantomData;
55

6-
pub trait InferCtxtLike<I: Interner> {
7-
fn universe_of_ty(&self, ty: I::InferTy) -> Option<UniverseIndex>;
6+
pub trait InferCtxtLike {
7+
type Interner: Interner;
88

9-
fn universe_of_lt(&self, lt: I::InferRegion) -> Option<UniverseIndex>;
9+
fn universe_of_ty(&self, ty: <Self::Interner as Interner>::InferTy) -> Option<UniverseIndex>;
1010

11-
fn universe_of_ct(&self, ct: I::InferConst) -> Option<UniverseIndex>;
11+
fn universe_of_lt(
12+
&self,
13+
lt: <Self::Interner as Interner>::InferRegion,
14+
) -> Option<UniverseIndex>;
15+
16+
fn universe_of_ct(&self, ct: <Self::Interner as Interner>::InferConst)
17+
-> Option<UniverseIndex>;
1218
}
1319

14-
impl<I: Interner> InferCtxtLike<I> for core::convert::Infallible {
20+
pub struct NoInfcx<I>(PhantomData<I>);
21+
22+
impl<I: Interner> InferCtxtLike for NoInfcx<I> {
23+
type Interner = I;
24+
1525
fn universe_of_ty(&self, _ty: <I as Interner>::InferTy) -> Option<UniverseIndex> {
16-
match *self {}
26+
None
1727
}
1828

1929
fn universe_of_ct(&self, _ct: <I as Interner>::InferConst) -> Option<UniverseIndex> {
20-
match *self {}
30+
None
2131
}
2232

2333
fn universe_of_lt(&self, _lt: <I as Interner>::InferRegion) -> Option<UniverseIndex> {
24-
match *self {}
34+
None
2535
}
2636
}
2737

2838
pub trait DebugWithInfcx<I: Interner>: fmt::Debug {
29-
fn fmt<InfCtx: InferCtxtLike<I>>(
30-
this: OptWithInfcx<'_, I, InfCtx, &Self>,
39+
fn fmt<Infcx: InferCtxtLike<Interner = I>>(
40+
this: WithInfcx<'_, Infcx, &Self>,
3141
f: &mut fmt::Formatter<'_>,
3242
) -> fmt::Result;
3343
}
3444

3545
impl<I: Interner, T: DebugWithInfcx<I> + ?Sized> DebugWithInfcx<I> for &'_ T {
36-
fn fmt<InfCtx: InferCtxtLike<I>>(
37-
this: OptWithInfcx<'_, I, InfCtx, &Self>,
46+
fn fmt<Infcx: InferCtxtLike<Interner = I>>(
47+
this: WithInfcx<'_, Infcx, &Self>,
3848
f: &mut fmt::Formatter<'_>,
3949
) -> fmt::Result {
4050
<T as DebugWithInfcx<I>>::fmt(this.map(|&data| data), f)
4151
}
4252
}
4353

4454
impl<I: Interner, T: DebugWithInfcx<I>> DebugWithInfcx<I> for [T] {
45-
fn fmt<InfCtx: InferCtxtLike<I>>(
46-
this: OptWithInfcx<'_, I, InfCtx, &Self>,
55+
fn fmt<Infcx: InferCtxtLike<Interner = I>>(
56+
this: WithInfcx<'_, Infcx, &Self>,
4757
f: &mut fmt::Formatter<'_>,
4858
) -> fmt::Result {
4959
match f.alternate() {
@@ -70,46 +80,45 @@ impl<I: Interner, T: DebugWithInfcx<I>> DebugWithInfcx<I> for [T] {
7080
}
7181
}
7282

73-
pub struct OptWithInfcx<'a, I: Interner, InfCtx: InferCtxtLike<I>, T> {
83+
pub struct WithInfcx<'a, Infcx: InferCtxtLike, T> {
7484
pub data: T,
75-
pub infcx: Option<&'a InfCtx>,
76-
_interner: PhantomData<I>,
85+
pub infcx: &'a Infcx,
7786
}
7887

79-
impl<I: Interner, InfCtx: InferCtxtLike<I>, T: Copy> Copy for OptWithInfcx<'_, I, InfCtx, T> {}
88+
impl<Infcx: InferCtxtLike, T: Copy> Copy for WithInfcx<'_, Infcx, T> {}
8089

81-
impl<I: Interner, InfCtx: InferCtxtLike<I>, T: Clone> Clone for OptWithInfcx<'_, I, InfCtx, T> {
90+
impl<Infcx: InferCtxtLike, T: Clone> Clone for WithInfcx<'_, Infcx, T> {
8291
fn clone(&self) -> Self {
83-
Self { data: self.data.clone(), infcx: self.infcx, _interner: self._interner }
92+
Self { data: self.data.clone(), infcx: self.infcx }
8493
}
8594
}
8695

87-
impl<'a, I: Interner, T> OptWithInfcx<'a, I, core::convert::Infallible, T> {
88-
pub fn new_no_ctx(data: T) -> Self {
89-
Self { data, infcx: None, _interner: PhantomData }
96+
impl<'a, I: Interner, T> WithInfcx<'a, NoInfcx<I>, T> {
97+
pub fn with_no_infcx(data: T) -> Self {
98+
Self { data, infcx: &NoInfcx(PhantomData) }
9099
}
91100
}
92101

93-
impl<'a, I: Interner, InfCtx: InferCtxtLike<I>, T> OptWithInfcx<'a, I, InfCtx, T> {
94-
pub fn new(data: T, infcx: &'a InfCtx) -> Self {
95-
Self { data, infcx: Some(infcx), _interner: PhantomData }
102+
impl<'a, Infcx: InferCtxtLike, T> WithInfcx<'a, Infcx, T> {
103+
pub fn new(data: T, infcx: &'a Infcx) -> Self {
104+
Self { data, infcx }
96105
}
97106

98-
pub fn wrap<U>(self, u: U) -> OptWithInfcx<'a, I, InfCtx, U> {
99-
OptWithInfcx { data: u, infcx: self.infcx, _interner: PhantomData }
107+
pub fn wrap<U>(self, u: U) -> WithInfcx<'a, Infcx, U> {
108+
WithInfcx { data: u, infcx: self.infcx }
100109
}
101110

102-
pub fn map<U>(self, f: impl FnOnce(T) -> U) -> OptWithInfcx<'a, I, InfCtx, U> {
103-
OptWithInfcx { data: f(self.data), infcx: self.infcx, _interner: PhantomData }
111+
pub fn map<U>(self, f: impl FnOnce(T) -> U) -> WithInfcx<'a, Infcx, U> {
112+
WithInfcx { data: f(self.data), infcx: self.infcx }
104113
}
105114

106-
pub fn as_ref(&self) -> OptWithInfcx<'a, I, InfCtx, &T> {
107-
OptWithInfcx { data: &self.data, infcx: self.infcx, _interner: PhantomData }
115+
pub fn as_ref(&self) -> WithInfcx<'a, Infcx, &T> {
116+
WithInfcx { data: &self.data, infcx: self.infcx }
108117
}
109118
}
110119

111-
impl<I: Interner, InfCtx: InferCtxtLike<I>, T: DebugWithInfcx<I>> fmt::Debug
112-
for OptWithInfcx<'_, I, InfCtx, T>
120+
impl<Infcx: InferCtxtLike, T: DebugWithInfcx<Infcx::Interner>> fmt::Debug
121+
for WithInfcx<'_, Infcx, T>
113122
{
114123
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
115124
DebugWithInfcx::fmt(self.as_ref(), f)

‎compiler/rustc_type_ir/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ mod region_kind;
3434

3535
pub use codec::*;
3636
pub use const_kind::*;
37-
pub use debug::{DebugWithInfcx, InferCtxtLike, OptWithInfcx};
37+
pub use debug::{DebugWithInfcx, InferCtxtLike, WithInfcx};
3838
pub use flags::*;
3939
pub use interner::*;
4040
pub use region_kind::*;

0 commit comments

Comments
 (0)