Skip to content

Commit 3ef442d

Browse files
committed
---
yaml --- r: 232383 b: refs/heads/try c: fb1b6fc h: refs/heads/master i: 232381: aa127dc 232379: 4e2a7e4 232375: 6f20862 232367: 8666e65 232351: ea2e1f0 232319: 79c84dd v: v3
1 parent 7e1ba5a commit 3ef442d

File tree

3 files changed

+38
-2
lines changed

3 files changed

+38
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: edeb4f1c86cbf6af8ef9874d4b3af50f721ea1b8
33
refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
4-
refs/heads/try: c9a49f93ac8e9cdbaa22b33c9e3b9a9adffd360c
4+
refs/heads/try: fb1b6fca3638f0e3edf5a1aca8cb379d95cf2ab8
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
66
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
77
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/librustc_typeck/check/regionck.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1785,7 +1785,7 @@ fn recursive_type_bound<'a, 'tcx>(rcx: &Rcx<'a, 'tcx>,
17851785

17861786
let mut regions = ty.regions();
17871787
regions.retain(|r| !r.is_bound()); // ignore late-bound regions
1788-
bounds.push(VerifyBound::AllRegions(ty.regions()));
1788+
bounds.push(VerifyBound::AllRegions(regions));
17891789

17901790
// remove bounds that must hold, since they are not interesting
17911791
bounds.retain(|b| !b.must_hold());
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// Test for the outlives relation when applied to a projection on a
12+
// type with bound regions. In this case, we are checking that
13+
// `<for<'r> fn(&'r T) as TheTrait>::TheType: 'a` If we're not
14+
// careful, we could wind up with a constraint that `'r:'a`, but since
15+
// `'r` is bound, that leads to badness. This test checks that
16+
// everything works.
17+
18+
#![feature(rustc_attrs)]
19+
#![allow(dead_code)]
20+
21+
trait TheTrait {
22+
type TheType;
23+
}
24+
25+
fn wf<T>() { }
26+
27+
type FnType<T> = for<'r> fn(&'r T);
28+
29+
fn foo<'a,'b,T>()
30+
where FnType<T>: TheTrait
31+
{
32+
wf::< <FnType<T> as TheTrait>::TheType >();
33+
}
34+
35+
#[rustc_error]
36+
fn main() { } //~ ERROR compilation successful

0 commit comments

Comments
 (0)