Stop relaying TypeBuilder

Author: coord-e

src/analyze.rs

@@ -243,9 +243,10 @@ impl<'tcx> Analyzer<'tcx> {
         def_id: DefId,
         generic_args: mir_ty::GenericArgsRef<'tcx>,
     ) -> Option<rty::RefinedType> {
-        let type_builder = TypeBuilder::new(self.tcx, def_id);
         let deferred_ty = match self.defs.get(&def_id)? {
             DefTy::Concrete(rty) => {
+                let type_builder = TypeBuilder::new(self.tcx, def_id);
+
                 let mut def_ty = rty.clone();
                 def_ty.instantiate_ty_params(
                     generic_args
@@ -265,9 +266,7 @@ impl<'tcx> Analyzer<'tcx> {
         }
 
         let mut analyzer = self.local_def_analyzer(def_id.as_local()?);
-        analyzer
-            .type_builder(type_builder)
-            .generic_args(generic_args);
+        analyzer.generic_args(generic_args);
 
         let expected = analyzer.expected_ty();
         deferred_ty_cache

src/analyze/basic_block.rs

@@ -1140,11 +1140,6 @@ impl<'tcx, 'ctx> Analyzer<'tcx, 'ctx> {
         self
     }
 
-    pub fn type_builder(&mut self, type_builder: TypeBuilder<'tcx>) -> &mut Self {
-        self.type_builder = type_builder;
-        self
-    }
-
     pub fn run(&mut self, expected: &BasicBlockType) {
         let span = tracing::info_span!("bb", bb = ?self.basic_block);
         let _guard = span.enter();

src/analyze/crate_.rs

@@ -73,7 +73,6 @@ impl<'tcx, 'ctx> Analyzer<'tcx, 'ctx> {
 
             // check polymorphic function def by replacing type params with some opaque type
             // (and this is no-op if the function is mono)
-            let type_builder = TypeBuilder::new(self.tcx, local_def_id.to_def_id());
             let mut expected = expected.clone();
             let subst = rty::TypeParamSubst::new(
                 expected
@@ -86,7 +85,6 @@ impl<'tcx, 'ctx> Analyzer<'tcx, 'ctx> {
             let generic_args = self.placeholder_generic_args(*local_def_id);
             self.ctx
                 .local_def_analyzer(*local_def_id)
-                .type_builder(type_builder)
                 .generic_args(generic_args)
                 .run(&expected);
         }

src/analyze/local_def.rs

@@ -533,7 +533,6 @@ impl<'tcx, 'ctx> Analyzer<'tcx, 'ctx> {
                 .basic_block_analyzer(self.local_def_id, bb)
                 .body(self.body.clone())
                 .drop_points(drop_points)
-                .type_builder(self.type_builder.clone())
                 .run(&rty);
         }
     }
@@ -650,11 +649,6 @@ impl<'tcx, 'ctx> Analyzer<'tcx, 'ctx> {
         }
     }
 
-    pub fn type_builder(&mut self, type_builder: TypeBuilder<'tcx>) -> &mut Self {
-        self.type_builder = type_builder;
-        self
-    }
-
     pub fn generic_args(&mut self, generic_args: mir_ty::GenericArgsRef<'tcx>) -> &mut Self {
         self.body =
             mir_ty::EarlyBinder::bind(self.body.clone()).instantiate(self.tcx, generic_args);