bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Check for missing space between fat arrow and range pattern

Browse source
This commit is contained in:
clubby789 2023-01-28 20:02:00 +00:00
parent d6f0642827
commit 4bfab39f9b
4 changed files with 59 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_parse/src/parser/expr.rs
View file

@ -3168,7 +3168,7 @@ impl<'a> Parser<'a> {
limits: RangeLimits,
) -> ExprKind {
if end.is_none() && limits == RangeLimits::Closed {
self.inclusive_range_with_incorrect_end(self.prev_token.span);
self.inclusive_range_with_incorrect_end();
ExprKind::Err
} else {
ExprKind::Range(start, end, limits)

44
compiler/rustc_parse/src/parser/pat.rs
View file

@ -746,32 +746,38 @@ impl<'a> Parser<'a> {
// Parsing e.g. `X..`.
if let RangeEnd::Included(_) = re.node {
// FIXME(Centril): Consider semantic errors instead in `ast_validation`.
self.inclusive_range_with_incorrect_end(re.span);
self.inclusive_range_with_incorrect_end();
}
None
};
Ok(PatKind::Range(Some(begin), end, re))
}
pub(super) fn inclusive_range_with_incorrect_end(&mut self, span: Span) {
pub(super) fn inclusive_range_with_incorrect_end(&mut self) {
let tok = &self.token;
let span = self.prev_token.span;
// If the user typed "..==" instead of "..=", we want to give them
// a specific error message telling them to use "..=".
// If they typed "..=>", suggest they use ".. =>".
// Otherwise, we assume that they meant to type a half open exclusive
// range and give them an error telling them to do that instead.
if matches!(tok.kind, token::Eq) && tok.span.lo() == span.hi() {
let span_with_eq = span.to(tok.span);
let no_space = tok.span.lo() == span.hi();
match tok.kind {
token::Eq if no_space => {
let span_with_eq = span.to(tok.span);
// Ensure the user doesn't receive unhelpful unexpected token errors
self.bump();
if self.is_pat_range_end_start(0) {
let _ = self.parse_pat_range_end().map_err(|e| e.cancel());
// Ensure the user doesn't receive unhelpful unexpected token errors
self.bump();
if self.is_pat_range_end_start(0) {
let _ = self.parse_pat_range_end().map_err(|e| e.cancel());
}
self.error_inclusive_range_with_extra_equals(span_with_eq);
}
self.error_inclusive_range_with_extra_equals(span_with_eq);
} else {
self.error_inclusive_range_with_no_end(span);
token::Gt if no_space => {
self.error_inclusive_range_match_arrow(span);
}
_ => self.error_inclusive_range_with_no_end(span),
}
}
@ -782,6 +788,18 @@ impl<'a> Parser<'a> {
.emit();
}
fn error_inclusive_range_match_arrow(&self, span: Span) {
let without_eq = span.with_hi(span.hi() - rustc_span::BytePos(1));
self.struct_span_err(span, "unexpected `=>` after open range")
.span_suggestion_verbose(
without_eq.shrink_to_hi(),
"add a space between the pattern and `=>`",
" ",
Applicability::MachineApplicable,
)
.emit();
}
fn error_inclusive_range_with_no_end(&self, span: Span) {
struct_span_err!(self.sess.span_diagnostic, span, E0586, "inclusive range with no end")
.span_suggestion_short(span, "use `..` instead", "..", Applicability::MachineApplicable)