Skip to content

Commit 3520499

Browse files
ericktgraydon
authored andcommitted
Port the tests to the decl foo<T> syntax.
1 parent 4abc471 commit 3520499

File tree

86 files changed

+161
-161
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+161
-161
lines changed

src/fuzzer/ast_match.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std;
22
import std::vec;
33

4-
fn ivec_equal[T](v: &[T], u: &[T], element_equality_test: fn(&T, &T) -> bool )
4+
fn ivec_equal<T>(v: &[T], u: &[T], element_equality_test: fn(&T, &T) -> bool )
55
-> bool {
66
let Lv = vec::len(v);
77
if Lv != vec::len(u) { ret false; }
@@ -13,7 +13,7 @@ fn ivec_equal[T](v: &[T], u: &[T], element_equality_test: fn(&T, &T) -> bool )
1313
ret true;
1414
}
1515

16-
fn builtin_equal[T](a: &T, b: &T) -> bool { ret a == b; }
16+
fn builtin_equal<T>(a: &T, b: &T) -> bool { ret a == b; }
1717

1818
fn main() {
1919
assert (builtin_equal(5, 5));

src/fuzzer/ivec_fuzz.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Idea: provide functions for 'exhaustive' and 'random' modification of vecs.
77
two functions, "return the number of possible edits" and "return edit #n"
88
99
It would be nice if this could be data-driven, so the two functions could share information:
10-
type vec_modifier = rec(fn (&[T] v, uint i) -> [T] fun, uint lo, uint di);
10+
type vec_modifier = rec(fn (&<T> v, uint i) -> [T] fun, uint lo, uint di);
1111
const [vec_modifier] vec_modifiers = ~[rec(fun=vec_omit, 0u, 1u), ...];
1212
But that gives me "error: internal compiler error unimplemented consts that's not a plain literal".
1313
https://github.com/graydon/rust/issues/570
@@ -26,24 +26,24 @@ import std::ivec::slice;
2626
import std::ivec::len;
2727
import std::int;
2828

29-
//fn vec_reverse(&[T] v) -> [T] { ... }
29+
//fn vec_reverse(&<T> v) -> [T] { ... }
3030

31-
fn vec_omit[T](v: &[T], i: uint) -> [T] {
31+
fn vec_omit<T>(v: &[T], i: uint) -> [T] {
3232
slice(v, 0u, i) + slice(v, i + 1u, len(v))
3333
}
34-
fn vec_dup[T](v: &[T], i: uint) -> [T] {
34+
fn vec_dup<T>(v: &[T], i: uint) -> [T] {
3535
slice(v, 0u, i) + ~[v.(i)] + slice(v, i, len(v))
3636
}
37-
fn vec_swadj[T](v: &[T], i: uint) -> [T] {
37+
fn vec_swadj<T>(v: &[T], i: uint) -> [T] {
3838
slice(v, 0u, i) + ~[v.(i + 1u), v.(i)] + slice(v, i + 2u, len(v))
3939
}
40-
fn vec_prefix[T](v: &[T], i: uint) -> [T] { slice(v, 0u, i) }
41-
fn vec_suffix[T](v: &[T], i: uint) -> [T] { slice(v, i, len(v)) }
40+
fn vec_prefix<T>(v: &[T], i: uint) -> [T] { slice(v, 0u, i) }
41+
fn vec_suffix<T>(v: &[T], i: uint) -> [T] { slice(v, i, len(v)) }
4242

43-
fn vec_poke[T](v: &[T], i: uint, x: &T) -> [T] {
43+
fn vec_poke<T>(v: &[T], i: uint, x: &T) -> [T] {
4444
slice(v, 0u, i) + ~[x] + slice(v, i + 1u, len(v))
4545
}
46-
fn vec_insert[T](v: &[T], i: uint, x: &T) -> [T] {
46+
fn vec_insert<T>(v: &[T], i: uint, x: &T) -> [T] {
4747
slice(v, 0u, i) + ~[x] + slice(v, i, len(v))
4848
}
4949

@@ -54,7 +54,7 @@ iter ix(skip_low: uint, skip_high: uint, length: uint) -> uint {
5454
}
5555

5656
// Returns a bunch of modified versions of v, some of which introduce new elements (borrowed from xs).
57-
fn vec_edits[T](v: &[T], xs: &[T]) -> [[T]] {
57+
fn vec_edits<T>(v: &[T], xs: &[T]) -> [[T]] {
5858
let edits: [[T]] = ~[];
5959
let Lv: uint = len(v);
6060

src/test/compile-fail/bad-type-env-capture.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// xfail-stage2
33
// xfail-stage3
44
// error-pattern: attempted dynamic environment-capture
5-
fn foo[T]() {
5+
fn foo<T>() {
66
obj bar(b: T) { }
77
}
8-
fn main() { }
8+
fn main() { }

src/test/compile-fail/item-name-overload.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// error-pattern: Dynamically sized arguments must be passed by alias
33

44
mod foo {
5-
fn bar[T](f: T) -> int { ret 17; }
6-
type bar[U, T] = {a: int, b: U, c: T};
5+
fn bar<T>(f: T) -> int { ret 17; }
6+
type bar<U, T> = {a: int, b: U, c: T};
77
}
88

9-
fn main() { }
9+
fn main() { }

src/test/compile-fail/nested-ty-params.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// error-pattern:Attempt to use a type argument out of scope
2-
fn hd[U](v: &[U]) -> U {
2+
fn hd<U>(v: &[U]) -> U {
33
fn hd1(w: &[U]) -> U { ret w.(0); }
44

55
ret hd1(v);
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
// error-pattern:mismatched types
22
// From Issue #778
3-
tag clam[T] { a(T); }
3+
tag clam<T> { a(T); }
44
fn main() { let c; c = a(c); alt c { a[int](_) { } } }
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// error-pattern: Wrong number of type arguments
22

3-
tag quux[T] { }
3+
tag quux<T> { }
44

55
fn foo(c: quux) { assert (false); }
66

7-
fn main() { fail; }
7+
fn main() { fail; }
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// error-pattern:Attempt to use a type argument out of scope
2-
fn foo[T](x: &T) {
2+
fn foo<T>(x: &T) {
33
fn bar(f: fn(&T) -> T ) { }
44
}
5-
fn main() { foo(1); }
5+
fn main() { foo(1); }

src/test/compiletest/procsrv.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ fn worker(p: _port<request>) {
167167
}
168168
}
169169

170-
fn with_lib_path[T](path: &str, f: fn() -> T ) -> T {
170+
fn with_lib_path<T>(path: &str, f: fn() -> T ) -> T {
171171
let maybe_oldpath = getenv(util::lib_path_env_var());
172172
append_lib_path(path);
173173
let res = f();

src/test/run-fail/bug-811.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ fn test00_start(ch: chan_t<int>, message: int) {
66
type task_id = int;
77
type port_id = int;
88

9-
type chan_t[~T] = {
9+
type chan_t<~T> = {
1010
task : task_id,
1111
port : port_id
1212
};
1313

14-
fn send[~T](ch : chan_t<T>, data : -T) { fail; }
14+
fn send<~T>(ch : chan_t<T>, data : -T) { fail; }
1515

1616
fn main() { fail "quux"; }

0 commit comments

Comments
 (0)