rustfmt various files
This commit is contained in:
parent
9b1d2229ff
commit
1523de34a2
@ -56,7 +56,8 @@ impl<'cx, 'gcx, 'tcx> InferCtxtBuilder<'cx, 'gcx, 'tcx> {
|
||||
pub fn enter_canonical_trait_query<K, R>(
|
||||
&'tcx mut self,
|
||||
canonical_key: &Canonical<'tcx, K>,
|
||||
op: impl FnOnce(&InferCtxt<'_, 'gcx, 'tcx>, &mut FulfillmentContext<'tcx>, K) -> Fallible<R>,
|
||||
operation: impl FnOnce(&InferCtxt<'_, 'gcx, 'tcx>, &mut FulfillmentContext<'tcx>, K)
|
||||
-> Fallible<R>,
|
||||
) -> Fallible<CanonicalizedQueryResult<'gcx, R>>
|
||||
where
|
||||
K: TypeFoldable<'tcx>,
|
||||
@ -66,7 +67,7 @@ impl<'cx, 'gcx, 'tcx> InferCtxtBuilder<'cx, 'gcx, 'tcx> {
|
||||
let (key, canonical_inference_vars) =
|
||||
infcx.instantiate_canonical_with_fresh_inference_vars(DUMMY_SP, &canonical_key);
|
||||
let fulfill_cx = &mut FulfillmentContext::new();
|
||||
let value = op(infcx, fulfill_cx, key)?;
|
||||
let value = operation(infcx, fulfill_cx, key)?;
|
||||
infcx.make_canonicalized_query_result(canonical_inference_vars, value, fulfill_cx)
|
||||
})
|
||||
}
|
||||
|
@ -27,7 +27,10 @@ impl<'tcx> Eq<'tcx> {
|
||||
impl<'gcx: 'tcx, 'tcx> super::QueryTypeOp<'gcx, 'tcx> for Eq<'tcx> {
|
||||
type QueryResult = ();
|
||||
|
||||
fn try_fast_path(_tcx: TyCtxt<'_, 'gcx, 'tcx>, key: &ParamEnvAnd<'tcx, Eq<'tcx>>) -> Option<Self::QueryResult> {
|
||||
fn try_fast_path(
|
||||
_tcx: TyCtxt<'_, 'gcx, 'tcx>,
|
||||
key: &ParamEnvAnd<'tcx, Eq<'tcx>>,
|
||||
) -> Option<Self::QueryResult> {
|
||||
if key.value.a == key.value.b {
|
||||
Some(())
|
||||
} else {
|
||||
|
@ -19,16 +19,17 @@ pub struct ProvePredicate<'tcx> {
|
||||
|
||||
impl<'tcx> ProvePredicate<'tcx> {
|
||||
pub fn new(predicate: Predicate<'tcx>) -> Self {
|
||||
ProvePredicate {
|
||||
predicate,
|
||||
}
|
||||
ProvePredicate { predicate }
|
||||
}
|
||||
}
|
||||
|
||||
impl<'gcx: 'tcx, 'tcx> super::QueryTypeOp<'gcx, 'tcx> for ProvePredicate<'tcx> {
|
||||
type QueryResult = ();
|
||||
|
||||
fn try_fast_path(_tcx: TyCtxt<'_, 'gcx, 'tcx>, _key: &ParamEnvAnd<'tcx, Self>) -> Option<Self::QueryResult> {
|
||||
fn try_fast_path(
|
||||
_tcx: TyCtxt<'_, 'gcx, 'tcx>,
|
||||
_key: &ParamEnvAnd<'tcx, Self>,
|
||||
) -> Option<Self::QueryResult> {
|
||||
None
|
||||
}
|
||||
|
||||
|
@ -15,7 +15,8 @@ use rustc::traits::query::type_op::normalize::Normalize;
|
||||
use rustc::traits::query::type_op::prove_predicate::ProvePredicate;
|
||||
use rustc::traits::query::type_op::subtype::Subtype;
|
||||
use rustc::traits::query::{Fallible, NoSolution};
|
||||
use rustc::traits::{FulfillmentContext, Normalized, Obligation, ObligationCause, TraitEngine, TraitEngineExt};
|
||||
use rustc::traits::{FulfillmentContext, Normalized, Obligation, ObligationCause, TraitEngine,
|
||||
TraitEngineExt};
|
||||
use rustc::ty::query::Providers;
|
||||
use rustc::ty::{FnSig, Lift, ParamEnvAnd, PolyFnSig, Predicate, Ty, TyCtxt, TypeFoldable};
|
||||
use rustc_data_structures::sync::Lrc;
|
||||
|
Loading…
Reference in New Issue
Block a user