Skip to content

Commit b24330f

Browse files
borsbors
committed
Auto merge of #53705 - ms2300:tmp, r=oli-obk
#53576 Renaming TyAnon -> TyOpaque Fixes #53576
2 parents 05cb29e + f4d4faa commit b24330f

Some content is hidden

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

50 files changed

+228
-224
lines changed

‎src/librustc/ich/impls_ty.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -878,7 +878,7 @@ for ty::TyKind<'gcx>
878878
Projection(ref projection_ty) => {
879879
projection_ty.hash_stable(hcx, hasher);
880880
}
881-
Anon(def_id, substs) => {
881+
Opaque(def_id, substs) => {
882882
def_id.hash_stable(hcx, hasher);
883883
substs.hash_stable(hcx, hasher);
884884
}

‎src/librustc/infer/canonical/canonicalizer.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ impl<'cx, 'gcx, 'tcx> TypeFolder<'gcx, 'tcx> for Canonicalizer<'cx, 'gcx, 'tcx>
285285
| ty::Projection(..)
286286
| ty::Foreign(..)
287287
| ty::Param(..)
288-
| ty::Anon(..) => {
288+
| ty::Opaque(..) => {
289289
if t.flags.intersects(self.needs_canonical_flags) {
290290
t.super_fold_with(self)
291291
} else {

‎src/librustc/infer/freshen.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ impl<'a, 'gcx, 'tcx> TypeFolder<'gcx, 'tcx> for TypeFreshener<'a, 'gcx, 'tcx> {
197197
ty::Param(..) |
198198
ty::Closure(..) |
199199
ty::GeneratorWitness(..) |
200-
ty::Anon(..) => {
200+
ty::Opaque(..) => {
201201
t.super_fold_with(self)
202202
}
203203
}

‎src/librustc/infer/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ use self::outlives::env::OutlivesEnvironment;
4848
use self::type_variable::TypeVariableOrigin;
4949
use self::unify_key::ToType;
5050

51-
pub mod anon_types;
51+
pub mod opaque_types;
5252
pub mod at;
5353
pub mod canonical;
5454
mod combine;

‎src/librustc/infer/anon_types/mod.rs renamed to ‎src/librustc/infer/opaque_types/mod.rs

+87-84
Large diffs are not rendered by default.

‎src/librustc/traits/coherence.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ fn ty_is_local_constructor(ty: Ty, in_crate: InCrate) -> bool {
483483
ty::Closure(..) |
484484
ty::Generator(..) |
485485
ty::GeneratorWitness(..) |
486-
ty::Anon(..) => {
486+
ty::Opaque(..) => {
487487
bug!("ty_is_local invoked on unexpected type: {:?}", ty)
488488
}
489489
}

‎src/librustc/traits/error_reporting.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
258258
ty::Tuple(..) => Some(10),
259259
ty::Projection(..) => Some(11),
260260
ty::Param(..) => Some(12),
261-
ty::Anon(..) => Some(13),
261+
ty::Opaque(..) => Some(13),
262262
ty::Never => Some(14),
263263
ty::Adt(adt, ..) => match adt.adt_kind() {
264264
AdtKind::Struct => Some(15),

‎src/librustc/traits/project.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ impl<'a, 'b, 'gcx, 'tcx> TypeFolder<'gcx, 'tcx> for AssociatedTypeNormalizer<'a,
366366

367367
let ty = ty.super_fold_with(self);
368368
match ty.sty {
369-
ty::Anon(def_id, substs) if !substs.has_escaping_regions() => { // (*)
369+
ty::Opaque(def_id, substs) if !substs.has_escaping_regions() => { // (*)
370370
// Only normalize `impl Trait` after type-checking, usually in codegen.
371371
match self.param_env.reveal {
372372
Reveal::UserFacing => ty,
@@ -986,7 +986,7 @@ fn assemble_candidates_from_trait_def<'cx, 'gcx, 'tcx>(
986986
ty::Projection(ref data) => {
987987
(data.trait_ref(tcx).def_id, data.substs)
988988
}
989-
ty::Anon(def_id, substs) => (def_id, substs),
989+
ty::Opaque(def_id, substs) => (def_id, substs),
990990
ty::Infer(ty::TyVar(_)) => {
991991
// If the self-type is an inference variable, then it MAY wind up
992992
// being a projected type, so induce an ambiguity.
@@ -1518,7 +1518,7 @@ fn confirm_impl_candidate<'cx, 'gcx, 'tcx>(
15181518
let substs = translate_substs(selcx.infcx(), param_env, impl_def_id, substs, assoc_ty.node);
15191519
let ty = if let ty::AssociatedKind::Existential = assoc_ty.item.kind {
15201520
let item_substs = Substs::identity_for_item(tcx, assoc_ty.item.def_id);
1521-
tcx.mk_anon(assoc_ty.item.def_id, item_substs)
1521+
tcx.mk_opaque(assoc_ty.item.def_id, item_substs)
15221522
} else {
15231523
tcx.type_of(assoc_ty.item.def_id)
15241524
};

‎src/librustc/traits/query/dropck_outlives.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ pub fn trivial_dropck_outlives<'tcx>(tcx: TyCtxt<'_, '_, 'tcx>, ty: Ty<'tcx>) ->
258258
ty::Dynamic(..)
259259
| ty::Projection(..)
260260
| ty::Param(_)
261-
| ty::Anon(..)
261+
| ty::Opaque(..)
262262
| ty::Infer(_)
263263
| ty::Generator(..) => false,
264264
}

‎src/librustc/traits/query/normalize.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ impl<'cx, 'gcx, 'tcx> TypeFolder<'gcx, 'tcx> for QueryNormalizer<'cx, 'gcx, 'tcx
9999
fn fold_ty(&mut self, ty: Ty<'tcx>) -> Ty<'tcx> {
100100
let ty = ty.super_fold_with(self);
101101
match ty.sty {
102-
ty::Anon(def_id, substs) if !substs.has_escaping_regions() => {
102+
ty::Opaque(def_id, substs) if !substs.has_escaping_regions() => {
103103
// (*)
104104
// Only normalize `impl Trait` after type-checking, usually in codegen.
105105
match self.param_env.reveal {

‎src/librustc/traits/select.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1492,7 +1492,7 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {
14921492
// before we go into the whole skolemization thing, just
14931493
// quickly check if the self-type is a projection at all.
14941494
match obligation.predicate.skip_binder().trait_ref.self_ty().sty {
1495-
ty::Projection(_) | ty::Anon(..) => {}
1495+
ty::Projection(_) | ty::Opaque(..) => {}
14961496
ty::Infer(ty::TyVar(_)) => {
14971497
span_bug!(obligation.cause.span,
14981498
"Self=_ should have been handled by assemble_candidates");
@@ -1528,7 +1528,7 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {
15281528
let (def_id, substs) = match skol_trait_predicate.trait_ref.self_ty().sty {
15291529
ty::Projection(ref data) =>
15301530
(data.trait_ref(self.tcx()).def_id, data.substs),
1531-
ty::Anon(def_id, substs) => (def_id, substs),
1531+
ty::Opaque(def_id, substs) => (def_id, substs),
15321532
_ => {
15331533
span_bug!(
15341534
obligation.cause.span,
@@ -2203,7 +2203,7 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {
22032203
))
22042204
}
22052205

2206-
ty::Projection(_) | ty::Param(_) | ty::Anon(..) => None,
2206+
ty::Projection(_) | ty::Param(_) | ty::Opaque(..) => None,
22072207
ty::Infer(ty::TyVar(_)) => Ambiguous,
22082208

22092209
ty::Infer(ty::CanonicalTy(_)) |
@@ -2265,7 +2265,7 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {
22652265
}
22662266
}
22672267

2268-
ty::Adt(..) | ty::Projection(..) | ty::Param(..) | ty::Anon(..) => {
2268+
ty::Adt(..) | ty::Projection(..) | ty::Param(..) | ty::Opaque(..) => {
22692269
// Fallback to whatever user-defined impls exist in this case.
22702270
None
22712271
}
@@ -2369,7 +2369,7 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {
23692369
.collect()
23702370
}
23712371

2372-
ty::Anon(def_id, substs) => {
2372+
ty::Opaque(def_id, substs) => {
23732373
// We can resolve the `impl Trait` to its concrete type,
23742374
// which enforces a DAG between the functions requiring
23752375
// the auto trait bounds in question.

‎src/librustc/ty/context.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -2136,7 +2136,7 @@ impl<'a, 'tcx> TyCtxt<'a, 'tcx, 'tcx> {
21362136
self,
21372137
Adt, Array, Slice, RawPtr, Ref, FnDef, FnPtr,
21382138
Generator, GeneratorWitness, Dynamic, Closure, Tuple,
2139-
Param, Infer, Projection, Anon, Foreign);
2139+
Param, Infer, Projection, Opaque, Foreign);
21402140

21412141
println!("Substs interner: #{}", self.interners.substs.borrow().len());
21422142
println!("Region interner: #{}", self.interners.region.borrow().len());
@@ -2606,8 +2606,8 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
26062606
}
26072607
}
26082608

2609-
pub fn mk_anon(self, def_id: DefId, substs: &'tcx Substs<'tcx>) -> Ty<'tcx> {
2610-
self.mk_ty(Anon(def_id, substs))
2609+
pub fn mk_opaque(self, def_id: DefId, substs: &'tcx Substs<'tcx>) -> Ty<'tcx> {
2610+
self.mk_ty(Opaque(def_id, substs))
26112611
}
26122612

26132613
pub fn intern_existential_predicates(self, eps: &[ExistentialPredicate<'tcx>])

‎src/librustc/ty/error.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ impl<'a, 'gcx, 'lcx, 'tcx> ty::TyS<'tcx> {
229229
"type parameter".to_string()
230230
}
231231
}
232-
ty::Anon(..) => "anonymized type".to_string(),
232+
ty::Opaque(..) => "opaque type".to_string(),
233233
ty::Error => "type error".to_string(),
234234
}
235235
}

‎src/librustc/ty/fast_reject.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ pub enum SimplifiedTypeGen<D>
4747
ClosureSimplifiedType(D),
4848
GeneratorSimplifiedType(D),
4949
GeneratorWitnessSimplifiedType(usize),
50-
AnonSimplifiedType(D),
50+
OpaqueSimplifiedType(D),
5151
FunctionSimplifiedType(usize),
5252
ParameterSimplifiedType,
5353
ForeignSimplifiedType(DefId),
@@ -115,8 +115,8 @@ pub fn simplify_type<'a, 'gcx, 'tcx>(tcx: TyCtxt<'a, 'gcx, 'tcx>,
115115
None
116116
}
117117
}
118-
ty::Anon(def_id, _) => {
119-
Some(AnonSimplifiedType(def_id))
118+
ty::Opaque(def_id, _) => {
119+
Some(OpaqueSimplifiedType(def_id))
120120
}
121121
ty::Foreign(def_id) => {
122122
Some(ForeignSimplifiedType(def_id))
@@ -146,7 +146,7 @@ impl<D: Copy + Debug + Ord + Eq + Hash> SimplifiedTypeGen<D> {
146146
ClosureSimplifiedType(d) => ClosureSimplifiedType(map(d)),
147147
GeneratorSimplifiedType(d) => GeneratorSimplifiedType(map(d)),
148148
GeneratorWitnessSimplifiedType(n) => GeneratorWitnessSimplifiedType(n),
149-
AnonSimplifiedType(d) => AnonSimplifiedType(map(d)),
149+
OpaqueSimplifiedType(d) => OpaqueSimplifiedType(map(d)),
150150
FunctionSimplifiedType(n) => FunctionSimplifiedType(n),
151151
ParameterSimplifiedType => ParameterSimplifiedType,
152152
ForeignSimplifiedType(d) => ForeignSimplifiedType(d),
@@ -181,7 +181,7 @@ impl<'a, 'gcx, D> HashStable<StableHashingContext<'a>> for SimplifiedTypeGen<D>
181181
ClosureSimplifiedType(d) => d.hash_stable(hcx, hasher),
182182
GeneratorSimplifiedType(d) => d.hash_stable(hcx, hasher),
183183
GeneratorWitnessSimplifiedType(n) => n.hash_stable(hcx, hasher),
184-
AnonSimplifiedType(d) => d.hash_stable(hcx, hasher),
184+
OpaqueSimplifiedType(d) => d.hash_stable(hcx, hasher),
185185
FunctionSimplifiedType(n) => n.hash_stable(hcx, hasher),
186186
ForeignSimplifiedType(d) => d.hash_stable(hcx, hasher),
187187
}

‎src/librustc/ty/flags.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ impl FlagComputation {
150150
self.add_projection_ty(data);
151151
}
152152

153-
&ty::Anon(_, substs) => {
153+
&ty::Opaque(_, substs) => {
154154
self.add_flags(TypeFlags::HAS_PROJECTION);
155155
self.add_substs(substs);
156156
}

‎src/librustc/ty/fold.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,7 @@ impl<'tcx> TypeVisitor<'tcx> for LateBoundRegionsCollector {
771771
// in the normalized form
772772
if self.just_constrained {
773773
match t.sty {
774-
ty::Projection(..) | ty::Anon(..) => { return false; }
774+
ty::Projection(..) | ty::Opaque(..) => { return false; }
775775
_ => { }
776776
}
777777
}

‎src/librustc/ty/item_path.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ pub fn characteristic_def_id_of_type(ty: Ty) -> Option<DefId> {
385385
ty::FnPtr(_) |
386386
ty::Projection(_) |
387387
ty::Param(_) |
388-
ty::Anon(..) |
388+
ty::Opaque(..) |
389389
ty::Infer(_) |
390390
ty::Error |
391391
ty::GeneratorWitness(..) |

‎src/librustc/ty/layout.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1103,7 +1103,7 @@ impl<'a, 'tcx> LayoutCx<'tcx, TyCtxt<'a, 'tcx, 'tcx>> {
11031103
}
11041104

11051105
// Types with no meaningful known layout.
1106-
ty::Projection(_) | ty::Anon(..) => {
1106+
ty::Projection(_) | ty::Opaque(..) => {
11071107
let normalized = tcx.normalize_erasing_regions(param_env, ty);
11081108
if ty == normalized {
11091109
return Err(LayoutError::Unknown(ty));
@@ -1373,7 +1373,7 @@ impl<'a, 'tcx> SizeSkeleton<'tcx> {
13731373
}
13741374
}
13751375

1376-
ty::Projection(_) | ty::Anon(..) => {
1376+
ty::Projection(_) | ty::Opaque(..) => {
13771377
let normalized = tcx.normalize_erasing_regions(param_env, ty);
13781378
if ty == normalized {
13791379
Err(err)
@@ -1685,7 +1685,7 @@ impl<'a, 'tcx, C> TyLayoutMethods<'tcx, C> for Ty<'tcx>
16851685
}
16861686
}
16871687

1688-
ty::Projection(_) | ty::Anon(..) | ty::Param(_) |
1688+
ty::Projection(_) | ty::Opaque(..) | ty::Param(_) |
16891689
ty::Infer(_) | ty::Error => {
16901690
bug!("TyLayout::field_type: unexpected type `{}`", this.ty)
16911691
}

‎src/librustc/ty/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ impl<'tcx> TyS<'tcx> {
559559

560560
pub fn is_suggestable(&self) -> bool {
561561
match self.sty {
562-
TyKind::Anon(..) |
562+
TyKind::Opaque(..) |
563563
TyKind::FnDef(..) |
564564
TyKind::FnPtr(..) |
565565
TyKind::Dynamic(..) |
@@ -2320,7 +2320,7 @@ impl<'a, 'gcx, 'tcx> AdtDef {
23202320
.collect()
23212321
}
23222322

2323-
Projection(..) | Anon(..) => {
2323+
Projection(..) | Opaque(..) => {
23242324
// must calculate explicitly.
23252325
// FIXME: consider special-casing always-Sized projections
23262326
vec![ty]

‎src/librustc/ty/outlives.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
144144
ty::Float(..) | // OutlivesScalar
145145
ty::Never | // ...
146146
ty::Adt(..) | // OutlivesNominalType
147-
ty::Anon(..) | // OutlivesNominalType (ish)
147+
ty::Opaque(..) | // OutlivesNominalType (ish)
148148
ty::Foreign(..) | // OutlivesNominalType
149149
ty::Str | // OutlivesScalar (ish)
150150
ty::Array(..) | // ...

‎src/librustc/ty/relate.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -564,11 +564,11 @@ pub fn super_relate_tys<'a, 'gcx, 'tcx, R>(relation: &mut R,
564564
Ok(tcx.mk_projection(projection_ty.item_def_id, projection_ty.substs))
565565
}
566566

567-
(&ty::Anon(a_def_id, a_substs), &ty::Anon(b_def_id, b_substs))
567+
(&ty::Opaque(a_def_id, a_substs), &ty::Opaque(b_def_id, b_substs))
568568
if a_def_id == b_def_id =>
569569
{
570570
let substs = relate_substs(relation, None, a_substs, b_substs)?;
571-
Ok(tcx.mk_anon(a_def_id, substs))
571+
Ok(tcx.mk_opaque(a_def_id, substs))
572572
}
573573

574574
_ =>

‎src/librustc/ty/structural_impls.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -865,7 +865,7 @@ impl<'tcx> TypeFoldable<'tcx> for Ty<'tcx> {
865865
ty::GeneratorWitness(types) => ty::GeneratorWitness(types.fold_with(folder)),
866866
ty::Closure(did, substs) => ty::Closure(did, substs.fold_with(folder)),
867867
ty::Projection(ref data) => ty::Projection(data.fold_with(folder)),
868-
ty::Anon(did, substs) => ty::Anon(did, substs.fold_with(folder)),
868+
ty::Opaque(did, substs) => ty::Opaque(did, substs.fold_with(folder)),
869869
ty::Bool | ty::Char | ty::Str | ty::Int(_) |
870870
ty::Uint(_) | ty::Float(_) | ty::Error | ty::Infer(_) |
871871
ty::Param(..) | ty::Never | ty::Foreign(..) => return self
@@ -900,7 +900,7 @@ impl<'tcx> TypeFoldable<'tcx> for Ty<'tcx> {
900900
ty::GeneratorWitness(ref types) => types.visit_with(visitor),
901901
ty::Closure(_did, ref substs) => substs.visit_with(visitor),
902902
ty::Projection(ref data) => data.visit_with(visitor),
903-
ty::Anon(_, ref substs) => substs.visit_with(visitor),
903+
ty::Opaque(_, ref substs) => substs.visit_with(visitor),
904904
ty::Bool | ty::Char | ty::Str | ty::Int(_) |
905905
ty::Uint(_) | ty::Float(_) | ty::Error | ty::Infer(_) |
906906
ty::Param(..) | ty::Never | ty::Foreign(..) => false,

‎src/librustc/ty/sty.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -157,13 +157,13 @@ pub enum TyKind<'tcx> {
157157
/// `<T as Trait<..>>::N`.
158158
Projection(ProjectionTy<'tcx>),
159159

160-
/// Anonymized (`impl Trait`) type found in a return type.
160+
/// Opaque (`impl Trait`) type found in a return type.
161161
/// The DefId comes either from
162162
/// * the `impl Trait` ast::Ty node,
163163
/// * or the `existential type` declaration
164164
/// The substitutions are for the generics of the function in question.
165165
/// After typeck, the concrete type can be found in the `types` map.
166-
Anon(DefId, &'tcx Substs<'tcx>),
166+
Opaque(DefId, &'tcx Substs<'tcx>),
167167

168168
/// A type parameter; for example, `T` in `fn f<T>(x: T) {}
169169
Param(ParamTy),
@@ -1755,7 +1755,7 @@ impl<'a, 'gcx, 'tcx> TyS<'tcx> {
17551755

17561756
pub fn is_impl_trait(&self) -> bool {
17571757
match self.sty {
1758-
Anon(..) => true,
1758+
Opaque(..) => true,
17591759
_ => false,
17601760
}
17611761
}
@@ -1782,7 +1782,7 @@ impl<'a, 'gcx, 'tcx> TyS<'tcx> {
17821782
}
17831783
v
17841784
}
1785-
Adt(_, substs) | Anon(_, substs) => {
1785+
Adt(_, substs) | Opaque(_, substs) => {
17861786
substs.regions().collect()
17871787
}
17881788
Closure(_, ClosureSubsts { ref substs }) |
@@ -1867,7 +1867,7 @@ impl<'a, 'gcx, 'tcx> TyS<'tcx> {
18671867
ty::Adt(def, _substs) =>
18681868
def.sized_constraint(tcx).is_empty(),
18691869

1870-
ty::Projection(_) | ty::Param(_) | ty::Anon(..) => false,
1870+
ty::Projection(_) | ty::Param(_) | ty::Opaque(..) => false,
18711871

18721872
ty::Infer(ty::TyVar(_)) => false,
18731873

‎src/librustc/ty/util.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -956,7 +956,7 @@ fn needs_drop_raw<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
956956
// Can refer to a type which may drop.
957957
// FIXME(eddyb) check this against a ParamEnv.
958958
ty::Dynamic(..) | ty::Projection(..) | ty::Param(_) |
959-
ty::Anon(..) | ty::Infer(_) | ty::Error => true,
959+
ty::Opaque(..) | ty::Infer(_) | ty::Error => true,
960960

961961
// Structural recursion.
962962
ty::Array(ty, _) | ty::Slice(ty) => needs_drop(ty),

‎src/librustc/ty/walk.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ fn push_subtypes<'tcx>(stack: &mut TypeWalkerStack<'tcx>, parent_ty: Ty<'tcx>) {
114114
substs.types().rev().chain(opt_ty)
115115
}));
116116
}
117-
ty::Adt(_, substs) | ty::Anon(_, substs) => {
117+
ty::Adt(_, substs) | ty::Opaque(_, substs) => {
118118
stack.extend(substs.types().rev());
119119
}
120120
ty::Closure(_, ref substs) => {

‎src/librustc/ty/wf.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ impl<'a, 'gcx, 'tcx> WfPredicates<'a, 'gcx, 'tcx> {
360360
// types appearing in the fn signature
361361
}
362362

363-
ty::Anon(did, substs) => {
363+
ty::Opaque(did, substs) => {
364364
// all of the requirements on type parameters
365365
// should've been checked by the instantiation
366366
// of whatever returned this exact `impl Trait`.

0 commit comments

Comments
 (0)