bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove SubDiagnostic::render_span.

Browse source 
It's only ever set to `None`.
This commit is contained in:
Nicholas Nethercote 2023-12-21 10:30:17 +11:00
parent 125337bd68
commit ce0f703554
3 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -163,7 +163,6 @@ pub struct SubDiagnostic {
pub level: Level, pub level: Level,
pub messages: Vec<(DiagnosticMessage, Style)>, pub messages: Vec<(DiagnosticMessage, Style)>,
pub span: MultiSpan, pub span: MultiSpan,
pub render_span: Option<MultiSpan>,
} }
#[derive(Debug, PartialEq, Eq)] #[derive(Debug, PartialEq, Eq)]
@ -960,7 +959,6 @@ impl Diagnostic {
Style::NoStyle, Style::NoStyle,
)], )],
span, span,
render_span: None,
}; };
self.children.push(sub); self.children.push(sub);
} }
@ -977,7 +975,7 @@ impl Diagnostic {
.into_iter() .into_iter()
.map(|m| (self.subdiagnostic_message_to_diagnostic_message(m.0), m.1)) .map(|m| (self.subdiagnostic_message_to_diagnostic_message(m.0), m.1))
.collect(); .collect();
let sub = SubDiagnostic { level, messages, span, render_span: None }; let sub = SubDiagnostic { level, messages, span };
self.children.push(sub); self.children.push(sub);
} }

3
compiler/rustc_errors/src/emitter.rs
View file

@ -352,7 +352,6 @@ pub trait Emitter: Translate {
level: Level::Note, level: Level::Note,
messages: vec![(DiagnosticMessage::from(msg), Style::NoStyle)], messages: vec![(DiagnosticMessage::from(msg), Style::NoStyle)],
span: MultiSpan::new(), span: MultiSpan::new(),
render_span: None,
}); });
} }
} }
@ -2118,7 +2117,7 @@ impl EmitterWriter {
} }
if !self.short_message { if !self.short_message {
for child in children { for child in children {
let span = child.render_span.as_ref().unwrap_or(&child.span); let span = &child.span;
if let Err(err) = self.emit_messages_default_inner( if let Err(err) = self.emit_messages_default_inner(
span, span,
&child.messages, &child.messages,

6
compiler/rustc_errors/src/json.rs
View file

@ -424,11 +424,7 @@ impl Diagnostic {
message: translated_message.to_string(), message: translated_message.to_string(),
code: None, code: None,
level: diag.level.to_str(), level: diag.level.to_str(),
spans: diag spans: DiagnosticSpan::from_multispan(&diag.span, args, je),
.render_span
.as_ref()
.map(|sp| DiagnosticSpan::from_multispan(sp, args, je))
.unwrap_or_else(|| DiagnosticSpan::from_multispan(&diag.span, args, je)),
children: vec![], children: vec![],
rendered: None, rendered: None,
} }