Skip to content

Commit a772a6f

Browse files
compiler-errorscompiler-errors
committed
Add ErrorGuaranteed to HIR TyKind::Err
1 parent dcca6a3 commit a772a6f

File tree

9 files changed

+51
-45
lines changed

9 files changed

+51
-45
lines changed

‎compiler/rustc_ast_lowering/src/item.rs

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
284284
.alloc_from_iter(fm.items.iter().map(|x| self.lower_foreign_item_ref(x))),
285285
},
286286
ItemKind::GlobalAsm(asm) => hir::ItemKind::GlobalAsm(self.lower_inline_asm(span, asm)),
287-
ItemKind::TyAlias(box TyAlias { generics, where_clauses, ty: Some(ty), .. }) => {
287+
ItemKind::TyAlias(box TyAlias { generics, where_clauses, ty, .. }) => {
288288
// We lower
289289
//
290290
// type Foo = impl Trait
@@ -299,18 +299,16 @@ impl<'hir> LoweringContext<'_, 'hir> {
299299
&generics,
300300
id,
301301
&ImplTraitContext::Disallowed(ImplTraitPosition::Generic),
302-
|this| this.lower_ty(ty, &ImplTraitContext::TypeAliasesOpaqueTy),
303-
);
304-
hir::ItemKind::TyAlias(ty, generics)
305-
}
306-
ItemKind::TyAlias(box TyAlias { generics, where_clauses, ty: None, .. }) => {
307-
let mut generics = generics.clone();
308-
add_ty_alias_where_clause(&mut generics, *where_clauses, true);
309-
let (generics, ty) = self.lower_generics(
310-
&generics,
311-
id,
312-
&ImplTraitContext::Disallowed(ImplTraitPosition::Generic),
313-
|this| this.arena.alloc(this.ty(span, hir::TyKind::Err)),
302+
|this| match ty {
303+
None => {
304+
let guar = this.tcx.sess.delay_span_bug(
305+
span,
306+
"expected to lower type alias type, but it was missing",
307+
);
308+
this.arena.alloc(this.ty(span, hir::TyKind::Err(guar)))
309+
}
310+
Some(ty) => this.lower_ty(ty, &ImplTraitContext::TypeAliasesOpaqueTy),
311+
},
314312
);
315313
hir::ItemKind::TyAlias(ty, generics)
316314
}
@@ -847,7 +845,11 @@ impl<'hir> LoweringContext<'_, 'hir> {
847845
&ImplTraitContext::Disallowed(ImplTraitPosition::Generic),
848846
|this| match ty {
849847
None => {
850-
let ty = this.arena.alloc(this.ty(i.span, hir::TyKind::Err));
848+
let guar = this.tcx.sess.delay_span_bug(
849+
i.span,
850+
"expected to lower associated type, but it was missing",
851+
);
852+
let ty = this.arena.alloc(this.ty(i.span, hir::TyKind::Err(guar)));
851853
hir::ImplItemKind::Type(ty)
852854
}
853855
Some(ty) => {

‎compiler/rustc_ast_lowering/src/lib.rs

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,11 +1082,12 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
10821082
hir::TypeBindingKind::Constraint { bounds }
10831083
}
10841084
DesugarKind::Error(position) => {
1085-
self.tcx.sess.emit_err(errors::MisplacedAssocTyBinding {
1085+
let guar = self.tcx.sess.emit_err(errors::MisplacedAssocTyBinding {
10861086
span: constraint.span,
10871087
position: DiagnosticArgFromDisplay(position),
10881088
});
1089-
let err_ty = &*self.arena.alloc(self.ty(constraint.span, hir::TyKind::Err));
1089+
let err_ty =
1090+
&*self.arena.alloc(self.ty(constraint.span, hir::TyKind::Err(guar)));
10901091
hir::TypeBindingKind::Equality { term: err_ty.into() }
10911092
}
10921093
}
@@ -1255,7 +1256,9 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
12551256
fn lower_ty_direct(&mut self, t: &Ty, itctx: &ImplTraitContext) -> hir::Ty<'hir> {
12561257
let kind = match &t.kind {
12571258
TyKind::Infer => hir::TyKind::Infer,
1258-
TyKind::Err => hir::TyKind::Err,
1259+
TyKind::Err => {
1260+
hir::TyKind::Err(self.tcx.sess.delay_span_bug(t.span, "TyKind::Err lowered"))
1261+
}
12591262
TyKind::Slice(ty) => hir::TyKind::Slice(self.lower_ty(ty, itctx)),
12601263
TyKind::Ptr(mt) => hir::TyKind::Ptr(self.lower_mt(mt, itctx)),
12611264
TyKind::Ref(region, mt) => {
@@ -1381,7 +1384,8 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
13811384
path
13821385
}
13831386
ImplTraitContext::FeatureGated(position, feature) => {
1384-
self.tcx
1387+
let guar = self
1388+
.tcx
13851389
.sess
13861390
.create_feature_err(
13871391
MisplacedImplTrait {
@@ -1391,24 +1395,24 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
13911395
*feature,
13921396
)
13931397
.emit();
1394-
hir::TyKind::Err
1398+
hir::TyKind::Err(guar)
13951399
}
13961400
ImplTraitContext::Disallowed(position) => {
1397-
self.tcx.sess.emit_err(MisplacedImplTrait {
1401+
let guar = self.tcx.sess.emit_err(MisplacedImplTrait {
13981402
span: t.span,
13991403
position: DiagnosticArgFromDisplay(position),
14001404
});
1401-
hir::TyKind::Err
1405+
hir::TyKind::Err(guar)
14021406
}
14031407
}
14041408
}
14051409
TyKind::MacCall(_) => panic!("`TyKind::MacCall` should have been expanded by now"),
14061410
TyKind::CVarArgs => {
1407-
self.tcx.sess.delay_span_bug(
1411+
let guar = self.tcx.sess.delay_span_bug(
14081412
t.span,
14091413
"`TyKind::CVarArgs` should have been handled elsewhere",
14101414
);
1411-
hir::TyKind::Err
1415+
hir::TyKind::Err(guar)
14121416
}
14131417
};
14141418

‎compiler/rustc_errors/src/lib.rs

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ pub use rustc_error_messages::{
4242
pub use rustc_lint_defs::{pluralize, Applicability};
4343
use rustc_macros::fluent_messages;
4444
use rustc_span::source_map::SourceMap;
45-
use rustc_span::HashStableContext;
45+
pub use rustc_span::ErrorGuaranteed;
4646
use rustc_span::{Loc, Span};
4747

4848
use std::borrow::Cow;
@@ -1846,17 +1846,3 @@ pub enum TerminalUrl {
18461846
Yes,
18471847
Auto,
18481848
}
1849-
1850-
/// Useful type to use with `Result<>` indicate that an error has already
1851-
/// been reported to the user, so no need to continue checking.
1852-
#[derive(Clone, Copy, Debug, Encodable, Decodable, Hash, PartialEq, Eq, PartialOrd, Ord)]
1853-
#[derive(HashStable_Generic)]
1854-
pub struct ErrorGuaranteed(());
1855-
1856-
impl ErrorGuaranteed {
1857-
/// To be used only if you really know what you are doing... ideally, we would find a way to
1858-
/// eliminate all calls to this method.
1859-
pub fn unchecked_claim_error_was_emitted() -> Self {
1860-
ErrorGuaranteed(())
1861-
}
1862-
}

‎compiler/rustc_hir/src/hir.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -369,10 +369,10 @@ impl<'hir> GenericArgs<'hir> {
369369

370370
pub fn has_err(&self) -> bool {
371371
self.args.iter().any(|arg| match arg {
372-
GenericArg::Type(ty) => matches!(ty.kind, TyKind::Err),
372+
GenericArg::Type(ty) => matches!(ty.kind, TyKind::Err(_)),
373373
_ => false,
374374
}) || self.bindings.iter().any(|arg| match arg.kind {
375-
TypeBindingKind::Equality { term: Term::Ty(ty) } => matches!(ty.kind, TyKind::Err),
375+
TypeBindingKind::Equality { term: Term::Ty(ty) } => matches!(ty.kind, TyKind::Err(_)),
376376
_ => false,
377377
})
378378
}
@@ -2676,7 +2676,7 @@ pub enum TyKind<'hir> {
26762676
/// specified. This can appear anywhere in a type.
26772677
Infer,
26782678
/// Placeholder for a type that has failed to be defined.
2679-
Err,
2679+
Err(rustc_span::ErrorGuaranteed),
26802680
}
26812681

26822682
#[derive(Debug, HashStable_Generic)]

‎compiler/rustc_hir/src/intravisit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,7 @@ pub fn walk_ty<'v, V: Visitor<'v>>(visitor: &mut V, typ: &'v Ty<'v>) {
844844
visitor.visit_lifetime(lifetime);
845845
}
846846
TyKind::Typeof(ref expression) => visitor.visit_anon_const(expression),
847-
TyKind::Infer | TyKind::Err => {}
847+
TyKind::Infer | TyKind::Err(_) => {}
848848
}
849849
}
850850

‎compiler/rustc_hir_analysis/src/astconv/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3113,7 +3113,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
31133113
// handled specially and will not descend into this routine.
31143114
self.ty_infer(None, ast_ty.span)
31153115
}
3116-
hir::TyKind::Err => tcx.ty_error_misc(),
3116+
hir::TyKind::Err(guar) => tcx.ty_error(*guar),
31173117
};
31183118

31193119
self.record_ty(ast_ty.hir_id, result_ty, ast_ty.span);

‎compiler/rustc_hir_pretty/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ impl<'a> State<'a> {
358358
self.print_anon_const(e);
359359
self.word(")");
360360
}
361-
hir::TyKind::Err => {
361+
hir::TyKind::Err(_) => {
362362
self.popen();
363363
self.word("/*ERROR*/");
364364
self.pclose();

‎compiler/rustc_span/src/lib.rs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2149,3 +2149,17 @@ where
21492149
Hash::hash(&len, hasher);
21502150
}
21512151
}
2152+
2153+
/// Useful type to use with `Result<>` indicate that an error has already
2154+
/// been reported to the user, so no need to continue checking.
2155+
#[derive(Clone, Copy, Debug, Encodable, Decodable, Hash, PartialEq, Eq, PartialOrd, Ord)]
2156+
#[derive(HashStable_Generic)]
2157+
pub struct ErrorGuaranteed(());
2158+
2159+
impl ErrorGuaranteed {
2160+
/// To be used only if you really know what you are doing... ideally, we would find a way to
2161+
/// eliminate all calls to this method.
2162+
pub fn unchecked_claim_error_was_emitted() -> Self {
2163+
ErrorGuaranteed(())
2164+
}
2165+
}

‎src/librustdoc/clean/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1661,7 +1661,7 @@ pub(crate) fn clean_ty<'tcx>(ty: &hir::Ty<'tcx>, cx: &mut DocContext<'tcx>) -> T
16611661
}
16621662
TyKind::BareFn(barefn) => BareFunction(Box::new(clean_bare_fn_ty(barefn, cx))),
16631663
// Rustdoc handles `TyKind::Err`s by turning them into `Type::Infer`s.
1664-
TyKind::Infer | TyKind::Err | TyKind::Typeof(..) => Infer,
1664+
TyKind::Infer | TyKind::Err(_) | TyKind::Typeof(..) => Infer,
16651665
}
16661666
}
16671667

0 commit comments

Comments
 (0)