Merge

chalk-integration/src/lowering.rs

@@ -1810,6 +1810,7 @@ impl Lower for WellKnownTrait {
             WellKnownTrait::FnMut => rust_ir::WellKnownTrait::FnMut,
             WellKnownTrait::Fn => rust_ir::WellKnownTrait::Fn,
             WellKnownTrait::Unsize => rust_ir::WellKnownTrait::Unsize,
+            WellKnownTrait::Unpin => rust_ir::WellKnownTrait::Unpin,
         }
     }
 }

chalk-parse/src/ast.rs

@@ -126,6 +126,7 @@ pub enum WellKnownTrait {
     FnMut,
     Fn,
     Unsize,
+    Unpin,
 }
 
 #[derive(Clone, PartialEq, Eq, Debug)]

chalk-parse/src/parser.lalrpop

@@ -62,6 +62,7 @@ WellKnownTrait: WellKnownTrait = {
      "#" "[" "lang" "(" "fn_mut" ")" "]" => WellKnownTrait::FnMut,
      "#" "[" "lang" "(" "fn" ")" "]" => WellKnownTrait::Fn,
      "#" "[" "lang" "(" "unsize" ")" "]" => WellKnownTrait::Unsize,
+     "#" "[" "lang" "(" "unpin" ")" "]" => WellKnownTrait::Unpin,
 };
 
 AdtRepr: Atom = "#" "[" "repr" "(" <name:Id> ")" "]" => name.str;

chalk-solve/src/clauses/builtin_traits.rs

@@ -41,8 +41,12 @@ pub fn add_builtin_program_clauses<I: Interner>(
             WellKnownTrait::Unsize => {
                 unsize::add_unsize_program_clauses(db, builder, &trait_ref, ty)
             }
+
             // Drop impls are provided explicitly
             WellKnownTrait::Drop => (),
+
+            // There are no special rules for Unpin
+            WellKnownTrait::Unpin => (),
         }
         Ok(())
     })

chalk-solve/src/display/items.rs

@@ -193,6 +193,7 @@ impl<I: Interner> RenderAsRust<I> for TraitDatum<I> {
                 WellKnownTrait::FnMut => "fn_mut",
                 WellKnownTrait::Fn => "fn",
                 WellKnownTrait::Unsize => "unsize",
+                WellKnownTrait::Unpin => "unpin",
             };
             writeln!(f, "#[lang({})]", name)?;
         }

chalk-solve/src/rust_ir.rs

@@ -269,6 +269,7 @@ pub enum WellKnownTrait {
     FnMut,
     Fn,
     Unsize,
+    Unpin,
 }
 
 chalk_ir::const_visit!(WellKnownTrait);

chalk-solve/src/wf.rs

@@ -562,7 +562,8 @@ impl WfWellKnownGoals {
             | WellKnownTrait::FnOnce
             | WellKnownTrait::FnMut
             | WellKnownTrait::Fn
-            | WellKnownTrait::Unsize => None,
+            | WellKnownTrait::Unsize
+            | WellKnownTrait::Unpin => None,
         }
     }
 
@@ -577,7 +578,7 @@ impl WfWellKnownGoals {
 
         match db.trait_datum(impl_datum.trait_id()).well_known? {
             WellKnownTrait::Drop => Self::drop_impl_constraint(db, impl_datum),
-            WellKnownTrait::Copy | WellKnownTrait::Clone => None,
+            WellKnownTrait::Copy | WellKnownTrait::Clone | WellKnownTrait::Unpin => None,
             // You can't add a manual implementation for following traits:
             WellKnownTrait::Sized
             | WellKnownTrait::FnOnce

tests/test/mod.rs

@@ -346,5 +346,6 @@ mod slices;
 mod string;
 mod tuples;
 mod unify;
+mod unpin;
 mod unsize;
 mod wf_goals;

tests/test/unpin.rs

@@ -0,0 +1,86 @@
+//! Tests targeting the Unpin trait
+
+use super::*;
+
+#[test]
+fn unpin_lowering() {
+    lowering_success! {
+        program {
+            #[auto] #[lang(unpin)] trait Unpin { }
+            enum A { Variant }
+            struct B { }
+            impl !Unpin for A {}
+            impl Unpin for B {}
+        }
+    }
+}
+
+#[test]
+fn unpin_auto_trait() {
+    test! {
+        program {
+            #[auto] #[lang(unpin)] trait Unpin { }
+            struct A { }
+        }
+
+        goal {
+            A: Unpin
+        } yields {
+            "Unique"
+        }
+    }
+}
+
+#[test]
+fn unpin_negative() {
+    test! {
+        program {
+            #[auto] #[lang(unpin)] trait Unpin { }
+            struct A { }
+            impl !Unpin for A {}
+        }
+
+        goal {
+            A: Unpin
+        } yields {
+            "No possible solution"
+        }
+    }
+}
+
+#[test]
+fn unpin_inherit_negative() {
+    test! {
+        program {
+            #[auto] #[lang(unpin)] trait Unpin { }
+            struct A { }
+            impl !Unpin for A {}
+            struct B { a: A }
+        }
+
+        goal {
+            B: Unpin
+        } yields {
+            "No possible solution"
+        }
+    }
+}
+
+#[test]
+fn unpin_overwrite() {
+    test! {
+        program {
+            #[auto] #[lang(unpin)] trait Unpin { }
+            struct A { }
+            impl !Unpin for A {}
+            struct B { a: A }
+            impl Unpin for B {}
+        }
+
+        goal {
+            B: Unpin
+        } yields {
+            "Unique"
+        }
+    }
+}