Use FxHashMap/FxHashSet and add well-formed clause for tuples

Author: jackh726

chalk-solve/src/clauses.rs

@@ -461,7 +461,9 @@ fn match_type_name<I: Interner>(
         TypeName::Scalar(_) => {
             builder.push_fact(WellFormed::Ty(application.clone().intern(interner)))
         }
-        TypeName::Tuple(_) => (),
+        TypeName::Tuple(_) => {
+            builder.push_fact(WellFormed::Ty(application.clone().intern(interner)))
+        }
     }
 }
 

chalk-solve/src/clauses/generalize.rs

@@ -13,11 +13,11 @@ use chalk_ir::{
     Binders, BoundVar, DebruijnIndex, Lifetime, LifetimeData, ParameterKind, ParameterKinds, Ty,
     TyData,
 };
-use std::collections::HashMap;
+use rustc_hash::FxHashMap;
 
 pub struct Generalize<'i, I: Interner> {
     binders: Vec<ParameterKind<()>>,
-    mapping: HashMap<BoundVar, usize>,
+    mapping: FxHashMap<BoundVar, usize>,
     interner: &'i I,
 }
 
@@ -29,7 +29,7 @@ impl<I: Interner> Generalize<'_, I> {
     {
         let mut generalize = Generalize {
             binders: Vec::new(),
-            mapping: HashMap::new(),
+            mapping: FxHashMap::default(),
             interner,
         };
         let value = value

chalk-solve/src/recursive/fulfill.rs

@@ -11,7 +11,7 @@ use infer::{
     InferenceTable, ParameterEnaVariable, ParameterEnaVariableExt,
 };
 use interner::HasInterner;
-use std::collections::HashSet;
+use rustc_hash::FxHashSet;
 use std::fmt::Debug;
 use zip::Zip;
 
@@ -77,7 +77,7 @@ pub(crate) struct Fulfill<'s, 'db, I: Interner> {
 
     /// Lifetime constraints that must be fulfilled for a solution to be fully
     /// validated.
-    constraints: HashSet<InEnvironment<Constraint<I>>>,
+    constraints: FxHashSet<InEnvironment<Constraint<I>>>,
 
     /// Record that a goal has been processed that can neither be proved nor
     /// refuted. In such a case the solution will be either `CannotProve`, or `Err`
@@ -99,7 +99,7 @@ impl<'s, 'db, I: Interner> Fulfill<'s, 'db, I> {
             solver,
             infer,
             obligations: vec![],
-            constraints: HashSet::new(),
+            constraints: FxHashSet::default(),
             cannot_prove: false,
         };
         (fulfill, subst, canonical_goal)

chalk-solve/src/recursive/search_graph.rs

@@ -1,4 +1,3 @@
-use std::collections::HashMap;
 use std::ops::Add;
 use std::ops::Index;
 use std::ops::IndexMut;
@@ -12,7 +11,7 @@ use chalk_ir::{interner::Interner, ClausePriority};
 use rustc_hash::FxHashMap;
 
 pub(super) struct SearchGraph<I: Interner> {
-    indices: HashMap<UCanonicalGoal<I>, DepthFirstNumber>,
+    indices: FxHashMap<UCanonicalGoal<I>, DepthFirstNumber>,
     nodes: Vec<Node<I>>,
 }
 
@@ -41,7 +40,7 @@ pub(super) struct Node<I: Interner> {
 impl<I: Interner> SearchGraph<I> {
     pub(crate) fn new() -> Self {
         SearchGraph {
-            indices: HashMap::new(),
+            indices: FxHashMap::default(),
             nodes: vec![],
         }
     }