Merge pull request #444 from nathanwhit/typename-refs

Add reference types to `TypeName`

Author: jackh726

chalk-integration/src/lowering.rs

@@ -1221,6 +1221,24 @@ impl LowerTy for Ty {
                 )?,
             })
             .intern(interner)),
+
+            Ty::Ref {
+                mutability,
+                lifetime,
+                ty,
+            } => Ok(chalk_ir::TyData::Apply(chalk_ir::ApplicationTy {
+                name: chalk_ir::TypeName::Ref(ast_mutability_to_chalk_mutability(
+                    mutability.clone(),
+                )),
+                substitution: chalk_ir::Substitution::from(
+                    interner,
+                    &[
+                        lifetime.lower(env)?.cast(interner),
+                        ty.lower(env)?.cast(interner),
+                    ],
+                ),
+            })
+            .intern(interner)),
         }
     }
 }

chalk-ir/src/debug.rs

@@ -145,6 +145,7 @@ impl<I: Interner> Debug for TypeName<I> {
             TypeName::Tuple(arity) => write!(fmt, "{:?}", arity),
             TypeName::OpaqueType(opaque_ty) => write!(fmt, "!{:?}", opaque_ty),
             TypeName::Raw(mutability) => write!(fmt, "{:?}", mutability),
+            TypeName::Ref(mutability) => write!(fmt, "{:?}", mutability),
             TypeName::Error => write!(fmt, "{{error}}"),
         }
     }

chalk-ir/src/lib.rs

@@ -159,6 +159,9 @@ pub enum TypeName<I: Interner> {
     /// a raw pointer type like `*const T` or `*mut T`
     Raw(Mutability),
 
+    /// a reference type like `&T` or `&mut T`
+    Ref(Mutability),
+
     /// a placeholder for opaque types like `impl Trait`
     OpaqueType(OpaqueTyId<I>),
 

chalk-parse/src/ast.rs

@@ -197,6 +197,11 @@ pub enum Ty {
         mutability: Mutability,
         ty: Box<Ty>,
     },
+    Ref {
+        mutability: Mutability,
+        lifetime: Lifetime,
+        ty: Box<Ty>,
+    },
 }
 
 #[derive(Copy, Clone, PartialEq, Eq, Debug)]

chalk-parse/src/parser.lalrpop

@@ -205,7 +205,9 @@ TyWithoutFor: Ty = {
     <n:Id> "<" <a:Comma<Parameter>> ">" => Ty::Apply { name: n, args: a },
     <p:ProjectionTy> => Ty::Projection { proj: p },
     "(" <t:TupleOrParensInner> ")" => t,
-    "*" <m: Mutability> <t:Ty> => Ty::Raw{ mutability: m, ty: Box::new(t) },
+    "*" <m: RawMutability> <t:Ty> => Ty::Raw{ mutability: m, ty: Box::new(t) },
+    "&" <l: Lifetime> "mut" <t:Ty> => Ty::Ref{ mutability: Mutability::Mut, lifetime: l, ty: Box::new(t) },
+    "&" <l: Lifetime> <t:Ty> => Ty::Ref{ mutability: Mutability::Not, lifetime: l, ty: Box::new(t) },
 };
 
 ScalarType: ScalarType = {
@@ -238,7 +240,7 @@ TupleOrParensInner: Ty = {
     () => Ty::Tuple { types: vec![] },
 };
 
-Mutability: Mutability = {
+RawMutability: Mutability = {
     "mut" => Mutability::Mut,
     "const" => Mutability::Not,
 };

chalk-solve/src/clauses.rs

@@ -411,6 +411,7 @@ fn match_type_name<I: Interner>(
             builder.push_fact(WellFormed::Ty(application.clone().intern(interner)))
         }
         TypeName::Raw(_) => builder.push_fact(WellFormed::Ty(application.clone().intern(interner))),
+        TypeName::Ref(_) => builder.push_fact(WellFormed::Ty(application.clone().intern(interner))),
     }
 }
 

chalk-solve/src/clauses/builtin_traits/copy.rs

@@ -41,7 +41,7 @@ pub fn add_copy_program_clauses<I: Interner>(
             TypeName::Tuple(arity) => {
                 push_tuple_copy_conditions(db, builder, trait_ref, *arity, substitution)
             }
-            TypeName::Raw(_) => builder.push_fact(trait_ref.clone()),
+            TypeName::Raw(_) | TypeName::Ref(_) => builder.push_fact(trait_ref.clone()),
             _ => return,
         },
         TyData::Function(_) => builder.push_fact(trait_ref.clone()),

chalk-solve/src/clauses/builtin_traits/sized.rs

@@ -71,11 +71,12 @@ pub fn add_sized_program_clauses<I: Interner>(
             TypeName::Struct(struct_id) => {
                 push_struct_sized_conditions(db, builder, trait_ref, *struct_id, substitution)
             }
-            TypeName::Scalar(_) => builder.push_fact(trait_ref.clone()),
             TypeName::Tuple(arity) => {
                 push_tuple_sized_conditions(db, builder, trait_ref, *arity, substitution)
             }
-            TypeName::Raw(_) => builder.push_fact(trait_ref.clone()),
+            TypeName::Scalar(_) | TypeName::Raw(_) | TypeName::Ref(_) => {
+                builder.push_fact(trait_ref.clone())
+            }
             _ => return,
         },
         TyData::Function(_) => builder.push_fact(trait_ref.clone()),

tests/lowering/mod.rs

@@ -471,7 +471,7 @@ fn scalars() {
         }
 
         error_msg {
-            "parse error: UnrecognizedToken { token: (8, Token(51, \"i32\"), 11), expected: [\"r#\\\"([A-Za-z]|_)([A-Za-z0-9]|_)*\\\"#\"] }"
+            "parse error: UnrecognizedToken { token: (8, Token(52, \"i32\"), 11), expected: [\"r#\\\"([A-Za-z]|_)([A-Za-z0-9]|_)*\\\"#\"] }"
         }
     }
 }
@@ -495,7 +495,7 @@ fn raw_pointers() {
             struct *const i32 { }
         }
         error_msg {
-            "parse error: UnrecognizedToken { token: (8, Token(7, \"*\"), 9), expected: [\"r#\\\"([A-Za-z]|_)([A-Za-z0-9]|_)*\\\"#\"] }"
+            "parse error: UnrecognizedToken { token: (8, Token(8, \"*\"), 9), expected: [\"r#\\\"([A-Za-z]|_)([A-Za-z0-9]|_)*\\\"#\"] }"
         }
     }
 
@@ -505,7 +505,31 @@ fn raw_pointers() {
             impl Foo for *i32 { }
         }
         error_msg {
-            "parse error: UnrecognizedToken { token: (30, Token(51, \"i32\"), 33), expected: [\"\\\"const\\\"\", \"\\\"mut\\\"\"] }"
+            "parse error: UnrecognizedToken { token: (30, Token(52, \"i32\"), 33), expected: [\"\\\"const\\\"\", \"\\\"mut\\\"\"] }"
+        }
+    }
+}
+
+#[test]
+fn refs() {
+    lowering_success! {
+        program {
+            trait Foo { }
+
+            impl<'a, T> Foo for &'a T { }
+            impl<'b, T> Foo for &'b mut T { }
+        }
+    }
+
+    lowering_error! {
+        program {
+            trait Foo { }
+
+            impl<T> Foo for &T { }
+        }
+
+        error_msg {
+            "parse error: UnrecognizedToken { token: (36, Token(1, \"T\"), 37), expected: [\"r#\\\"\\\\\\\'([A-Za-z]|_)([A-Za-z0-9]|_)*\\\"#\"] }"
         }
     }
 }

tests/test/mod.rs

@@ -314,6 +314,7 @@ mod impls;
 mod misc;
 mod negation;
 mod projection;
+mod refs;
 mod scalars;
 mod tuples;
 mod unify;