diff options
| author | Shotaro Yamada <sinkuu@sinkuu.xyz> | 2018-04-06 23:17:25 +0900 |
|---|---|---|
| committer | Shotaro Yamada <sinkuu@sinkuu.xyz> | 2018-04-06 23:17:25 +0900 |
| commit | 20c499da0b9a2ea309ea94958e93dc55b3e225ae (patch) | |
| tree | 055f973fc1b4b5656b3329299d65146d628d577d | |
| parent | 48fa6f9631868b07309b02f479e2ec523bb58c2b (diff) | |
| download | rust-20c499da0b9a2ea309ea94958e93dc55b3e225ae.tar.gz rust-20c499da0b9a2ea309ea94958e93dc55b3e225ae.zip | |
Fix ICE with impl Trait
| -rw-r--r-- | src/librustc/infer/anon_types/mod.rs | 8 | ||||
| -rw-r--r-- | src/test/run-pass/issue-49556.rs | 22 |
2 files changed, 28 insertions, 2 deletions
diff --git a/src/librustc/infer/anon_types/mod.rs b/src/librustc/infer/anon_types/mod.rs index eb5df697216..725ea9734ab 100644 --- a/src/librustc/infer/anon_types/mod.rs +++ b/src/librustc/infer/anon_types/mod.rs @@ -533,10 +533,14 @@ impl<'cx, 'gcx, 'tcx> TypeFolder<'gcx, 'tcx> for ReverseMapper<'cx, 'gcx, 'tcx> match r { // ignore bound regions that appear in the type (e.g., this // would ignore `'r` in a type like `for<'r> fn(&'r u32)`. - ty::ReLateBound(..) => return r, + ty::ReLateBound(..) | // ignore `'static`, as that can appear anywhere - ty::ReStatic => return r, + ty::ReStatic | + + // ignore `ReScope`, as that can appear anywhere + // See `src/test/run-pass/issue-49556.rs` for example. + ty::ReScope(..) => return r, _ => { } } diff --git a/src/test/run-pass/issue-49556.rs b/src/test/run-pass/issue-49556.rs new file mode 100644 index 00000000000..70ccee99f66 --- /dev/null +++ b/src/test/run-pass/issue-49556.rs @@ -0,0 +1,22 @@ +// Copyright 2018 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. + +fn iter<'a>(data: &'a [usize]) -> impl Iterator<Item = usize> + 'a { + data.iter() + .map( + |x| x // fn(&'a usize) -> &'(ReScope) usize + ) + .map( + |x| *x // fn(&'(ReScope) usize) -> usize + ) +} + +fn main() { +} |
