bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #113099 - bvanjoi:fix-112713-2, r=petrochenkov

Browse source 
fix(resolve): update the ambiguity glob binding as warning recursively

Fixes #47525
Fixes #56593, but `issue-56593-2.rs` is not fixed to ensure backward compatibility.
Fixes #98467
Fixes #105235
Fixes #112713

This PR had added a field called `warn_ambiguous` in `NameBinding` which is only for back compatibly reason and used for lint.

More details: https://github.com/rust-lang/rust/pull/112743

r? `@petrochenkov`
This commit is contained in:
bors 2023-07-29 06:04:41 +00:00
commit 2dc661037d
66 changed files with 1534 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_lint/src/context.rs
View file

@ -946,6 +946,9 @@ pub trait LintContext: Sized {
Applicability::MachineApplicable,
);
}
BuiltinLintDiagnostics::AmbiguousGlobImports { diag } => {
rustc_errors::report_ambiguity_error(db, diag);
}
BuiltinLintDiagnostics::AmbiguousGlobReexports { name, namespace, first_reexport_span, duplicate_reexport_span } => {
db.span_label(first_reexport_span, format!("the name `{name}` in the {namespace} namespace is first re-exported here"));
db.span_label(duplicate_reexport_span, format!("but the name `{name}` in the {namespace} namespace is also re-exported here"));