bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Clean up redudant conditions and match exprs

Browse source
This commit is contained in:
Russell Cohen 2020-03-30 12:39:40 -04:00
parent bceab25d6c
commit 20e21902bb
2 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustc_lexer/src/lib.rs
View file

@ -731,7 +731,7 @@ impl Cursor<'_> {
n_end_hashes, n_end_hashes,
possible_terminator_offset: None, possible_terminator_offset: None,
}; };
} else if n_end_hashes > 0 && n_end_hashes > max_hashes { } else if n_end_hashes > max_hashes {
// Keep track of possible terminators to give a hint about where there might be // Keep track of possible terminators to give a hint about where there might be
// a missing terminator // a missing terminator
possible_terminator_offset = possible_terminator_offset =

21
src/librustc_parse/parser/diagnostics.rs
View file

@ -287,15 +287,14 @@ impl<'a> Parser<'a> {
} }
fn check_too_many_raw_str_terminators(&mut self, err: &mut DiagnosticBuilder<'_>) -> bool { fn check_too_many_raw_str_terminators(&mut self, err: &mut DiagnosticBuilder<'_>) -> bool {
let prev_token_raw_str = match self.prev_token.kind { match (&self.prev_token.kind, &self.token.kind) {
TokenKind::Literal(Lit { (
kind: LitKind::StrRaw(n) | LitKind::ByteStrRaw(n), .. TokenKind::Literal(Lit {
}) => Some(n), kind: LitKind::StrRaw(n_hashes) | LitKind::ByteStrRaw(n_hashes),
_ => None, ..
}; }),
TokenKind::Pound,
if let Some(n_hashes) = prev_token_raw_str { ) => {
if self.token.kind == TokenKind::Pound {
err.set_primary_message("too many `#` when terminating raw string"); err.set_primary_message("too many `#` when terminating raw string");
err.span_suggestion( err.span_suggestion(
self.token.span, self.token.span,
@ -304,10 +303,10 @@ impl<'a> Parser<'a> {
Applicability::MachineApplicable, Applicability::MachineApplicable,
); );
err.note(&format!("the raw string started with {} `#`s", n_hashes)); err.note(&format!("the raw string started with {} `#`s", n_hashes));
return true; true
} }
_ => false,
} }
false
} }
pub fn maybe_annotate_with_ascription( pub fn maybe_annotate_with_ascription(