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

Remove an unnecessary span_delayed_bug in Resolver::valid_res_from_ribs.

Browse Source 
`Resolver::report_error` always emits (this commit makes that clearer),
so the `span_delayed_bug` is unnecessary.
This commit is contained in:
Nicholas Nethercote 2024-02-16 14:19:07 +11:00
parent c743e4a855
commit d0267cb26b
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/rustc_resolve/src/diagnostics.rs
View File

@ -554,8 +554,12 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
/// ///
/// This takes the error provided, combines it with the span and any additional spans inside the /// This takes the error provided, combines it with the span and any additional spans inside the
/// error and emits it. /// error and emits it.
pub(crate) fn report_error(&mut self, span: Span, resolution_error: ResolutionError<'a>) { pub(crate) fn report_error(
self.into_struct_error(span, resolution_error).emit(); &mut self,
span: Span,
resolution_error: ResolutionError<'a>,
) -> ErrorGuaranteed {
self.into_struct_error(span, resolution_error).emit()
} }
pub(crate) fn into_struct_error( pub(crate) fn into_struct_error(

5
compiler/rustc_resolve/src/ident.rs
View File

@ -1,4 +1,5 @@
use rustc_ast::{self as ast, NodeId}; use rustc_ast::{self as ast, NodeId};
use rustc_errors::ErrorGuaranteed;
use rustc_hir::def::{DefKind, Namespace, NonMacroAttrKind, PartialRes, PerNS}; use rustc_hir::def::{DefKind, Namespace, NonMacroAttrKind, PartialRes, PerNS};
use rustc_middle::bug; use rustc_middle::bug;
use rustc_middle::ty; use rustc_middle::ty;
@ -1066,7 +1067,6 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
original_rib_ident_def: Ident, original_rib_ident_def: Ident,
all_ribs: &[Rib<'a>], all_ribs: &[Rib<'a>],
) -> Res { ) -> Res {
const CG_BUG_STR: &str = "min_const_generics resolve check didn't stop compilation";
debug!("validate_res_from_ribs({:?})", res); debug!("validate_res_from_ribs({:?})", res);
let ribs = &all_ribs[rib_index + 1..]; let ribs = &all_ribs[rib_index + 1..];
@ -1209,8 +1209,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
} }
} }
}; };
self.report_error(span, error); let _: ErrorGuaranteed = self.report_error(span, error);
self.dcx().span_delayed_bug(span, CG_BUG_STR);
} }
return Res::Err; return Res::Err;