change overlapping_impls to take a tcx and create the infcx

rust-lang · Jan 30, 2018 · 514ae7d · 514ae7d
1 parent 4c210af
commit 514ae7d
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 72 deletions.
diff --git a/src/librustc/traits/coherence.rs b/src/librustc/traits/coherence.rs
@@ -19,7 +19,7 @@ use ty::{self, Ty, TyCtxt};
 use ty::fold::TypeFoldable;
 use ty::subst::Subst;
 
-use infer::{InferCtxt, InferOk};
+use infer::{InferOk};
 
 /// Whether we do the orphan check relative to this crate or
 /// to some remote crate.
@@ -43,8 +43,8 @@ pub struct OverlapResult<'tcx> {
 /// If there are types that satisfy both impls, invokes `on_overlap`
 /// with a suitably-freshened `ImplHeader` with those types
 /// substituted. Otherwise, invokes `no_overlap`.
-pub fn overlapping_impls<F1, F2, R>(
-    infcx: &InferCtxt<'_, '_, '_>,
+pub fn overlapping_impls<'gcx, F1, F2, R>(
+    tcx: TyCtxt<'_, 'gcx, 'gcx>,
     impl1_def_id: DefId,
     impl2_def_id: DefId,
     intercrate_mode: IntercrateMode,
@@ -63,12 +63,14 @@ where
            impl2_def_id,
            intercrate_mode);
 
-    let selcx = &mut SelectionContext::intercrate(infcx, intercrate_mode);
-    if let Some(r) = overlap(selcx, impl1_def_id, impl2_def_id) {
-        on_overlap(r)
-    } else {
-        no_overlap()
-    }
+    tcx.infer_ctxt().enter(|infcx| {
+        let selcx = &mut SelectionContext::intercrate(&infcx, intercrate_mode);
+        if let Some(r) = overlap(selcx, impl1_def_id, impl2_def_id) {
+            on_overlap(r)
+        } else {
+            no_overlap()
+        }
+    })
 }
 
 fn with_fresh_ty_vars<'cx, 'gcx, 'tcx>(selcx: &mut SelectionContext<'cx, 'gcx, 'tcx>,

diff --git a/src/librustc/traits/specialize/specialization_graph.rs b/src/librustc/traits/specialize/specialization_graph.rs
@@ -133,29 +133,27 @@ impl<'a, 'gcx, 'tcx> Children {
             };
 
             let tcx = tcx.global_tcx();
-            let (le, ge) = tcx.infer_ctxt().enter(|infcx| {
-                traits::overlapping_impls(
-                    &infcx,
-                    possible_sibling,
-                    impl_def_id,
-                    traits::IntercrateMode::Issue43355,
-                    |overlap| {
-                        if tcx.impls_are_allowed_to_overlap(impl_def_id, possible_sibling) {
-                            return Ok((false, false));
-                        }
-
-                        let le = tcx.specializes((impl_def_id, possible_sibling));
-                        let ge = tcx.specializes((possible_sibling, impl_def_id));
-
-                        if le == ge {
-                            Err(overlap_error(overlap))
-                        } else {
-                            Ok((le, ge))
-                        }
-                    },
-                    || Ok((false, false)),
-                )
-            })?;
+            let (le, ge) = traits::overlapping_impls(
+                tcx,
+                possible_sibling,
+                impl_def_id,
+                traits::IntercrateMode::Issue43355,
+                |overlap| {
+                    if tcx.impls_are_allowed_to_overlap(impl_def_id, possible_sibling) {
+                        return Ok((false, false));
+                    }
+
+                    let le = tcx.specializes((impl_def_id, possible_sibling));
+                    let ge = tcx.specializes((possible_sibling, impl_def_id));
+
+                    if le == ge {
+                        Err(overlap_error(overlap))
+                    } else {
+                        Ok((le, ge))
+                    }
+                },
+                || Ok((false, false)),
+            )?;
 
             if le && !ge {
                 debug!("descending as child of TraitRef {:?}",
@@ -172,16 +170,14 @@ impl<'a, 'gcx, 'tcx> Children {
                 return Ok(Inserted::Replaced(possible_sibling));
             } else {
                 if !tcx.impls_are_allowed_to_overlap(impl_def_id, possible_sibling) {
-                    tcx.infer_ctxt().enter(|infcx| {
-                        traits::overlapping_impls(
-                            &infcx,
-                            possible_sibling,
-                            impl_def_id,
-                            traits::IntercrateMode::Fixed,
-                            |overlap| last_lint = Some(overlap_error(overlap)),
-                            || (),
-                        )
-                    });
+                    traits::overlapping_impls(
+                        tcx,
+                        possible_sibling,
+                        impl_def_id,
+                        traits::IntercrateMode::Fixed,
+                        |overlap| last_lint = Some(overlap_error(overlap)),
+                        || (),
+                    );
                 }
 
                 // no overlap (error bailed already via ?)

diff --git a/src/librustc_typeck/coherence/inherent_impls_overlap.rs b/src/librustc_typeck/coherence/inherent_impls_overlap.rs
@@ -82,41 +82,37 @@ impl<'a, 'tcx> InherentOverlapChecker<'a, 'tcx> {
 
         for (i, &impl1_def_id) in impls.iter().enumerate() {
             for &impl2_def_id in &impls[(i + 1)..] {
-                let used_to_be_allowed = self.tcx.infer_ctxt().enter(|infcx| {
+                let used_to_be_allowed = traits::overlapping_impls(
+                    self.tcx,
+                    impl1_def_id,
+                    impl2_def_id,
+                    IntercrateMode::Issue43355,
+                    |overlap| {
+                        self.check_for_common_items_in_impls(
+                            impl1_def_id,
+                            impl2_def_id,
+                            overlap,
+                            false,
+                        );
+                        false
+                    },
+                    || true,
+                );
+
+                if used_to_be_allowed {
                     traits::overlapping_impls(
-                        &infcx,
+                        self.tcx,
                         impl1_def_id,
                         impl2_def_id,
-                        IntercrateMode::Issue43355,
-                        |overlap| {
-                            self.check_for_common_items_in_impls(
-                                impl1_def_id,
-                                impl2_def_id,
-                                overlap,
-                                false,
-                            );
-                            false
-                        },
-                        || true,
-                    )
-                });
-
-                if used_to_be_allowed {
-                    self.tcx.infer_ctxt().enter(|infcx| {
-                        traits::overlapping_impls(
-                            &infcx,
+                        IntercrateMode::Fixed,
+                        |overlap| self.check_for_common_items_in_impls(
                             impl1_def_id,
                             impl2_def_id,
-                            IntercrateMode::Fixed,
-                            |overlap| self.check_for_common_items_in_impls(
-                                impl1_def_id,
-                                impl2_def_id,
-                                overlap,
-                                true,
-                            ),
-                            || (),
-                        );
-                    });
+                            overlap,
+                            true,
+                        ),
+                        || (),
+                    );
                 }
             }
         }