bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Simplify some nested conditions

Browse source
This commit is contained in:
Oli Scherer 2022-11-14 11:12:51 +00:00
parent e60fbaf4ce
commit b9bf119c4f
1 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1386,20 +1386,13 @@ impl EmitterWriter {
let mut annotated_files = FileWithAnnotatedLines::collect_annotations(self, args, msp); let mut annotated_files = FileWithAnnotatedLines::collect_annotations(self, args, msp);
// Make sure our primary file comes first // Make sure our primary file comes first
let (primary_lo, sm) = if let (Some(sm), Some(ref primary_span)) = let primary_span = msp.primary_span().unwrap_or_default();
(self.sm.as_ref(), msp.primary_span().as_ref()) let (Some(sm), false) = (self.sm.as_ref(), primary_span.is_dummy()) else {
{
if !primary_span.is_dummy() {
(sm.lookup_char_pos(primary_span.lo()), sm)
} else {
emit_to_destination(&buffer.render(), level, &mut self.dst, self.short_message)?;
return Ok(());
}
} else {
// If we don't have span information, emit and exit // If we don't have span information, emit and exit
emit_to_destination(&buffer.render(), level, &mut self.dst, self.short_message)?; emit_to_destination(&buffer.render(), level, &mut self.dst, self.short_message)?;
return Ok(()); return Ok(());
}; };
let primary_lo = sm.lookup_char_pos(primary_span.lo());
if let Ok(pos) = if let Ok(pos) =
annotated_files.binary_search_by(|x| x.file.name.cmp(&primary_lo.file.name)) annotated_files.binary_search_by(|x| x.file.name.cmp(&primary_lo.file.name))
{ {