Skip to content

Commit 771ed95

Browse files
committed
---
yaml --- r: 57294 b: refs/heads/try c: 99fa1dd h: refs/heads/master v: v3
1 parent 03e9a4b commit 771ed95

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: c081ffbd1e845687202a975ea2e698b623e5722f
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 79a2b2eafc3c766cecec8a5f76317693bae9ed17
5-
refs/heads/try: 27b08634cfd6a3987c1b6e90ee2bce80c133da29
5+
refs/heads/try: 99fa1dd501c45ae8703697c3cf34ce4187b3d28f
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/test/run-pass/regions-fn-subtyping-2.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,18 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-test
12-
1311
// Issue #2263.
1412

1513
// Here, `f` is a function that takes a pointer `x` and a function
1614
// `g`, where `g` requires its argument `y` to be in the same region
1715
// that `x` is in.
18-
fn has_same_region(f: &fn(x: &a.int, g: &fn(y: &a.int))) {
16+
fn has_same_region(f: &fn<'a>(x: &'a int, g: &fn(y: &'a int))) {
1917
// `f` should be the type that `wants_same_region` wants, but
2018
// right now the compiler complains that it isn't.
2119
wants_same_region(f);
2220
}
2321

24-
fn wants_same_region(_f: &fn(x: &b.int, g: &fn(y: &b.int))) {
22+
fn wants_same_region(_f: &fn<'b>(x: &'b int, g: &fn(y: &'b int))) {
2523
}
2624

2725
pub fn main() {

0 commit comments

Comments
 (0)