diff options
| author | The Miri Conjob Bot <miri@cron.bot> | 2023-09-24 05:12:12 +0000 |
|---|---|---|
| committer | The Miri Conjob Bot <miri@cron.bot> | 2023-09-24 05:12:12 +0000 |
| commit | 8ae7c743bbc6e6281c5aa892daaaa5439aafc1db (patch) | |
| tree | 88b7b5adb712ecb2e3240598e3ff174e5784dff1 /compiler/rustc_middle/src/ty/error.rs | |
| parent | fdbf9324995517752d0387cf5fa5ebce519fb8e7 (diff) | |
| parent | 42ca6e4e5760a548a6fa858482de6d237f6fb3b8 (diff) | |
Merge from rustc
Diffstat (limited to 'compiler/rustc_middle/src/ty/error.rs')
| -rw-r--r-- | compiler/rustc_middle/src/ty/error.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/compiler/rustc_middle/src/ty/error.rs b/compiler/rustc_middle/src/ty/error.rs index f939d466078..459c8dfb596 100644 --- a/compiler/rustc_middle/src/ty/error.rs +++ b/compiler/rustc_middle/src/ty/error.rs @@ -242,8 +242,7 @@ impl<'tcx> Ty<'tcx> { ty::Dynamic(..) => "trait object".into(), ty::Closure(..) => "closure".into(), ty::Generator(def_id, ..) => tcx.generator_kind(def_id).unwrap().descr().into(), - ty::GeneratorWitness(..) | - ty::GeneratorWitnessMIR(..) => "generator witness".into(), + ty::GeneratorWitness(..) => "generator witness".into(), ty::Infer(ty::TyVar(_)) => "inferred type".into(), ty::Infer(ty::IntVar(_)) => "integer".into(), ty::Infer(ty::FloatVar(_)) => "floating-point number".into(), @@ -295,7 +294,7 @@ impl<'tcx> Ty<'tcx> { ty::Dynamic(..) => "trait object".into(), ty::Closure(..) => "closure".into(), ty::Generator(def_id, ..) => tcx.generator_kind(def_id).unwrap().descr().into(), - ty::GeneratorWitness(..) | ty::GeneratorWitnessMIR(..) => "generator witness".into(), + ty::GeneratorWitness(..) => "generator witness".into(), ty::Tuple(..) => "tuple".into(), ty::Placeholder(..) => "higher-ranked type".into(), ty::Bound(..) => "bound type variable".into(), |