diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2020-05-07 10:12:19 +0000 |
|---|---|---|
| committer | Bastian Kauschke <bastian_kauschke@hotmail.de> | 2020-05-20 15:44:34 +0200 |
| commit | 034c25f33e496f602edebd845ddb4f940ac176cf (patch) | |
| tree | 5ac585d4924a97d3fccd56d6453b701622cdb947 /src/librustc_infer | |
| parent | cad8fe90fd61c410ac3e7e97a6be37c96ca66a72 (diff) | |
| download | rust-034c25f33e496f602edebd845ddb4f940ac176cf.tar.gz rust-034c25f33e496f602edebd845ddb4f940ac176cf.zip | |
make `to_predicate` take a `tcx` argument
Diffstat (limited to 'src/librustc_infer')
| -rw-r--r-- | src/librustc_infer/traits/engine.rs | 2 | ||||
| -rw-r--r-- | src/librustc_infer/traits/util.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc_infer/traits/engine.rs b/src/librustc_infer/traits/engine.rs index a95257ba682..2710debea94 100644 --- a/src/librustc_infer/traits/engine.rs +++ b/src/librustc_infer/traits/engine.rs @@ -33,7 +33,7 @@ pub trait TraitEngine<'tcx>: 'tcx { cause, recursion_depth: 0, param_env, - predicate: trait_ref.without_const().to_predicate(), + predicate: trait_ref.without_const().to_predicate(infcx.tcx), }, ); } diff --git a/src/librustc_infer/traits/util.rs b/src/librustc_infer/traits/util.rs index 400fe4d1321..b9cafc530cd 100644 --- a/src/librustc_infer/traits/util.rs +++ b/src/librustc_infer/traits/util.rs @@ -99,14 +99,14 @@ pub fn elaborate_trait_ref<'tcx>( tcx: TyCtxt<'tcx>, trait_ref: ty::PolyTraitRef<'tcx>, ) -> Elaborator<'tcx> { - elaborate_predicates(tcx, std::iter::once(trait_ref.without_const().to_predicate())) + elaborate_predicates(tcx, std::iter::once(trait_ref.without_const().to_predicate(tcx))) } pub fn elaborate_trait_refs<'tcx>( tcx: TyCtxt<'tcx>, trait_refs: impl Iterator<Item = ty::PolyTraitRef<'tcx>>, ) -> Elaborator<'tcx> { - let predicates = trait_refs.map(|trait_ref| trait_ref.without_const().to_predicate()); + let predicates = trait_refs.map(|trait_ref| trait_ref.without_const().to_predicate(tcx)); elaborate_predicates(tcx, predicates) } |
