use rustc_data_structures::fx::{FxHashMap, FxHashSet, FxIndexMap};
use rustc_data_structures::intern::Interned;
use rustc_data_structures::sync::Lrc;
-use rustc_errors::{struct_span_err, Applicability, DiagnosticBuilder};
+use rustc_errors::{struct_span_err, Applicability, Diagnostic, DiagnosticBuilder};
use rustc_expand::base::{DeriveResolutions, SyntaxExtension, SyntaxExtensionKind};
use rustc_hir::def::Namespace::*;
use rustc_hir::def::{self, CtorOf, DefKind, NonMacroAttrKind, PartialRes};
/// ```
fn add_suggestion_for_rename_of_use(
&self,
- err: &mut DiagnosticBuilder<'_>,
+ err: &mut Diagnostic,
name: Symbol,
import: &Import<'_>,
binding_span: Span,
/// as characters expected by span manipulations won't be present.
fn add_suggestion_for_duplicate_nested_use(
&self,
- err: &mut DiagnosticBuilder<'_>,
+ err: &mut Diagnostic,
import: &Import<'_>,
binding_span: Span,
) {
let ident = Ident::with_dummy_span(sym::main);
let parent_scope = &ParentScope::module(module, self);
- let name_binding = match self.resolve_ident_in_module(
+ let Ok(name_binding) = self.resolve_ident_in_module(
ModuleOrUniformRoot::Module(module),
ident,
ValueNS,
parent_scope,
false,
DUMMY_SP,
- ) {
- Ok(name_binding) => name_binding,
- _ => return,
+ ) else {
+ return;
};
let res = name_binding.res();