diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2018-03-23 14:35:14 -0600 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2018-03-23 14:35:14 -0600 |
| commit | 555f718c4251e1e21024737e6e92e06b79b2e9ed (patch) | |
| tree | f57b3abd7cab1d56d6613255ef46913d35445ba5 | |
| parent | c6935e57f145697845c2aa744c2a576df8982000 (diff) | |
| download | rust-555f718c4251e1e21024737e6e92e06b79b2e9ed.tar.gz rust-555f718c4251e1e21024737e6e92e06b79b2e9ed.zip | |
Fix failures after rebase
| -rw-r--r-- | src/librustc/infer/canonical.rs | 2 | ||||
| -rw-r--r-- | src/librustc/ty/mod.rs | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/librustc/infer/canonical.rs b/src/librustc/infer/canonical.rs index 22526c7751d..8042f968c87 100644 --- a/src/librustc/infer/canonical.rs +++ b/src/librustc/infer/canonical.rs @@ -251,8 +251,6 @@ impl<'cx, 'gcx, 'tcx> InferCtxt<'cx, 'gcx, 'tcx> { let ty = match ty_kind { CanonicalTyVarKind::General => { self.next_ty_var( - // FIXME(#48696) this handling of universes is not right. - ty::UniverseIndex::ROOT, TypeVariableOrigin::MiscVariable(span), ) } diff --git a/src/librustc/ty/mod.rs b/src/librustc/ty/mod.rs index 0942fa2567b..806728877e1 100644 --- a/src/librustc/ty/mod.rs +++ b/src/librustc/ty/mod.rs @@ -1380,7 +1380,7 @@ impl<'tcx> ParamEnv<'tcx> { /// Trait`) are left hidden, so this is suitable for ordinary /// type-checking. pub fn empty() -> Self { - Self::new(ty::Slice::empty(), Reveal::UserFacing, ty::UniverseIndex::ROOT) + Self::new(ty::Slice::empty(), Reveal::UserFacing) } /// Construct a trait environment with no where clauses in scope @@ -1391,15 +1391,14 @@ impl<'tcx> ParamEnv<'tcx> { /// NB. If you want to have predicates in scope, use `ParamEnv::new`, /// or invoke `param_env.with_reveal_all()`. pub fn reveal_all() -> Self { - Self::new(ty::Slice::empty(), Reveal::All, ty::UniverseIndex::ROOT) + Self::new(ty::Slice::empty(), Reveal::All) } /// Construct a trait environment with the given set of predicates. pub fn new(caller_bounds: &'tcx ty::Slice<ty::Predicate<'tcx>>, - reveal: Reveal, - universe: ty::UniverseIndex) + reveal: Reveal) -> Self { - ty::ParamEnv { caller_bounds, reveal, universe } + ty::ParamEnv { caller_bounds, reveal } } /// Returns a new parameter environment with the same clauses, but |