-
Notifications
You must be signed in to change notification settings - Fork 12.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support for multiple region bounds in where clauses
- Loading branch information
Showing
9 changed files
with
76 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
src/test/compile-fail/region-multiple-lifetime-bounds-on-fns-where-clause.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
// Copyright 2014 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 a<'a, 'b, 'c>(x: &mut &'a int, y: &mut &'b int, z: &mut &'c int) where 'b: 'a + 'c { | ||
// Note: this is legal because of the `'b:'a` declaration. | ||
*x = *y; | ||
*z = *y; | ||
} | ||
|
||
fn b<'a, 'b, 'c>(x: &mut &'a int, y: &mut &'b int, z: &mut &'c int) { | ||
// Illegal now because there is no `'b:'a` declaration. | ||
*x = *y; //~ ERROR mismatched types | ||
*z = *y; //~ ERROR mismatched types | ||
} | ||
|
||
fn c<'a,'b, 'c>(x: &mut &'a int, y: &mut &'b int, z: &mut &'c int) { | ||
// Here we try to call `foo` but do not know that `'a` and `'b` are | ||
// related as required. | ||
a(x, y, z); //~ ERROR cannot infer | ||
} | ||
|
||
fn d() { | ||
// 'a and 'b are early bound in the function `a` because they appear | ||
// inconstraints: | ||
let _: fn(&mut &int, &mut &int, &mut &int) = a; //~ ERROR mismatched types | ||
} | ||
|
||
fn e() { | ||
// 'a and 'b are late bound in the function `b` because there are | ||
// no constraints: | ||
let _: fn(&mut &int, &mut &int, &mut &int) = b; | ||
} | ||
|
||
fn main() { } |
bdd61f8
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from nikomatsakis
at jroesch@bdd61f8
bdd61f8
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging jroesch/rust/generalized-where-clause-parser = bdd61f8 into auto
bdd61f8
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
status: {"merge_sha": "510307976d27823456111186cc6a308144372983"}
bdd61f8
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jroesch/rust/generalized-where-clause-parser = bdd61f8 merged ok, testing candidate = 51030797
bdd61f8
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
some tests failed:
failure: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/2766
exception: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/2771
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/2767
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/2758
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/2757
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/2761
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/2753
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/2753
exception: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/2419
exception: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/2416
exception: http://buildbot.rust-lang.org/builders/auto-win-64-opt/builds/1258
exception: http://buildbot.rust-lang.org/builders/auto-win-64-nopt-t/builds/1251