Remove as_struct_id

Author: jackh726

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-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);
                     }

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