diff options
| author | Andrew Paseltiner <apaseltiner@gmail.com> | 2016-09-07 18:26:53 -0400 |
|---|---|---|
| committer | Andrew Paseltiner <apaseltiner@gmail.com> | 2016-09-07 18:26:53 -0400 |
| commit | d951d5dec44f71eed82daba0854f404cc4bfe2a5 (patch) | |
| tree | 5a44ef824d7ef93f889b94f8a61289e72be29395 /src | |
| parent | cf0cdc452b3335eec4d0d5ec27e922763d9835bc (diff) | |
| download | rust-d951d5dec44f71eed82daba0854f404cc4bfe2a5.tar.gz rust-d951d5dec44f71eed82daba0854f404cc4bfe2a5.zip | |
Handle `ReEmpty` for `impl Trait`
Closes #35668
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc_typeck/check/writeback.rs | 4 | ||||
| -rw-r--r-- | src/test/compile-fail/issue-35668.rs | 24 |
2 files changed, 26 insertions, 2 deletions
diff --git a/src/librustc_typeck/check/writeback.rs b/src/librustc_typeck/check/writeback.rs index 4be032c6f7f..0b70d904c26 100644 --- a/src/librustc_typeck/check/writeback.rs +++ b/src/librustc_typeck/check/writeback.rs @@ -319,7 +319,8 @@ impl<'cx, 'gcx, 'tcx> WritebackCx<'cx, 'gcx, 'tcx> { let outside_ty = gcx.fold_regions(&inside_ty, &mut false, |r, _| { match *r { // 'static is valid everywhere. - ty::ReStatic => gcx.mk_region(ty::ReStatic), + ty::ReStatic | + ty::ReEmpty => gcx.mk_region(*r), // Free regions that come from early-bound regions are valid. ty::ReFree(ty::FreeRegion { @@ -341,7 +342,6 @@ impl<'cx, 'gcx, 'tcx> WritebackCx<'cx, 'gcx, 'tcx> { } ty::ReVar(_) | - ty::ReEmpty | ty::ReErased => { let span = reason.span(self.tcx()); span_bug!(span, "invalid region in impl Trait: {:?}", r); diff --git a/src/test/compile-fail/issue-35668.rs b/src/test/compile-fail/issue-35668.rs new file mode 100644 index 00000000000..c9323db054c --- /dev/null +++ b/src/test/compile-fail/issue-35668.rs @@ -0,0 +1,24 @@ +// 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(conservative_impl_trait)] + +fn func<'a, T>(a: &'a [T]) -> impl Iterator<Item=&'a T> { + a.iter().map(|a| a*a) + //~^ ERROR binary operation `*` cannot be applied to type `&T` +} + +fn main() { + let a = (0..30).collect::<Vec<_>>(); + + for k in func(&a) { + println!("{}", k); + } +} |
