diff options
| author | bors <bors@rust-lang.org> | 2018-03-29 05:44:40 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-03-29 05:44:40 +0000 |
| commit | dca14701a5fa9cfcf91e438f1bef0eddb3c22f93 (patch) | |
| tree | d01447bd27475d64309623075c166f1d543e972e /src/librustc/traits/specialize | |
| parent | 361509320c882ee76f0d1359f842dec4637e6b08 (diff) | |
| parent | dd60beae47374344d4b0c5f8515c064f829f6b7a (diff) | |
| download | rust-dca14701a5fa9cfcf91e438f1bef0eddb3c22f93.tar.gz rust-dca14701a5fa9cfcf91e438f1bef0eddb3c22f93.zip | |
Auto merge of #49313 - sgrif:sg-revert-stuff, r=nikomatsakis
Remove universes from `ty::ParamEnv` This change was never meant to land. #48407 takes an alternate approach. However, that PR is now blocked on some issues with canonicalization, and rebasing these reverts gets harder each time, so let's just get this bit out of the way now. r? @nikomatsakis
Diffstat (limited to 'src/librustc/traits/specialize')
| -rw-r--r-- | src/librustc/traits/specialize/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc/traits/specialize/mod.rs b/src/librustc/traits/specialize/mod.rs index a9d1c8bcc3d..30b2c55afa1 100644 --- a/src/librustc/traits/specialize/mod.rs +++ b/src/librustc/traits/specialize/mod.rs @@ -221,7 +221,7 @@ fn fulfill_implication<'a, 'gcx, 'tcx>(infcx: &InferCtxt<'a, 'gcx, 'tcx>, target_impl: DefId) -> Result<&'tcx Substs<'tcx>, ()> { let selcx = &mut SelectionContext::new(&infcx); - let target_substs = infcx.fresh_substs_for_item(param_env.universe, DUMMY_SP, target_impl); + let target_substs = infcx.fresh_substs_for_item(DUMMY_SP, target_impl); let (target_trait_ref, mut obligations) = impl_trait_ref_and_oblig(selcx, param_env, target_impl, |