Parse and lower never type

rust-lang · May 21, 2020 · 5f2ae21 · 5f2ae21
1 parent 1840c2c
commit 5f2ae21
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/chalk-integration/src/lowering.rs b/chalk-integration/src/lowering.rs
@@ -1427,6 +1427,12 @@ impl LowerTy for Ty {
                 substitution: chalk_ir::Substitution::empty(interner),
             })
             .intern(interner)),
+
+            Ty::Never => Ok(chalk_ir::TyData::Apply(chalk_ir::ApplicationTy {
+                name: chalk_ir::TypeName::Never,
+                substitution: chalk_ir::Substitution::empty(interner),
+            })
+            .intern(interner)),
         }
     }
 }

diff --git a/chalk-parse/src/ast.rs b/chalk-parse/src/ast.rs
@@ -222,6 +222,7 @@ pub enum Ty {
         ty: Box<Ty>,
     },
     Str,
+    Never,
 }
 
 #[derive(Copy, Clone, PartialEq, Eq, Debug)]

diff --git a/chalk-parse/src/parser.lalrpop b/chalk-parse/src/parser.lalrpop
@@ -224,6 +224,7 @@ TyWithoutId: Ty = {
     },
     <ScalarType> => Ty::Scalar { ty: <> },
     "str" => Ty::Str,
+    "!" => Ty::Never,
     "fn" "(" <t:Ty> ")" => Ty::ForAll {
         lifetime_names: vec![],
         ty: Box::new(t)
-Original file line number
+Diff line change
@@ Expand Up / @@ -222,6 +222,7 @@ pub enum Ty { @@
             ty: Box<Ty>,
         },
         Str,
+        Never,
     }
     #[derive(Copy, Clone, PartialEq, Eq, Debug)]
@@ Expand Down @@