diff options
| author | bors <bors@rust-lang.org> | 2016-12-11 09:33:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-12-11 09:33:05 +0000 |
| commit | e0158e02f97957c3d8cbd9c52da5aadaf898d447 (patch) | |
| tree | f3f7f78b6c8d6b15fdbcaa6b5fddf819d9ccb7d9 | |
| parent | 368e092c26d40da2d4442bf7cf1b6e4df13a6f87 (diff) | |
| parent | 55180d04f22b6a01db6f8b212fdf4aaf3d0f7a6a (diff) | |
| download | rust-e0158e02f97957c3d8cbd9c52da5aadaf898d447.tar.gz rust-e0158e02f97957c3d8cbd9c52da5aadaf898d447.zip | |
Auto merge of #38249 - arielb1:special-substs, r=nikomatsakis
erase lifetimes when translating specialized substs Projections can generate lifetime variables with equality constraints, that will not be resolved by `resolve_type_vars_if_possible`, so substs need to be lifetime-erased after that. Fixes #36848.
| -rw-r--r-- | src/librustc/traits/specialize/mod.rs | 1 | ||||
| -rw-r--r-- | src/test/run-pass/specialization/specialization-translate-projections-with-lifetimes.rs | 41 |
2 files changed, 42 insertions, 0 deletions
diff --git a/src/librustc/traits/specialize/mod.rs b/src/librustc/traits/specialize/mod.rs index 870494363c8..59e3d398b2f 100644 --- a/src/librustc/traits/specialize/mod.rs +++ b/src/librustc/traits/specialize/mod.rs @@ -127,6 +127,7 @@ pub fn find_method<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, let substs = substs.rebase_onto(tcx, trait_def_id, impl_data.substs); let substs = translate_substs(&infcx, impl_data.impl_def_id, substs, node_item.node); + let substs = infcx.tcx.erase_regions(&substs); tcx.lift(&substs).unwrap_or_else(|| { bug!("find_method: translate_substs \ returned {:?} which contains inference types/regions", diff --git a/src/test/run-pass/specialization/specialization-translate-projections-with-lifetimes.rs b/src/test/run-pass/specialization/specialization-translate-projections-with-lifetimes.rs new file mode 100644 index 00000000000..9702f632413 --- /dev/null +++ b/src/test/run-pass/specialization/specialization-translate-projections-with-lifetimes.rs @@ -0,0 +1,41 @@ +// Copyright 2016 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or +// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license +// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#![feature(specialization)] + +trait Iterator { + fn next(&self); +} + +trait WithAssoc { + type Item; +} + +impl<'a> WithAssoc for &'a () { + type Item = &'a u32; +} + +struct Cloned<I>(I); + +impl<'a, I, T: 'a> Iterator for Cloned<I> + where I: WithAssoc<Item=&'a T>, T: Clone +{ + fn next(&self) {} +} + +impl<'a, I, T: 'a> Iterator for Cloned<I> + where I: WithAssoc<Item=&'a T>, T: Copy +{ + +} + +fn main() { + Cloned(&()).next(); +} |
