Rollup merge of #67867 - matthewjasper:opaque-assoc-lookup, r=oli-obk

[rust.git] / src / librustc_traits / normalize_projection_ty.rs

diff --git a/src/librustc_traits/normalize_projection_ty.rs b/src/librustc_traits/normalize_projection_ty.rs
index 7e0ca5b00183d9de971451c87bdd91e7798bec80..e50ca485e0a6a742afea9d5bba951d2129edcef7 100644 (file)
--- a/src/librustc_traits/normalize_projection_ty.rs
+++ b/src/librustc_traits/normalize_projection_ty.rs
@@ -1,17 +1,14 @@
-use rustc::hir;
 use rustc::infer::canonical::{Canonical, QueryResponse};
 use rustc::traits::query::{normalize::NormalizationResult, CanonicalProjectionGoal, NoSolution};
 use rustc::traits::{self, ObligationCause, SelectionContext, TraitEngineExt};
 use rustc::ty::query::Providers;
 use rustc::ty::{ParamEnvAnd, TyCtxt};
+use rustc_hir as hir;
+use rustc_span::DUMMY_SP;
 use std::sync::atomic::Ordering;
-use syntax_pos::DUMMY_SP;
 
 crate fn provide(p: &mut Providers<'_>) {
-    *p = Providers {
-        normalize_projection_ty,
-        ..*p
-    };
+    *p = Providers { normalize_projection_ty, ..*p };
 }
 
 fn normalize_projection_ty<'tcx>(
@@ -20,18 +17,10 @@ fn normalize_projection_ty<'tcx>(
 ) -> Result<&'tcx Canonical<'tcx, QueryResponse<'tcx, NormalizationResult<'tcx>>>, NoSolution> {
     debug!("normalize_provider(goal={:#?})", goal);
 
-    tcx.sess
-        .perf_stats
-        .normalize_projection_ty
-        .fetch_add(1, Ordering::Relaxed);
+    tcx.sess.perf_stats.normalize_projection_ty.fetch_add(1, Ordering::Relaxed);
     tcx.infer_ctxt().enter_canonical_trait_query(
         &goal,
-        |infcx,
-         fulfill_cx,
-         ParamEnvAnd {
-             param_env,
-             value: goal,
-         }| {
+        |infcx, fulfill_cx, ParamEnvAnd { param_env, value: goal }| {
             let selcx = &mut SelectionContext::new(infcx);
             let cause = ObligationCause::misc(DUMMY_SP, hir::DUMMY_HIR_ID);
             let mut obligations = vec![];
@@ -44,9 +33,7 @@ fn normalize_projection_ty<'tcx>(
                 &mut obligations,
             );
             fulfill_cx.register_predicate_obligations(infcx, obligations);
-            Ok(NormalizationResult {
-                normalized_ty: answer,
-            })
+            Ok(NormalizationResult { normalized_ty: answer })
         },
     )
 }