Fix tests by floundering on general bound vars in builtin trait code

Author: AzureMarker

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

@@ -81,7 +81,11 @@ pub fn add_copy_program_clauses<I: Interner>(
             match var_kind {
                 VariableKind::Ty(TyVariableKind::Integer)
                 | VariableKind::Ty(TyVariableKind::Float) => builder.push_fact(trait_ref),
-                VariableKind::Ty(_) | VariableKind::Const(_) | VariableKind::Lifetime => {}
+
+                // Don't know enough
+                VariableKind::Ty(TyVariableKind::General) => return Err(Floundered),
+
+                VariableKind::Const(_) | VariableKind::Lifetime => {}
             }
         }
 

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

@@ -157,7 +157,7 @@ pub fn add_fn_trait_program_clauses<I: Interner>(
             Ok(())
         }
         // Function traits are non-enumerable
-        TyKind::InferenceVar(..) | TyKind::Alias(..) => Err(Floundered),
+        TyKind::InferenceVar(..) | TyKind::BoundVar(_) | TyKind::Alias(..) => Err(Floundered),
         _ => Ok(()),
     }
 }

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

@@ -106,7 +106,11 @@ pub fn add_sized_program_clauses<I: Interner>(
             match var_kind {
                 VariableKind::Ty(TyVariableKind::Integer)
                 | VariableKind::Ty(TyVariableKind::Float) => builder.push_fact(trait_ref),
-                VariableKind::Ty(_) | VariableKind::Const(_) | VariableKind::Lifetime => {}
+
+                // Don't know enough
+                VariableKind::Ty(TyVariableKind::General) => return Err(Floundered),
+
+                VariableKind::Const(_) | VariableKind::Lifetime => {}
             }
         }
 

tests/test/misc.rs

@@ -537,28 +537,19 @@ fn builtin_impl_enumeration() {
 
         goal {
             exists<T> { T: Copy }
-        } yields[SolverChoice::recursive_default()] {
-            // FIXME: wrong, e.g. &u8 is also Copy
-            "Unique; substitution [?0 := Uint(U8)]"
-        } yields[SolverChoice::slg_default()] {
+        } yields {
             "Ambiguous; no inference guidance"
         }
 
         goal {
             exists<T> { T: Clone }
-        } yields[SolverChoice::recursive_default()] {
-            // FIXME: wrong, e.g. &u8 is also Clone
-            "Unique; substitution [?0 := Uint(U8)]"
-        } yields[SolverChoice::slg_default()] {
+        } yields {
             "Ambiguous; no inference guidance"
         }
 
         goal {
             exists<T> { T: Sized }
-        } yields[SolverChoice::recursive_default()] {
-            // FIXME: wrong, most of the built-in types are Sized
-            "No possible solution"
-        } yields[SolverChoice::slg_default()] {
+        } yields {
             "Ambiguous; no inference guidance"
         }
     }