Address comments

rust-lang · Aug 4, 2020 · db53993 · db53993
1 parent e8a3401
commit db53993
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 103 deletions.
diff --git a/chalk-solve/src/clauses/builtin_traits/copy.rs b/chalk-solve/src/clauses/builtin_traits/copy.rs
@@ -65,17 +65,17 @@ pub fn add_copy_program_clauses<I: Interner>(
                 needs_impl_for_tys(db, builder, trait_ref, Some(upvars).into_iter());
             }
 
-            TypeName::Ref(Mutability::Not)
+            // these impls are in libcore
+            TypeName::Ref(_)
             | TypeName::Raw(_)
             | TypeName::Scalar(_)
-            | TypeName::Never => builder.push_fact(trait_ref.clone()),
+            | TypeName::Never
+            | TypeName::Str => {}
 
-            TypeName::Ref(Mutability::Mut)
-            | TypeName::Adt(_)
+            TypeName::Adt(_)
             | TypeName::AssociatedType(_)
             | TypeName::Slice
             | TypeName::OpaqueType(_)
-            | TypeName::Str
             | TypeName::Error => {}
         },
 
@@ -96,8 +96,6 @@ pub fn add_copy_program_clauses<I: Interner>(
             }
         }
 
-        // TODO(areredify)
-        // when #368 lands, extend this to handle everything accordingly
         TyData::Alias(_) | TyData::Dyn(_) | TyData::Placeholder(_) => {}
     };
 }
diff --git a/chalk-solve/src/clauses/builtin_traits/sized.rs b/chalk-solve/src/clauses/builtin_traits/sized.rs
@@ -73,8 +73,6 @@ pub fn add_sized_program_clauses<I: Interner>(
     ty: &TyData<I>,
     binders: &CanonicalVarKinds<I>,
 ) {
-    // TODO(areredify)
-    // when #368 lands, extend this to handle everything accordingly
     match ty {
         TyData::Apply(ApplicationTy { name, substitution }) => match name {
             TypeName::Adt(adt_id) => {

diff --git a/tests/test/functions.rs b/tests/test/functions.rs
@@ -43,8 +43,6 @@ fn functions_are_copy() {
     }
 }
 
-use crate::test::*;
-
 #[test]
 fn function_implement_fn_traits() {
     test! {

diff --git a/tests/test/refs.rs b/tests/test/refs.rs
@@ -29,30 +29,6 @@ fn immut_refs_are_sized() {
     }
 }
 
-#[test]
-fn immut_refs_are_copy_clone() {
-    test! {
-        program {
-            #[lang(copy)]
-            trait Copy { }
-
-            #[lang(clone)]
-            trait Clone { }
-        }
-
-        goal {
-            forall<'a, T> { &'a T: Copy }
-        } yields {
-            "Unique; substitution [], lifetime constraints []"
-        }
-        goal {
-            forall<'a, T> { &'a T: Clone }
-        } yields {
-            "Unique; substitution [], lifetime constraints []"
-        }
-    }
-}
-
 #[test]
 fn mut_refs_are_well_formed() {
     test! {
@@ -81,27 +57,3 @@ fn mut_refs_are_sized() {
         }
     }
 }
-
-#[test]
-fn mut_refs_are_not_copy_clone() {
-    test! {
-        program {
-            #[lang(copy)]
-            trait Copy { }
-
-            #[lang(clone)]
-            trait Clone { }
-        }
-
-        goal {
-            forall<'a, T> { &'a mut T: Copy }
-        } yields {
-            "No possible solution"
-        }
-        goal {
-            forall<'a, T> { &'a mut T: Clone }
-        } yields {
-            "No possible solution"
-        }
-    }
-}
diff --git a/tests/test/scalars.rs b/tests/test/scalars.rs
@@ -162,47 +162,3 @@ fn scalars_are_sized() {
         goal { char: Sized } yields { "Unique" }
     }
 }
-
-#[test]
-fn scalars_are_copy_clone() {
-    test! {
-        program {
-            #[lang(copy)] trait Copy { }
-            #[lang(clone)] trait Clone { }
-        }
-
-        goal { i8: Copy } yields { "Unique" }
-        goal { i16: Copy } yields { "Unique" }
-        goal { i32: Copy } yields { "Unique" }
-        goal { i64: Copy } yields { "Unique" }
-        goal { i128: Copy } yields { "Unique" }
-        goal { isize: Copy } yields { "Unique" }
-        goal { u8: Copy } yields { "Unique" }
-        goal { u16: Copy } yields { "Unique" }
-        goal { u32: Copy } yields { "Unique" }
-        goal { u64: Copy } yields { "Unique" }
-        goal { u128: Copy } yields { "Unique" }
-        goal { usize: Copy } yields { "Unique" }
-        goal { f32: Copy } yields { "Unique" }
-        goal { f64: Copy } yields { "Unique" }
-        goal { bool: Copy } yields { "Unique" }
-        goal { char: Copy } yields { "Unique" }
-
-        goal { i8: Clone } yields { "Unique" }
-        goal { i16: Clone } yields { "Unique" }
-        goal { i32: Clone } yields { "Unique" }
-        goal { i64: Clone } yields { "Unique" }
-        goal { i128: Clone } yields { "Unique" }
-        goal { isize: Clone } yields { "Unique" }
-        goal { u8: Clone } yields { "Unique" }
-        goal { u16: Clone } yields { "Unique" }
-        goal { u32: Clone } yields { "Unique" }
-        goal { u64: Clone } yields { "Unique" }
-        goal { u128: Clone } yields { "Unique" }
-        goal { usize: Clone } yields { "Unique" }
-        goal { f32: Clone } yields { "Unique" }
-        goal { f64: Clone } yields { "Unique" }
-        goal { bool: Clone } yields { "Unique" }
-        goal { char: Clone } yields { "Unique" }
-    }
-}
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,8 +43,6 @@ fn functions_are_copy() { @@
         }
     }
-    use crate::test::*;
     #[test]
     fn function_implement_fn_traits() {
         test! {
@@ Expand Down @@