Skip to content

Commit 41f6b95

Browse files
committed
Remove ty::UnnormalizedProjection
1 parent 99cb9cc commit 41f6b95

File tree

39 files changed

+24
-100
lines changed

39 files changed

+24
-100
lines changed

src/librustc_codegen_ssa/debuginfo/type_names.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,6 @@ pub fn push_debuginfo_type_name<'tcx>(
198198
ty::Error
199199
| ty::Infer(_)
200200
| ty::Placeholder(..)
201-
| ty::UnnormalizedProjection(..)
202201
| ty::Projection(..)
203202
| ty::Bound(..)
204203
| ty::Opaque(..)

src/librustc_infer/infer/canonical/canonicalizer.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,6 @@ impl<'cx, 'tcx> TypeFolder<'tcx> for Canonicalizer<'cx, 'tcx> {
415415
| ty::Never
416416
| ty::Tuple(..)
417417
| ty::Projection(..)
418-
| ty::UnnormalizedProjection(..)
419418
| ty::Foreign(..)
420419
| ty::Param(..)
421420
| ty::Opaque(..) => {

src/librustc_infer/infer/error_reporting/need_type_info.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
554554
let output = bound_output.skip_binder();
555555
err.span_label(e.span, &format!("this method call resolves to `{:?}`", output));
556556
let kind = &output.kind;
557-
if let ty::Projection(proj) | ty::UnnormalizedProjection(proj) = kind {
557+
if let ty::Projection(proj) = kind {
558558
if let Some(span) = self.tcx.hir().span_if_local(proj.item_def_id) {
559559
err.span_label(span, &format!("`{:?}` defined here", output));
560560
}

src/librustc_infer/infer/freshen.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@ impl<'a, 'tcx> TypeFolder<'tcx> for TypeFreshener<'a, 'tcx> {
204204
| ty::Never
205205
| ty::Tuple(..)
206206
| ty::Projection(..)
207-
| ty::UnnormalizedProjection(..)
208207
| ty::Foreign(..)
209208
| ty::Param(..)
210209
| ty::Closure(..)

src/librustc_lint/types.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -888,7 +888,6 @@ impl<'a, 'tcx> ImproperCTypesVisitor<'a, 'tcx> {
888888
| ty::Generator(..)
889889
| ty::GeneratorWitness(..)
890890
| ty::Placeholder(..)
891-
| ty::UnnormalizedProjection(..)
892891
| ty::Projection(..)
893892
| ty::Opaque(..)
894893
| ty::FnDef(..) => bug!("unexpected type in foreign function: {:?}", ty),

src/librustc_middle/traits/query.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,6 @@ pub fn trivial_dropck_outlives<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>) -> bool {
255255
| ty::Infer(_)
256256
| ty::Bound(..)
257257
| ty::Generator(..) => false,
258-
259-
ty::UnnormalizedProjection(..) => bug!("only used with chalk-engine"),
260258
}
261259
}
262260

src/librustc_middle/ty/context.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1878,7 +1878,6 @@ impl<'tcx> TyCtxt<'tcx> {
18781878
Bound,
18791879
Param,
18801880
Infer,
1881-
UnnormalizedProjection,
18821881
Projection,
18831882
Opaque,
18841883
Foreign

src/librustc_middle/ty/error.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,6 @@ impl<'tcx> ty::TyS<'tcx> {
284284
ty::Infer(ty::FreshIntTy(_)) => "fresh integral type".into(),
285285
ty::Infer(ty::FreshFloatTy(_)) => "fresh floating-point type".into(),
286286
ty::Projection(_) => "associated type".into(),
287-
ty::UnnormalizedProjection(_) => "non-normalized associated type".into(),
288287
ty::Param(p) => format!("type parameter `{}`", p).into(),
289288
ty::Opaque(..) => "opaque type".into(),
290289
ty::Error => "type error".into(),
@@ -323,7 +322,6 @@ impl<'tcx> ty::TyS<'tcx> {
323322
ty::Placeholder(..) => "higher-ranked type".into(),
324323
ty::Bound(..) => "bound type variable".into(),
325324
ty::Projection(_) => "associated type".into(),
326-
ty::UnnormalizedProjection(_) => "associated type".into(),
327325
ty::Param(_) => "type parameter".into(),
328326
ty::Opaque(..) => "opaque type".into(),
329327
}

src/librustc_middle/ty/fast_reject.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ pub fn simplify_type(
9090
ty::Never => Some(NeverSimplifiedType),
9191
ty::Tuple(ref tys) => Some(TupleSimplifiedType(tys.len())),
9292
ty::FnPtr(ref f) => Some(FunctionSimplifiedType(f.skip_binder().inputs().len())),
93-
ty::UnnormalizedProjection(..) => bug!("only used with chalk-engine"),
9493
ty::Projection(_) | ty::Param(_) => {
9594
if can_simplify_params {
9695
// In normalized types, projections don't unify with

src/librustc_middle/ty/flags.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,6 @@ impl FlagComputation {
121121
self.add_projection_ty(data);
122122
}
123123

124-
&ty::UnnormalizedProjection(ref data) => {
125-
self.add_flags(TypeFlags::HAS_TY_PROJECTION);
126-
self.add_projection_ty(data);
127-
}
128-
129124
&ty::Opaque(_, substs) => {
130125
self.add_flags(TypeFlags::HAS_TY_OPAQUE);
131126
self.add_substs(substs);

0 commit comments

Comments
 (0)