Merge pull request #906 from Nadrieril/cleanup-trait-resolution

Cleanup trait resolution

frontend/exporter/src/state.rs

@@ -189,7 +189,7 @@ pub type StateWithThir<'tcx> =
 pub type StateWithMir<'tcx> =
     State<Base<'tcx>, (), types::RcMir<'tcx>, rustc_hir::def_id::DefId, ()>;
 
-impl<'tcx> State<Base<'tcx>, (), (), (), ()> {
+impl<'tcx> StateWithBase<'tcx> {
     pub fn new(
         tcx: rustc_middle::ty::TyCtxt<'tcx>,
         options: hax_frontend_exporter_options::Options,
@@ -247,6 +247,18 @@ impl<'tcx> StateWithThir<'tcx> {
     }
 }
 
+impl<'tcx> StateWithOwner<'tcx> {
+    pub fn from_under_owner<S: UnderOwnerState<'tcx>>(s: &S) -> Self {
+        Self {
+            base: s.base(),
+            owner_id: s.owner_id(),
+            thir: (),
+            mir: (),
+            binder: (),
+        }
+    }
+}
+
 /// Updates the OnwerId in a state, making sure to override `opt_def_id` in base as well.
 pub fn with_owner_id<'tcx, THIR, MIR>(
     mut base: types::Base<'tcx>,