Skip to content

Commit

Permalink
Auto merge of rust-lang#36333 - apasel422:issue-35668, r=eddyb
Browse files Browse the repository at this point in the history
Handle `ReEmpty` for `impl Trait`

Closes rust-lang#35668

r? @eddyb
  • Loading branch information
bors authored Sep 10, 2016
2 parents f508ddc + d951d5d commit a5f4cc5
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/librustc_typeck/check/writeback.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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);
Expand Down
24 changes: 24 additions & 0 deletions src/test/compile-fail/issue-35668.rs
Original file line number Diff line number Diff line change
@@ -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);
}
}

0 comments on commit a5f4cc5

Please sign in to comment.