bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Merge multiple mutable borrows of immutable binding errors

Browse source 
Fix #53466.
This commit is contained in:
Esteban Küber 2022-12-29 22:46:17 -08:00
parent bb6e76df06
commit 5bfcfeee2a
14 changed files with 199 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_errors/src/diagnostic.rs
View file

@ -365,12 +365,12 @@ impl Diagnostic {
self
}
pub fn replace_span_with(&mut self, after: Span) -> &mut Self {
pub fn replace_span_with(&mut self, after: Span, keep_label: bool) -> &mut Self {
let before = self.span.clone();
self.set_span(after);
for span_label in before.span_labels() {
if let Some(label) = span_label.label {
if span_label.is_primary {
if span_label.is_primary && keep_label {
self.span.push_span_label(after, label);
} else {
self.span.push_span_label(span_label.span, label);