mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use ErrorGuaranteed from emit

Browse Source
This commit is contained in:
Folkert 2024-07-25 10:29:59 +02:00 committed by Amanieu d'Antras
parent d4ca1ac8b9
commit be66415e11
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
compiler/rustc_hir_analysis/src/collect/type_of.rs
View File

@ -68,7 +68,8 @@ fn anon_const_type_of<'tcx>(tcx: TyCtxt<'tcx>, def_id: LocalDefId) -> Ty<'tcx> {
ty::Error(_) => ty, ty::Error(_) => ty,
ty::FnDef(..) => ty, ty::FnDef(..) => ty,
_ => { _ => {
tcx.dcx() let guar = tcx
.dcx()
.struct_span_err(op_sp, "invalid `sym` operand") .struct_span_err(op_sp, "invalid `sym` operand")
.with_span_label( .with_span_label(
tcx.def_span(anon_const.def_id), tcx.def_span(anon_const.def_id),
@ -77,7 +78,7 @@ fn anon_const_type_of<'tcx>(tcx: TyCtxt<'tcx>, def_id: LocalDefId) -> Ty<'tcx> {
.with_help("`sym` operands must refer to either a function or a static") .with_help("`sym` operands must refer to either a function or a static")
.emit(); .emit();
Ty::new_error_with_message(tcx, span, format!("invalid type for `sym` operand")) Ty::new_error(tcx, guar)
} }
} }
} }
@ -91,7 +92,8 @@ fn anon_const_type_of<'tcx>(tcx: TyCtxt<'tcx>, def_id: LocalDefId) -> Ty<'tcx> {
ty::Error(_) => ty, ty::Error(_) => ty,
ty::Int(_) | ty::Uint(_) => ty, ty::Int(_) | ty::Uint(_) => ty,
_ => { _ => {
tcx.dcx() let guar = tcx
.dcx()
.struct_span_err(op_sp, "invalid type for `const` operand") .struct_span_err(op_sp, "invalid type for `const` operand")
.with_span_label( .with_span_label(
tcx.def_span(anon_const.def_id), tcx.def_span(anon_const.def_id),
@ -100,11 +102,7 @@ fn anon_const_type_of<'tcx>(tcx: TyCtxt<'tcx>, def_id: LocalDefId) -> Ty<'tcx> {
.with_help("`const` operands must be of an integer type") .with_help("`const` operands must be of an integer type")
.emit(); .emit();
Ty::new_error_with_message( Ty::new_error(tcx, guar)
tcx,
span,
format!("invalid type for `const` operand"),
)
} }
} }
} }