Skip to content

Commit 0dbe429

Browse files
compiler-errorscompiler-errors
committed
Remove redundant type parameter
1 parent 6b90f51 commit 0dbe429

File tree

10 files changed

+98
-87
lines changed

10 files changed

+98
-87
lines changed

‎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<Infcx: InferCtxtLike<TyCtxt<'tcx>>>(
125-
this: OptWithInfcx<'_, TyCtxt<'tcx>, Infcx, &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;
@@ -89,12 +89,12 @@ impl fmt::Debug for ty::FreeRegion {
8989

9090
impl<'tcx> fmt::Debug for ty::FnSig<'tcx> {
9191
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
92-
OptWithInfcx::new_no_ctx(self).fmt(f)
92+
WithInfcx::with_no_infcx(self).fmt(f)
9393
}
9494
}
9595
impl<'tcx> DebugWithInfcx<TyCtxt<'tcx>> for ty::FnSig<'tcx> {
96-
fn fmt<Infcx: InferCtxtLike<TyCtxt<'tcx>>>(
97-
this: OptWithInfcx<'_, TyCtxt<'tcx>, Infcx, &Self>,
96+
fn fmt<Infcx: InferCtxtLike<Interner = TyCtxt<'tcx>>>(
97+
this: WithInfcx<'_, Infcx, &Self>,
9898
f: &mut core::fmt::Formatter<'_>,
9999
) -> core::fmt::Result {
100100
let sig = this.data;
@@ -149,8 +149,8 @@ impl<'tcx> fmt::Debug for ty::TraitRef<'tcx> {
149149
}
150150

151151
impl<'tcx> ty::DebugWithInfcx<TyCtxt<'tcx>> for Ty<'tcx> {
152-
fn fmt<Infcx: InferCtxtLike<TyCtxt<'tcx>>>(
153-
this: OptWithInfcx<'_, TyCtxt<'tcx>, Infcx, &Self>,
152+
fn fmt<Infcx: InferCtxtLike<Interner = TyCtxt<'tcx>>>(
153+
this: WithInfcx<'_, Infcx, &Self>,
154154
f: &mut core::fmt::Formatter<'_>,
155155
) -> core::fmt::Result {
156156
this.data.fmt(f)
@@ -238,12 +238,12 @@ impl<'tcx> fmt::Debug for ty::PredicateKind<'tcx> {
238238

239239
impl<'tcx> fmt::Debug for AliasTy<'tcx> {
240240
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
241-
OptWithInfcx::new_no_ctx(self).fmt(f)
241+
WithInfcx::with_no_infcx(self).fmt(f)
242242
}
243243
}
244244
impl<'tcx> DebugWithInfcx<TyCtxt<'tcx>> for AliasTy<'tcx> {
245-
fn fmt<Infcx: InferCtxtLike<TyCtxt<'tcx>>>(
246-
this: OptWithInfcx<'_, TyCtxt<'tcx>, Infcx, &Self>,
245+
fn fmt<Infcx: InferCtxtLike<Interner = TyCtxt<'tcx>>>(
246+
this: WithInfcx<'_, Infcx, &Self>,
247247
f: &mut core::fmt::Formatter<'_>,
248248
) -> core::fmt::Result {
249249
f.debug_struct("AliasTy")
@@ -263,12 +263,12 @@ impl<'tcx> fmt::Debug for ty::InferConst<'tcx> {
263263
}
264264
}
265265
impl<'tcx> DebugWithInfcx<TyCtxt<'tcx>> for ty::InferConst<'tcx> {
266-
fn fmt<Infcx: InferCtxtLike<TyCtxt<'tcx>>>(
267-
this: OptWithInfcx<'_, TyCtxt<'tcx>, Infcx, &Self>,
266+
fn fmt<Infcx: InferCtxtLike<Interner = TyCtxt<'tcx>>>(
267+
this: WithInfcx<'_, Infcx, &Self>,
268268
f: &mut core::fmt::Formatter<'_>,
269269
) -> core::fmt::Result {
270270
use ty::InferConst::*;
271-
match this.infcx.and_then(|infcx| infcx.universe_of_ct(*this.data)) {
271+
match this.infcx.universe_of_ct(*this.data) {
272272
None => write!(f, "{:?}", this.data),
273273
Some(universe) => match *this.data {
274274
Var(vid) => write!(f, "?{}_{}c", vid.index, universe.index()),
@@ -283,12 +283,12 @@ impl<'tcx> DebugWithInfcx<TyCtxt<'tcx>> for ty::InferConst<'tcx> {
283283

284284
impl<'tcx> fmt::Debug for ty::consts::Expr<'tcx> {
285285
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
286-
OptWithInfcx::new_no_ctx(self).fmt(f)
286+
WithInfcx::with_no_infcx(self).fmt(f)
287287
}
288288
}
289289
impl<'tcx> DebugWithInfcx<TyCtxt<'tcx>> for ty::consts::Expr<'tcx> {
290-
fn fmt<Infcx: InferCtxtLike<TyCtxt<'tcx>>>(
291-
this: OptWithInfcx<'_, TyCtxt<'tcx>, Infcx, &Self>,
290+
fn fmt<Infcx: InferCtxtLike<Interner = TyCtxt<'tcx>>>(
291+
this: WithInfcx<'_, Infcx, &Self>,
292292
f: &mut core::fmt::Formatter<'_>,
293293
) -> core::fmt::Result {
294294
match this.data {
@@ -316,12 +316,12 @@ impl<'tcx> DebugWithInfcx<TyCtxt<'tcx>> for ty::consts::Expr<'tcx> {
316316

317317
impl<'tcx> fmt::Debug for ty::UnevaluatedConst<'tcx> {
318318
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
319-
OptWithInfcx::new_no_ctx(self).fmt(f)
319+
WithInfcx::with_no_infcx(self).fmt(f)
320320
}
321321
}
322322
impl<'tcx> DebugWithInfcx<TyCtxt<'tcx>> for ty::UnevaluatedConst<'tcx> {
323-
fn fmt<Infcx: InferCtxtLike<TyCtxt<'tcx>>>(
324-
this: OptWithInfcx<'_, TyCtxt<'tcx>, Infcx, &Self>,
323+
fn fmt<Infcx: InferCtxtLike<Interner = TyCtxt<'tcx>>>(
324+
this: WithInfcx<'_, Infcx, &Self>,
325325
f: &mut core::fmt::Formatter<'_>,
326326
) -> core::fmt::Result {
327327
f.debug_struct("UnevaluatedConst")
@@ -333,12 +333,12 @@ impl<'tcx> DebugWithInfcx<TyCtxt<'tcx>> for ty::UnevaluatedConst<'tcx> {
333333

334334
impl<'tcx> fmt::Debug for ty::Const<'tcx> {
335335
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
336-
OptWithInfcx::new_no_ctx(self).fmt(f)
336+
WithInfcx::with_no_infcx(self).fmt(f)
337337
}
338338
}
339339
impl<'tcx> DebugWithInfcx<TyCtxt<'tcx>> for ty::Const<'tcx> {
340-
fn fmt<Infcx: InferCtxtLike<TyCtxt<'tcx>>>(
341-
this: OptWithInfcx<'_, TyCtxt<'tcx>, Infcx, &Self>,
340+
fn fmt<Infcx: InferCtxtLike<Interner = TyCtxt<'tcx>>>(
341+
this: WithInfcx<'_, Infcx, &Self>,
342342
f: &mut core::fmt::Formatter<'_>,
343343
) -> core::fmt::Result {
344344
// If this is a value, we spend some effort to make it look nice.
@@ -395,8 +395,8 @@ impl<'tcx> fmt::Debug for GenericArg<'tcx> {
395395
}
396396
}
397397
impl<'tcx> DebugWithInfcx<TyCtxt<'tcx>> for GenericArg<'tcx> {
398-
fn fmt<Infcx: InferCtxtLike<TyCtxt<'tcx>>>(
399-
this: OptWithInfcx<'_, TyCtxt<'tcx>, Infcx, &Self>,
398+
fn fmt<Infcx: InferCtxtLike<Interner = TyCtxt<'tcx>>>(
399+
this: WithInfcx<'_, Infcx, &Self>,
400400
f: &mut core::fmt::Formatter<'_>,
401401
) -> core::fmt::Result {
402402
match this.data.unpack() {
@@ -413,29 +413,29 @@ impl<'tcx> fmt::Debug for Region<'tcx> {
413413
}
414414
}
415415
impl<'tcx> DebugWithInfcx<TyCtxt<'tcx>> for Region<'tcx> {
416-
fn fmt<Infcx: InferCtxtLike<TyCtxt<'tcx>>>(
417-
this: OptWithInfcx<'_, TyCtxt<'tcx>, Infcx, &Self>,
416+
fn fmt<Infcx: InferCtxtLike<Interner = TyCtxt<'tcx>>>(
417+
this: WithInfcx<'_, Infcx, &Self>,
418418
f: &mut core::fmt::Formatter<'_>,
419419
) -> core::fmt::Result {
420420
write!(f, "{:?}", &this.map(|data| data.kind()))
421421
}
422422
}
423423

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

436436
impl<'tcx, T: DebugWithInfcx<TyCtxt<'tcx>>> DebugWithInfcx<TyCtxt<'tcx>> for ty::Binder<'tcx, T> {
437-
fn fmt<Infcx: InferCtxtLike<TyCtxt<'tcx>>>(
438-
this: OptWithInfcx<'_, TyCtxt<'tcx>, Infcx, &Self>,
437+
fn fmt<Infcx: InferCtxtLike<Interner = TyCtxt<'tcx>>>(
438+
this: WithInfcx<'_, Infcx, &Self>,
439439
f: &mut core::fmt::Formatter<'_>,
440440
) -> core::fmt::Result {
441441
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<Infcx: rustc_type_ir::InferCtxtLike<TyCtxt<'tcx>>>(
687-
this: rustc_type_ir::OptWithInfcx<'_, TyCtxt<'tcx>, Infcx, &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::with_no_infcx(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<Infcx: InferCtxtLike<I>>(
240-
this: OptWithInfcx<'_, I, Infcx, &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: 41 additions & 32 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<Infcx: InferCtxtLike<I>>(
30-
this: OptWithInfcx<'_, I, Infcx, &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<Infcx: InferCtxtLike<I>>(
37-
this: OptWithInfcx<'_, I, Infcx, &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<Infcx: InferCtxtLike<I>>(
46-
this: OptWithInfcx<'_, I, Infcx, &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, Infcx: InferCtxtLike<I>, T> {
83+
pub struct WithInfcx<'a, Infcx: InferCtxtLike, T> {
7484
pub data: T,
75-
pub infcx: Option<&'a Infcx>,
76-
_interner: PhantomData<I>,
85+
pub infcx: &'a Infcx,
7786
}
7887

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

81-
impl<I: Interner, Infcx: InferCtxtLike<I>, T: Clone> Clone for OptWithInfcx<'_, I, Infcx, 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> {
96+
impl<'a, I: Interner, T> WithInfcx<'a, NoInfcx<I>, T> {
8897
pub fn with_no_infcx(data: T) -> Self {
89-
Self { data, infcx: None, _interner: PhantomData }
98+
Self { data, infcx: &NoInfcx(PhantomData) }
9099
}
91100
}
92101

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

98-
pub fn wrap<U>(self, u: U) -> OptWithInfcx<'a, I, Infcx, 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, Infcx, 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, Infcx, &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, Infcx: InferCtxtLike<I>, T: DebugWithInfcx<I>> fmt::Debug
112-
for OptWithInfcx<'_, I, Infcx, 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)