---

yaml
---
r: 139220
b: refs/heads/try2
c: 66770d2
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 6d81307a9b9f29e262164f9e358f50c186c76d76
+refs/heads/try2: 66770d20b3f7288145b29c70359128c0dddcb992
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/test/compile-fail/regions-infer-contravariance-due-to-immutability.rs

@@ -20,7 +20,7 @@ fn to_shorter_lifetime(bi: contravariant<'r>) {
     let bj: contravariant<'blk> = bi;
 }
 
-fn to_longer_lifetime(bi: contravariant<'r>) -> contravariant/&static {
+fn to_longer_lifetime(bi: contravariant<'r>) -> contravariant<'static> {
     bi //~ ERROR mismatched types
 }
 

branches/try2/src/test/compile-fail/regions-infer-contravariance-due-to-ret.rs

@@ -13,19 +13,19 @@
 // You can upcast to a *smaller region* but not a larger one.  This is
 // the normal case.
 
-struct contravariant {
+struct contravariant<'self> {
     f: @fn() -> &'self int
 }
 
-fn to_same_lifetime(bi: contravariant/&r) {
-    let bj: contravariant/&r = bi;
+fn to_same_lifetime<'r>(bi: contravariant<'r>) {
+    let bj: contravariant<'r> = bi;
 }
 
-fn to_shorter_lifetime(bi: contravariant/&r) {
-    let bj: contravariant/&blk = bi;
+fn to_shorter_lifetime<'r>(bi: contravariant<'r>) {
+    let bj: contravariant<'blk> = bi;
 }
 
-fn to_longer_lifetime(bi: contravariant/&r) -> contravariant/&static {
+fn to_longer_lifetime<'r>(bi: contravariant<'r>) -> contravariant<'static> {
     bi //~ ERROR mismatched types
 }
 

branches/try2/src/test/compile-fail/regions-infer-covariance-due-to-arg.rs

@@ -16,15 +16,15 @@ struct covariant {
     f: @fn(x: &'self int) -> int
 }
 
-fn to_same_lifetime(bi: covariant/&r) {
-    let bj: covariant/&r = bi;
+fn to_same_lifetime<'r>(bi: covariant<'r>) {
+    let bj: covariant<'r> = bi;
 }
 
-fn to_shorter_lifetime(bi: covariant/&r) {
-    let bj: covariant/&blk = bi; //~ ERROR mismatched types
+fn to_shorter_lifetime<'r>(bi: covariant<'r>) {
+    let bj: covariant<'blk> = bi; //~ ERROR mismatched types
 }
 
-fn to_longer_lifetime(bi: covariant/&r) -> covariant/&static {
+fn to_longer_lifetime<'r>(bi: covariant<'r>) -> covariant<'static> {
     bi
 }
 

branches/try2/src/test/compile-fail/regions-infer-invariance-due-to-arg-and-ret.rs

@@ -12,19 +12,19 @@
 //
 // You cannot convert between regions.
 
-struct invariant {
+struct invariant<'self> {
     f: &'self fn(x: &'self int) -> &'self int
 }
 
-fn to_same_lifetime(bi: invariant<'r>) {
+fn to_same_lifetime<'r>(bi: invariant<'r>) {
     let bj: invariant<'r> = bi;
 }
 
-fn to_shorter_lifetime(bi: invariant<'r>) {
+fn to_shorter_lifetime<'r>(bi: invariant<'r>) {
     let bj: invariant<'blk> = bi; //~ ERROR mismatched types
 }
 
-fn to_longer_lifetime(bi: invariant<'r>) -> invariant/&static {
+fn to_longer_lifetime<'r>(bi: invariant<'r>) -> invariant<'static> {
     bi //~ ERROR mismatched types
 }
 

branches/try2/src/test/compile-fail/regions-infer-invariance-due-to-mutability-3.rs

@@ -8,19 +8,19 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-struct invariant {
+struct invariant<'self> {
     f: @fn(x: @mut &'self int)
 }
 
-fn to_same_lifetime(bi: invariant/&r) {
-    let bj: invariant/&r = bi;
+fn to_same_lifetime<'r>(bi: invariant<'r>) {
+    let bj: invariant<'r> = bi;
 }
 
-fn to_shorter_lifetime(bi: invariant/&r) {
-    let bj: invariant/&blk = bi; //~ ERROR mismatched types
+fn to_shorter_lifetime(bi: invariant<'r>) {
+    let bj: invariant<'blk> = bi; //~ ERROR mismatched types
 }
 
-fn to_longer_lifetime(bi: invariant/&r) -> invariant/&static {
+fn to_longer_lifetime(bi: invariant<'r>) -> invariant<'static> {
     bi //~ ERROR mismatched types
 }
 

branches/try2/src/test/compile-fail/regions-infer-invariance-due-to-mutability-4.rs

@@ -8,19 +8,19 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-struct invariant {
+struct invariant<'self> {
     f: @fn() -> @mut &'self int
 }
 
-fn to_same_lifetime(bi: invariant/&r) {
-    let bj: invariant/&r = bi;
+fn to_same_lifetime(bi: invariant<'r>) {
+    let bj: invariant<'r> = bi;
 }
 
-fn to_shorter_lifetime(bi: invariant/&r) {
-    let bj: invariant/&blk = bi; //~ ERROR mismatched types
+fn to_shorter_lifetime(bi: invariant<'r>) {
+    let bj: invariant<'blk> = bi; //~ ERROR mismatched types
 }
 
-fn to_longer_lifetime(bi: invariant/&r) -> invariant/&static {
+fn to_longer_lifetime(bi: invariant<'r>) -> invariant<'static> {
     bi //~ ERROR mismatched types
 }
 

branches/try2/src/test/compile-fail/regions-infer-invariance-due-to-mutability.rs

@@ -8,19 +8,19 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-struct invariant {
+struct invariant<'self> {
     f: @mut &'self int
 }
 
-fn to_same_lifetime(bi: invariant<'r>) {
+fn to_same_lifetime<'r>(bi: invariant<'r>) {
     let bj: invariant<'r> = bi;
 }
 
-fn to_shorter_lifetime(bi: invariant<'r>) {
+fn to_shorter_lifetime<'r>(bi: invariant<'r>) {
     let bj: invariant<'blk> = bi; //~ ERROR mismatched types
 }
 
-fn to_longer_lifetime(bi: invariant<'r>) -> invariant/&static {
+fn to_longer_lifetime<'r>(bi: invariant<'r>) -> invariant<'static> {
     bi //~ ERROR mismatched types
 }
 

branches/try2/src/test/compile-fail/regions-trait-3.rs

@@ -11,11 +11,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-trait get_ctxt {
+trait get_ctxt<'self> {
     fn get_ctxt(self) -> &'self uint;
 }
 
-fn make_gc1(gc: @get_ctxt/&a) -> @get_ctxt/&b  {
+fn make_gc1(gc: @get_ctxt<'a>) -> @get_ctxt<'b>  {
     return gc; //~ ERROR mismatched types: expected `@get_ctxt/&b` but found `@get_ctxt/&a`
 }
 
@@ -27,7 +27,7 @@ impl get_ctxt for Foo<'self> {
     fn get_ctxt(&self) -> &'self uint { self.r }
 }
 
-fn make_gc2(foo: Foo/&a) -> @get_ctxt/&b  {
+fn make_gc2<'a,'b>(foo: Foo<'a>) -> @get_ctxt<'b>  {
     return @foo as @get_ctxt; //~ ERROR cannot infer an appropriate lifetime
 }
 

branches/try2/src/test/run-pass/const-fn-val.rs

@@ -14,7 +14,7 @@ fn foo() -> int {
 
 struct Bar { f: &'self fn() -> int }
 
-static b : Bar/&static = Bar { f: foo };
+static b : Bar<'static> = Bar { f: foo };
 
 pub fn main() {
     fail_unless!((b.f)() == 0xca7f000d);

branches/try2/src/test/run-pass/issue-2502.rs

@@ -12,13 +12,13 @@ struct font {
     fontbuf: &'self ~[u8],
 }
 
-pub impl font/&self {
+pub impl<'self> font<'self> {
     fn buf(&self) -> &'self ~[u8] {
         self.fontbuf
     }
 }
 
-fn font(fontbuf: &'r ~[u8]) -> font/&r {
+fn font(fontbuf: &'r ~[u8]) -> font<'r> {
     font {
         fontbuf: fontbuf
     }

branches/try2/src/test/run-pass/issue-2735-2.rs

@@ -14,15 +14,15 @@ struct defer {
 }
 
 #[unsafe_destructor]
-impl Drop for defer/&self {
+impl<'self> Drop for defer<'self> {
     fn finalize(&self) {
         unsafe {
             *(self.b) = true;
         }
     }
 }
 
-fn defer(b: &'r mut bool) -> defer/&r {
+fn defer<'r>(b: &'r mut bool) -> defer<'r> {
     defer {
         b: b
     }

branches/try2/src/test/run-pass/issue-2735-3.rs

@@ -14,15 +14,15 @@ struct defer {
 }
 
 #[unsafe_destructor]
-impl Drop for defer/&self {
+impl<'self> Drop for defer<'self> {
     fn finalize(&self) {
         unsafe {
             *(self.b) = true;
         }
     }
 }
 
-fn defer(b: &'r mut bool) -> defer/&r {
+fn defer(b: &'r mut bool) -> defer<'r> {
     defer {
         b: b
     }

branches/try2/src/test/run-pass/issue-2748-a.rs

@@ -12,7 +12,7 @@ struct CMap {
     buf: &'self [u8],
 }
 
-fn CMap(buf: &'r [u8]) -> CMap/&r {
+fn CMap<'r>(buf: &'r [u8]) -> CMap<'r> {
     CMap {
         buf: buf
     }

branches/try2/src/test/run-pass/regions-copy-closure.rs

@@ -12,7 +12,7 @@ struct closure_box {
     cl: &'self fn(),
 }
 
-fn box_it(+x: &'r fn()) -> closure_box/&r {
+fn box_it<'r>(+x: &'r fn()) -> closure_box<'r> {
     closure_box {cl: x}
 }
 

branches/try2/src/test/run-pass/regions-infer-contravariance.rs

@@ -20,7 +20,7 @@ fn with(bi: &'r boxed_int) {
     // Here, the upcast is allowed because the `boxed_int` type is
     // contravariant with respect to `&r`.  See also
     // compile-fail/regions-infer-invariance-due-to-mutability.rs
-    let bi: &'blk boxed_int/&blk = bi;
+    let bi: &'blk boxed_int<'blk> = bi;
     fail_unless!(*get(bi) == 22);
 }
 

branches/try2/src/test/run-pass/regions-mock-trans.rs

@@ -26,7 +26,7 @@ struct Ccx {
 fn alloc(_bcx : &'a arena) -> &'a Bcx<'a> {
     unsafe {
         return cast::reinterpret_cast(
-            &libc::malloc(sys::size_of::<Bcx/&blk>() as libc::size_t));
+            &libc::malloc(sys::size_of::<Bcx<'blk>>() as libc::size_t));
     }
 }
 

branches/try2/src/test/run-pass/regions-static-closure.rs

@@ -16,7 +16,7 @@ fn box_it(+x: &'r fn()) -> closure_box<'r> {
     closure_box {cl: x}
 }
 
-fn call_static_closure(cl: closure_box/&static) {
+fn call_static_closure(cl: closure_box<'static>) {
     (cl.cl)();
 }