Merge pull request #411 from jackh726/rustc_updates

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

Author: nikomatsakis

chalk-derive/Cargo.toml

@@ -14,7 +14,7 @@ proc-macro = true
 [dependencies]
 synstructure = "0.12.1"
 quote = "1.0.2"
-proc-macro2 = "1.0.6"
+proc-macro2 = "1.0.3"
 
 [dependencies.syn]
 version = "1.0.5"

chalk-integration/src/db.rs

@@ -17,7 +17,6 @@ use chalk_ir::Parameter;
 use chalk_ir::ProgramClause;
 use chalk_ir::StructId;
 use chalk_ir::TraitId;
-use chalk_ir::TypeName;
 use chalk_ir::{ProgramClauses, UCanonical};
 use chalk_rust_ir::AssociatedTyDatum;
 use chalk_rust_ir::AssociatedTyValue;
@@ -115,10 +114,6 @@ impl RustIrDatabase<ChalkIr> for ChalkDatabase {
         self.program_ir().unwrap().struct_datum(id)
     }
 
-    fn as_struct_id(&self, type_name: &TypeName<ChalkIr>) -> Option<StructId<ChalkIr>> {
-        self.program_ir().unwrap().as_struct_id(type_name)
-    }
-
     fn impls_for_trait(
         &self,
         trait_id: TraitId<ChalkIr>,

chalk-integration/src/program.rs

@@ -6,7 +6,7 @@ use chalk_ir::tls;
 use chalk_ir::{
     debug::SeparatorTraitRef, AliasTy, ApplicationTy, AssocTypeId, Goal, Goals, ImplId, Lifetime,
     OpaqueTy, OpaqueTyId, Parameter, ProgramClause, ProgramClauseImplication, ProgramClauses,
-    ProjectionTy, StructId, Substitution, TraitId, Ty, TypeName,
+    ProjectionTy, StructId, Substitution, TraitId, Ty,
 };
 use chalk_rust_ir::{
     AssociatedTyDatum, AssociatedTyValue, AssociatedTyValueId, ImplDatum, ImplType, OpaqueTyDatum,
@@ -332,13 +332,6 @@ impl RustIrDatabase<ChalkIr> for Program {
         self.struct_data[&id].clone()
     }
 
-    fn as_struct_id(&self, type_name: &TypeName<ChalkIr>) -> Option<StructId<ChalkIr>> {
-        match type_name {
-            TypeName::Struct(struct_id) => Some(*struct_id),
-            _ => None,
-        }
-    }
-
     fn impls_for_trait(
         &self,
         trait_id: TraitId<ChalkIr>,

chalk-ir/src/interner.rs

@@ -201,10 +201,13 @@ pub trait Interner: Debug + Copy + Eq + Ord + Hash {
     ///
     /// Returns `None` to fallback to the default debug output (e.g.,
     /// if no info about current program is available from TLS).
+    #[allow(unused_variables)]
     fn debug_opaque_ty_id(
         opaque_ty_id: OpaqueTyId<Self>,
         fmt: &mut fmt::Formatter<'_>,
-    ) -> Option<fmt::Result>;
+    ) -> Option<fmt::Result> {
+        None
+    }
 
     /// Prints the debug representation of an alias. To get good
     /// results, this requires inspecting TLS, and is difficult to
@@ -225,10 +228,13 @@ pub trait Interner: Debug + Copy + Eq + Ord + Hash {
     ///
     /// Returns `None` to fallback to the default debug output (e.g.,
     /// if no info about current program is available from TLS).
+    #[allow(unused_variables)]
     fn debug_projection_ty(
         projection_ty: &ProjectionTy<Self>,
         fmt: &mut fmt::Formatter<'_>,
-    ) -> Option<fmt::Result>;
+    ) -> Option<fmt::Result> {
+        None
+    }
 
     /// Prints the debug representation of an OpaqueTy. To get good
     /// results, this requires inspecting TLS, and is difficult to
@@ -237,10 +243,13 @@ pub trait Interner: Debug + Copy + Eq + Ord + Hash {
     ///
     /// Returns `None` to fallback to the default debug output (e.g.,
     /// if no info about current program is available from TLS).
+    #[allow(unused_variables)]
     fn debug_opaque_ty(
         opaque_ty: &OpaqueTy<Self>,
         fmt: &mut fmt::Formatter<'_>,
-    ) -> Option<fmt::Result>;
+    ) -> Option<fmt::Result> {
+        None
+    }
 
     /// Prints the debug representation of an type. To get good
     /// results, this requires inspecting TLS, and is difficult to

chalk-solve/src/clauses.rs

@@ -185,11 +185,12 @@ fn program_clauses_that_could_match<I: Interner>(
             let trait_datum = db.trait_datum(trait_id);
             if trait_datum.is_auto_trait() {
                 match trait_ref.self_type_parameter(interner).data(interner) {
-                    TyData::Apply(apply) => {
-                        if let Some(struct_id) = db.as_struct_id(&apply.name) {
-                            push_auto_trait_impls(builder, trait_id, struct_id);
+                    TyData::Apply(apply) => match &apply.name {
+                        TypeName::Struct(struct_id) => {
+                            push_auto_trait_impls(builder, trait_id, *struct_id);
                         }
-                    }
+                        _ => {}
+                    },
                     TyData::InferenceVar(_) | TyData::BoundVar(_) => {
                         return Err(Floundered);
                     }
@@ -461,7 +462,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/lib.rs

@@ -43,9 +43,6 @@ pub trait RustIrDatabase<I: Interner>: Debug {
     /// Returns the `OpaqueTyDatum` with the given id.
     fn opaque_ty_data(&self, id: OpaqueTyId<I>) -> Arc<OpaqueTyDatum<I>>;
 
-    /// If `id` is a struct id, returns `Some(id)` (but cast to `StructId`).
-    fn as_struct_id(&self, id: &TypeName<I>) -> Option<StructId<I>>;
-
     /// Returns a list of potentially relevant impls for a given
     /// trait-id; we also supply the type parameters that we are
     /// trying to match (if known: these parameters may contain

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![],
         }
     }