Opportunistically split != to successfully parse never type

Author: fmease

compiler/rustc_parse/src/parser/mod.rs

@@ -774,24 +774,29 @@ impl<'a> Parser<'a> {
         }
     }
 
-    /// Eats `+` possibly breaking tokens like `+=` in process.
+    /// Eats `+` possibly breaking tokens like `+=` in the process.
     fn eat_plus(&mut self) -> bool {
         self.break_and_eat(exp!(Plus))
     }
 
-    /// Eats `&` possibly breaking tokens like `&&` in process.
+    /// Eats `!` possibly breaking tokens like `!=` in the process.
+    fn eat_bang(&mut self) -> bool {
+        self.break_and_eat(exp!(Bang))
+    }
+
+    /// Eats `&` possibly breaking tokens like `&&` in the process.
     /// Signals an error if `&` is not eaten.
     fn expect_and(&mut self) -> PResult<'a, ()> {
         if self.break_and_eat(exp!(And)) { Ok(()) } else { self.unexpected() }
     }
 
-    /// Eats `|` possibly breaking tokens like `||` in process.
+    /// Eats `|` possibly breaking tokens like `||` in the process.
     /// Signals an error if `|` was not eaten.
     fn expect_or(&mut self) -> PResult<'a, ()> {
         if self.break_and_eat(exp!(Or)) { Ok(()) } else { self.unexpected() }
     }
 
-    /// Eats `<` possibly breaking tokens like `<<` in process.
+    /// Eats `<` possibly breaking tokens like `<<` in the process.
     fn eat_lt(&mut self) -> bool {
         let ate = self.break_and_eat(exp!(Lt));
         if ate {
@@ -802,13 +807,13 @@ impl<'a> Parser<'a> {
         ate
     }
 
-    /// Eats `<` possibly breaking tokens like `<<` in process.
+    /// Eats `<` possibly breaking tokens like `<<` in the process.
     /// Signals an error if `<` was not eaten.
     fn expect_lt(&mut self) -> PResult<'a, ()> {
         if self.eat_lt() { Ok(()) } else { self.unexpected() }
     }
 
-    /// Eats `>` possibly breaking tokens like `>>` in process.
+    /// Eats `>` possibly breaking tokens like `>>` in the process.
     /// Signals an error if `>` was not eaten.
     fn expect_gt(&mut self) -> PResult<'a, ()> {
         if self.break_and_eat(exp!(Gt)) {

compiler/rustc_parse/src/parser/pat.rs

@@ -758,7 +758,9 @@ impl<'a> Parser<'a> {
         } else if let Some(form) = self.parse_range_end() {
             self.parse_pat_range_to(form)? // `..=X`, `...X`, or `..X`.
         } else if self.eat(exp!(Bang)) {
-            // Parse `!`
+            // Ideally we'd use `eat_bang` here to allow us to parse `!=>` as `! =>`. However,
+            // `break_and_eat` doesn't "reglue" the split-off `=` with any following `>` (since
+            // that would likely be super fragile and complex).
             self.psess.gated_spans.gate(sym::never_patterns, self.prev_token.span);
             PatKind::Never
         } else if self.eat_keyword(exp!(Underscore)) {

compiler/rustc_parse/src/parser/ty.rs

@@ -280,12 +280,12 @@ impl<'a> Parser<'a> {
             return Ok(ty);
         }
 
-        let lo = self.token.span;
         let mut impl_dyn_multi = false;
+        let mut lo = self.token.span;
         let kind = if self.check(exp!(OpenParen)) {
             self.parse_ty_tuple_or_parens(lo, allow_plus)?
-        } else if self.eat(exp!(Bang)) {
-            // Never type `!`
+        } else if self.eat_bang() {
+            lo = self.prev_token.span;
             TyKind::Never
         } else if self.eat(exp!(Star)) {
             self.parse_ty_ptr()?

tests/ui/parser/token-splitting.rs

@@ -0,0 +1,33 @@
+// Check some places in which we want to split multi-character punctuation.
+//@ edition: 2015
+#![feature(never_type)] // only used inside `bang_eq_never_ty`!
+
+//@ check-pass
+
+fn plus_eq_bound() {
+    // issue: <https://github.com/rust-lang/rust/issues/47856>
+    struct W<T: Clone + = ()> { t: T }
+    struct S<T: Clone += ()> { t: T }
+
+    // Bare & `dyn`-prefixed trait object types take different paths in the parser.
+    // Therefore, test both branches.
+
+    #[cfg(false)] let _: Debug + = *(&() as &dyn Debug);
+    #[cfg(false)] let _: Debug += *(&() as &dyn Debug);
+
+    #[cfg(false)] let _: dyn Debug + = *(&() as &dyn Debug);
+    #[cfg(false)] let _: dyn Debug += *(&() as &dyn Debug);
+
+    #[cfg(false)] fn w() where Trait + = () {}
+    #[cfg(false)] fn s() where Trait += () {}
+}
+
+fn bang_eq_never_ty(x: !) {
+    let _: ! = x;
+    let _: != x;
+
+    #[cfg(false)] struct W<const X: ! = { loop {} }>;
+    #[cfg(false)] struct S<const X: != { loop {} }>;
+}
+
+fn main() {}