From c4d0c911615a7b4efecca47abab294c7c1b788ce Mon Sep 17 00:00:00 2001 From: Deep Majumder Date: Wed, 14 Dec 2022 19:10:03 +0530 Subject: Allow .. to be parsed as let initializer .. and ..= are valid expressions, however when used in a let statement it is not parsed. --- compiler/rustc_parse/src/parser/expr.rs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'compiler/rustc_parse/src/parser') diff --git a/compiler/rustc_parse/src/parser/expr.rs b/compiler/rustc_parse/src/parser/expr.rs index 8a3545eb3be..7235b15a46b 100644 --- a/compiler/rustc_parse/src/parser/expr.rs +++ b/compiler/rustc_parse/src/parser/expr.rs @@ -180,7 +180,7 @@ impl<'a> Parser<'a> { LhsExpr::AttributesParsed(attrs) => Some(attrs), _ => None, }; - if [token::DotDot, token::DotDotDot, token::DotDotEq].contains(&self.token.kind) { + if self.token.is_range_seperator() { return self.parse_prefix_range_expr(attrs); } else { self.parse_prefix_expr(attrs)? @@ -512,7 +512,7 @@ impl<'a> Parser<'a> { } debug_assert!( - [token::DotDot, token::DotDotDot, token::DotDotEq].contains(&self.token.kind), + self.token.is_range_seperator(), "parse_prefix_range_expr: token {:?} is not DotDot/DotDotEq", self.token ); @@ -896,7 +896,11 @@ impl<'a> Parser<'a> { let has_lifetime = self.token.is_lifetime() && self.look_ahead(1, |t| t != &token::Colon); let lifetime = has_lifetime.then(|| self.expect_lifetime()); // For recovery, see below. let (borrow_kind, mutbl) = self.parse_borrow_modifiers(lo); - let expr = self.parse_prefix_expr(None); + let expr = if self.token.is_range_seperator() { + self.parse_prefix_range_expr(None) + } else { + self.parse_prefix_expr(None) + }; let (hi, expr) = self.interpolated_or_expr_span(expr)?; let span = lo.to(hi); if let Some(lt) = lifetime { -- cgit 1.4.1-3-g733a5 From 4af9e6a1c203b6459aea23aed05924fcf2e12c58 Mon Sep 17 00:00:00 2001 From: Deep Majumder Date: Fri, 16 Dec 2022 18:41:08 +0530 Subject: Little fixes --- compiler/rustc_ast/src/token.rs | 2 +- compiler/rustc_parse/src/parser/expr.rs | 6 +++--- src/test/ui/parser/issue-105634.rs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'compiler/rustc_parse/src/parser') diff --git a/compiler/rustc_ast/src/token.rs b/compiler/rustc_ast/src/token.rs index 5247007fdce..5b6cf30fa96 100644 --- a/compiler/rustc_ast/src/token.rs +++ b/compiler/rustc_ast/src/token.rs @@ -379,7 +379,7 @@ impl Token { } } - pub fn is_range_seperator(&self) -> bool { + pub fn is_range_separator(&self) -> bool { [DotDot, DotDotDot, DotDotEq].contains(&self.kind) } diff --git a/compiler/rustc_parse/src/parser/expr.rs b/compiler/rustc_parse/src/parser/expr.rs index 7235b15a46b..40100363c50 100644 --- a/compiler/rustc_parse/src/parser/expr.rs +++ b/compiler/rustc_parse/src/parser/expr.rs @@ -180,7 +180,7 @@ impl<'a> Parser<'a> { LhsExpr::AttributesParsed(attrs) => Some(attrs), _ => None, }; - if self.token.is_range_seperator() { + if self.token.is_range_separator() { return self.parse_prefix_range_expr(attrs); } else { self.parse_prefix_expr(attrs)? @@ -512,7 +512,7 @@ impl<'a> Parser<'a> { } debug_assert!( - self.token.is_range_seperator(), + self.token.is_range_separator(), "parse_prefix_range_expr: token {:?} is not DotDot/DotDotEq", self.token ); @@ -896,7 +896,7 @@ impl<'a> Parser<'a> { let has_lifetime = self.token.is_lifetime() && self.look_ahead(1, |t| t != &token::Colon); let lifetime = has_lifetime.then(|| self.expect_lifetime()); // For recovery, see below. let (borrow_kind, mutbl) = self.parse_borrow_modifiers(lo); - let expr = if self.token.is_range_seperator() { + let expr = if self.token.is_range_separator() { self.parse_prefix_range_expr(None) } else { self.parse_prefix_expr(None) diff --git a/src/test/ui/parser/issue-105634.rs b/src/test/ui/parser/issue-105634.rs index 7a094d8e4b4..579aa6e5bfb 100644 --- a/src/test/ui/parser/issue-105634.rs +++ b/src/test/ui/parser/issue-105634.rs @@ -1,4 +1,4 @@ -// run-pass +// check-pass fn main() { let _a = ..; -- cgit 1.4.1-3-g733a5