decouple Copy and Clone

Author: basil-cow

chalk-solve/src/clauses/builtin_traits.rs

@@ -2,6 +2,7 @@ use super::builder::ClauseBuilder;
 use crate::{Interner, RustIrDatabase, TraitRef, WellKnownTrait};
 use chalk_ir::TyData;
 
+mod clone;
 mod copy;
 mod sized;
 
@@ -23,9 +24,8 @@ pub fn add_builtin_program_clauses<I: Interner>(
 
     match well_known {
         WellKnownTrait::SizedTrait => sized::add_sized_program_clauses(db, builder, trait_ref, ty),
-        WellKnownTrait::CopyTrait | WellKnownTrait::CloneTrait => {
-            copy::add_copy_clone_program_clauses(db, builder, trait_ref, ty)
-        }
+        WellKnownTrait::CopyTrait => copy::add_copy_program_clauses(db, builder, trait_ref, ty),
+        WellKnownTrait::CloneTrait => clone::add_clone_program_clauses(db, builder, trait_ref, ty),
         // Drop impls are provided explicitly
         WellKnownTrait::DropTrait => (),
     }

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

@@ -0,0 +1,17 @@
+use crate::clauses::ClauseBuilder;
+use crate::{Interner, RustIrDatabase, TraitRef};
+use chalk_ir::TyData;
+
+use super::copy::add_copy_program_clauses;
+
+pub fn add_clone_program_clauses<I: Interner>(
+    db: &dyn RustIrDatabase<I>,
+    builder: &mut ClauseBuilder<'_, I>,
+    trait_ref: &TraitRef<I>,
+    ty: &TyData<I>,
+) {
+    let _interner = db.interner();
+
+    // Implement Clone for types that automaticly implement Copy
+    add_copy_program_clauses(db, builder, trait_ref, ty);
+}

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

@@ -2,8 +2,7 @@ use crate::clauses::ClauseBuilder;
 use crate::{Interner, RustIrDatabase, TraitRef};
 use chalk_ir::TyData;
 
-/// Copy and Clone have the same automatic implementations
-pub fn add_copy_clone_program_clauses<I: Interner>(
+pub fn add_copy_program_clauses<I: Interner>(
     db: &dyn RustIrDatabase<I>,
     builder: &mut ClauseBuilder<'_, I>,
     trait_ref: &TraitRef<I>,