diff options
| author | bors <bors@rust-lang.org> | 2023-07-29 06:04:41 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-07-29 06:04:41 +0000 |
| commit | 2dc661037d059bff1487b76ca949ced7b3cd46c9 (patch) | |
| tree | f5666979d20c236dfa502383e8a2cff8fde8bc2e /compiler/rustc_errors/src | |
| parent | 5ed61a4378700aeb5af88385d9ae054c8adf2322 (diff) | |
| parent | 771c832338d57390018d41458a3223bc18eacedc (diff) | |
| download | rust-2dc661037d059bff1487b76ca949ced7b3cd46c9.tar.gz rust-2dc661037d059bff1487b76ca949ced7b3cd46c9.zip | |
Auto merge of #113099 - bvanjoi:fix-112713-2, r=petrochenkov
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`
Diffstat (limited to 'compiler/rustc_errors/src')
| -rw-r--r-- | compiler/rustc_errors/src/lib.rs | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/compiler/rustc_errors/src/lib.rs b/compiler/rustc_errors/src/lib.rs index aa213cd0720..2181bd526eb 100644 --- a/compiler/rustc_errors/src/lib.rs +++ b/compiler/rustc_errors/src/lib.rs @@ -1871,6 +1871,22 @@ pub fn add_elided_lifetime_in_path_suggestion( }); } +pub fn report_ambiguity_error<'a, G: EmissionGuarantee>( + db: &mut DiagnosticBuilder<'a, G>, + ambiguity: rustc_lint_defs::AmbiguityErrorDiag, +) { + db.span_label(ambiguity.label_span, ambiguity.label_msg); + db.note(ambiguity.note_msg); + db.span_note(ambiguity.b1_span, ambiguity.b1_note_msg); + for help_msg in ambiguity.b1_help_msgs { + db.help(help_msg); + } + db.span_note(ambiguity.b2_span, ambiguity.b2_note_msg); + for help_msg in ambiguity.b2_help_msgs { + db.help(help_msg); + } +} + #[derive(Clone, Copy, PartialEq, Hash, Debug)] pub enum TerminalUrl { No, |