test: Add lifetime binders and new-style lifetime parameters to the test suite

pcwalton · pcwalton · commit 66770d20b3f7 · 2013-03-22T22:24:36.000-07:00
diff --git a/src/test/compile-fail/regions-infer-contravariance-due-to-immutability.rs b/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
 }
 
diff --git a/src/test/compile-fail/regions-infer-contravariance-due-to-ret.rs b/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
 }
 
diff --git a/src/test/compile-fail/regions-infer-covariance-due-to-arg.rs b/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
 }
 
diff --git a/src/test/compile-fail/regions-infer-invariance-due-to-arg-and-ret.rs b/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
 }
 
diff --git a/src/test/compile-fail/regions-infer-invariance-due-to-mutability-3.rs b/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
 }
 
diff --git a/src/test/compile-fail/regions-infer-invariance-due-to-mutability-4.rs b/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
 }
 
diff --git a/src/test/compile-fail/regions-infer-invariance-due-to-mutability.rs b/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
 }
 
diff --git a/src/test/compile-fail/regions-trait-3.rs b/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
 }
 
diff --git a/src/test/run-pass/const-fn-val.rs b/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);
diff --git a/src/test/run-pass/issue-2502.rs b/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
     }
diff --git a/src/test/run-pass/issue-2735-2.rs b/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
     }
diff --git a/src/test/run-pass/issue-2735-3.rs b/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
     }
diff --git a/src/test/run-pass/issue-2748-a.rs b/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
     }
diff --git a/src/test/run-pass/regions-copy-closure.rs b/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}
 }
 
diff --git a/src/test/run-pass/regions-infer-contravariance.rs b/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);
 }
 
diff --git a/src/test/run-pass/regions-mock-trans.rs b/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));
     }
 }
 
diff --git a/src/test/run-pass/regions-static-closure.rs b/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)();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ fn to_shorter_lifetime(bi: contravariant<'r>) {`
`20`	`20`	`let bj: contravariant<'blk> = bi;`
`21`	`21`	`}`
`22`	`22`
`23`		`-fn to_longer_lifetime(bi: contravariant<'r>) -> contravariant/&static {`
	`23`	`+fn to_longer_lifetime(bi: contravariant<'r>) -> contravariant<'static> {`
`24`	`24`	`bi //~ ERROR mismatched types`
`25`	`25`	`}`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -13,19 +13,19 @@`
`13`	`13`	`// You can upcast to a smaller region but not a larger one. This is`
`14`	`14`	`// the normal case.`
`15`	`15`
`16`		`-struct contravariant {`
	`16`	`+struct contravariant<'self> {`
`17`	`17`	`f: @fn() -> &'self int`
`18`	`18`	`}`
`19`	`19`
`20`		`-fn to_same_lifetime(bi: contravariant/&r) {`
`21`		`- let bj: contravariant/&r = bi;`
	`20`	`+fn to_same_lifetime<'r>(bi: contravariant<'r>) {`
	`21`	`+ let bj: contravariant<'r> = bi;`
`22`	`22`	`}`
`23`	`23`
`24`		`-fn to_shorter_lifetime(bi: contravariant/&r) {`
`25`		`- let bj: contravariant/&blk = bi;`
	`24`	`+fn to_shorter_lifetime<'r>(bi: contravariant<'r>) {`
	`25`	`+ let bj: contravariant<'blk> = bi;`
`26`	`26`	`}`
`27`	`27`
`28`		`-fn to_longer_lifetime(bi: contravariant/&r) -> contravariant/&static {`
	`28`	`+fn to_longer_lifetime<'r>(bi: contravariant<'r>) -> contravariant<'static> {`
`29`	`29`	`bi //~ ERROR mismatched types`
`30`	`30`	`}`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -16,15 +16,15 @@ struct covariant {`
`16`	`16`	`f: @fn(x: &'self int) -> int`
`17`	`17`	`}`
`18`	`18`
`19`		`-fn to_same_lifetime(bi: covariant/&r) {`
`20`		`- let bj: covariant/&r = bi;`
	`19`	`+fn to_same_lifetime<'r>(bi: covariant<'r>) {`
	`20`	`+ let bj: covariant<'r> = bi;`
`21`	`21`	`}`
`22`	`22`
`23`		`-fn to_shorter_lifetime(bi: covariant/&r) {`
`24`		`- let bj: covariant/&blk = bi; //~ ERROR mismatched types`
	`23`	`+fn to_shorter_lifetime<'r>(bi: covariant<'r>) {`
	`24`	`+ let bj: covariant<'blk> = bi; //~ ERROR mismatched types`
`25`	`25`	`}`
`26`	`26`
`27`		`-fn to_longer_lifetime(bi: covariant/&r) -> covariant/&static {`
	`27`	`+fn to_longer_lifetime<'r>(bi: covariant<'r>) -> covariant<'static> {`
`28`	`28`	`bi`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -12,19 +12,19 @@`
`12`	`12`	`//`
`13`	`13`	`// You cannot convert between regions.`
`14`	`14`
`15`		`-struct invariant {`
	`15`	`+struct invariant<'self> {`
`16`	`16`	`f: &'self fn(x: &'self int) -> &'self int`
`17`	`17`	`}`
`18`	`18`
`19`		`-fn to_same_lifetime(bi: invariant<'r>) {`
	`19`	`+fn to_same_lifetime<'r>(bi: invariant<'r>) {`
`20`	`20`	`let bj: invariant<'r> = bi;`
`21`	`21`	`}`
`22`	`22`
`23`		`-fn to_shorter_lifetime(bi: invariant<'r>) {`
	`23`	`+fn to_shorter_lifetime<'r>(bi: invariant<'r>) {`
`24`	`24`	`let bj: invariant<'blk> = bi; //~ ERROR mismatched types`
`25`	`25`	`}`
`26`	`26`
`27`		`-fn to_longer_lifetime(bi: invariant<'r>) -> invariant/&static {`
	`27`	`+fn to_longer_lifetime<'r>(bi: invariant<'r>) -> invariant<'static> {`
`28`	`28`	`bi //~ ERROR mismatched types`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -8,19 +8,19 @@`
`8`	`8`	`// option. This file may not be copied, modified, or distributed`
`9`	`9`	`// except according to those terms.`
`10`	`10`
`11`		`-struct invariant {`
	`11`	`+struct invariant<'self> {`
`12`	`12`	`f: @fn(x: @mut &'self int)`
`13`	`13`	`}`
`14`	`14`
`15`		`-fn to_same_lifetime(bi: invariant/&r) {`
`16`		`- let bj: invariant/&r = bi;`
	`15`	`+fn to_same_lifetime<'r>(bi: invariant<'r>) {`
	`16`	`+ let bj: invariant<'r> = bi;`
`17`	`17`	`}`
`18`	`18`
`19`		`-fn to_shorter_lifetime(bi: invariant/&r) {`
`20`		`- let bj: invariant/&blk = bi; //~ ERROR mismatched types`
	`19`	`+fn to_shorter_lifetime(bi: invariant<'r>) {`
	`20`	`+ let bj: invariant<'blk> = bi; //~ ERROR mismatched types`
`21`	`21`	`}`
`22`	`22`
`23`		`-fn to_longer_lifetime(bi: invariant/&r) -> invariant/&static {`
	`23`	`+fn to_longer_lifetime(bi: invariant<'r>) -> invariant<'static> {`
`24`	`24`	`bi //~ ERROR mismatched types`
`25`	`25`	`}`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,11 @@`
`11`	`11`	`// option. This file may not be copied, modified, or distributed`
`12`	`12`	`// except according to those terms.`
`13`	`13`
`14`		`-trait get_ctxt {`
	`14`	`+trait get_ctxt<'self> {`
`15`	`15`	`fn get_ctxt(self) -> &'self uint;`
`16`	`16`	`}`
`17`	`17`
`18`		`-fn make_gc1(gc: @get_ctxt/&a) -> @get_ctxt/&b {`
	`18`	`+fn make_gc1(gc: @get_ctxt<'a>) -> @get_ctxt<'b> {`
`19`	`19`	return gc; //~ ERROR mismatched types: expected `@get_ctxt/&b` but found `@get_ctxt/&a`
`20`	`20`	`}`
`21`	`21`
`@@ -27,7 +27,7 @@ impl get_ctxt for Foo<'self> {`
`27`	`27`	`fn get_ctxt(&self) -> &'self uint { self.r }`
`28`	`28`	`}`
`29`	`29`
`30`		`-fn make_gc2(foo: Foo/&a) -> @get_ctxt/&b {`
	`30`	`+fn make_gc2<'a,'b>(foo: Foo<'a>) -> @get_ctxt<'b> {`
`31`	`31`	`return @foo as @get_ctxt; //~ ERROR cannot infer an appropriate lifetime`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,13 @@ struct font {`
`12`	`12`	`fontbuf: &'self ~[u8],`
`13`	`13`	`}`
`14`	`14`
`15`		`-pub impl font/&self {`
	`15`	`+pub impl<'self> font<'self> {`
`16`	`16`	`fn buf(&self) -> &'self ~[u8] {`
`17`	`17`	`self.fontbuf`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`
`21`		`-fn font(fontbuf: &'r ~[u8]) -> font/&r {`
	`21`	`+fn font(fontbuf: &'r ~[u8]) -> font<'r> {`
`22`	`22`	`font {`
`23`	`23`	`fontbuf: fontbuf`
`24`	`24`	`}`