Skip to content

Commit d9327a6

Browse files
ericktgraydon
erickt
authored and
graydon
committed
Port the stdlib to the expr foo::<T> syntax.
1 parent 3520499 commit d9327a6

20 files changed

+147
-141
lines changed

‎src/lib/aio.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ fn new_client(client: client, evt: _chan<socket_event>) {
7878
log "waiting for bytes";
7979
let data: [u8] = reader.recv();
8080
log "got some bytes";
81-
log vec::len[u8](data);
82-
if (vec::len[u8](data) == 0u) {
81+
log vec::len::<u8>(data);
82+
if (vec::len::<u8>(data) == 0u) {
8383
log "got empty buffer, bailing";
8484
break;
8585
}
@@ -145,7 +145,7 @@ fn request_task(c: _chan<ctx>) {
145145
}
146146
write(socket,v,status) {
147147
rustrt::aio_writedata(socket,
148-
vec::to_ptr[u8](v), vec::len[u8](v),
148+
vec::to_ptr::<u8>(v), vec::len::<u8>(v),
149149
status);
150150
}
151151
close_server(server,status) {

‎src/lib/bitv.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ fn uint_bits() -> uint { ret 32u + (1u << 32u >> 27u); }
3232

3333
fn create(nbits: uint, init: bool) -> t {
3434
let elt = if init { !0u } else { 0u };
35-
let storage = vec::init_elt_mut[uint](elt, nbits / uint_bits() + 1u);
35+
let storage = vec::init_elt_mut::<uint>(elt, nbits / uint_bits() + 1u);
3636
ret @{storage: storage, nbits: nbits};
3737
}
3838

@@ -69,7 +69,7 @@ fn assign(v0: &t, v1: t) -> bool {
6969
}
7070

7171
fn clone(v: t) -> t {
72-
let storage = vec::init_elt_mut[uint](0u, v.nbits / uint_bits() + 1u);
72+
let storage = vec::init_elt_mut::<uint>(0u, v.nbits / uint_bits() + 1u);
7373
let len = vec::len(v.storage);
7474
for each i: uint in uint::range(0u, len) { storage.(i) = v.storage.(i); }
7575
ret @{storage: storage, nbits: v.nbits};
@@ -150,7 +150,7 @@ fn init_to_vec(v: t, i: uint) -> uint { ret if get(v, i) { 1u } else { 0u }; }
150150

151151
fn to_vec(v: &t) -> [uint] {
152152
let sub = bind init_to_vec(v, _);
153-
ret vec::init_fn[uint](sub, v.nbits);
153+
ret vec::init_fn::<uint>(sub, v.nbits);
154154
}
155155

156156
fn to_str(v: &t) -> str {
@@ -162,7 +162,7 @@ fn to_str(v: &t) -> str {
162162
}
163163

164164
fn eq_ivec(v0: &t, v1: &[uint]) -> bool {
165-
assert (v0.nbits == vec::len[uint](v1));
165+
assert (v0.nbits == vec::len::<uint>(v1));
166166
let len = v0.nbits;
167167
let i = 0u;
168168
while i < len {

‎src/lib/comm.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ obj _port<~T>(raw_port : @port_ptr) {
6060
}
6161

6262
fn mk_port<~T>() -> _port<T> {
63-
_port(@port_ptr(rustrt::new_port(sys::size_of[T]())))
63+
_port(@port_ptr(rustrt::new_port(sys::size_of::<T>())))
6464
}
6565

6666
fn send<~T>(ch : _chan<T>, data : -T) {

‎src/lib/dbg.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ native "rust" mod rustrt {
2222
fn debug_trap(msg: str);
2323
}
2424

25-
fn debug_tydesc[T]() { rustrt::debug_tydesc[T](); }
25+
fn debug_tydesc<T>() { rustrt::debug_tydesc::<T>(); }
2626

27-
fn debug_opaque<T>(x: &T) { rustrt::debug_opaque[T](x); }
27+
fn debug_opaque<T>(x: &T) { rustrt::debug_opaque::<T>(x); }
2828

29-
fn debug_box<T>(x: @T) { rustrt::debug_box[T](x); }
29+
fn debug_box<T>(x: @T) { rustrt::debug_box::<T>(x); }
3030

31-
fn debug_tag<T>(x: &T) { rustrt::debug_tag[T](x); }
31+
fn debug_tag<T>(x: &T) { rustrt::debug_tag::<T>(x); }
3232

3333

3434
/**
@@ -41,12 +41,12 @@ fn debug_tag<T>(x: &T) { rustrt::debug_tag[T](x); }
4141
* the front of any obj's data tuple.x
4242
*/
4343
fn debug_obj<T>(x: &T, nmethods: uint, nbytes: uint) {
44-
rustrt::debug_obj[T](x, nmethods, nbytes);
44+
rustrt::debug_obj::<T>(x, nmethods, nbytes);
4545
}
4646

47-
fn debug_fn<T>(x: &T) { rustrt::debug_fn[T](x); }
47+
fn debug_fn<T>(x: &T) { rustrt::debug_fn::<T>(x); }
4848

49-
fn ptr_cast<T, U>(x: @T) -> @U { ret rustrt::debug_ptrcast[T, U](x); }
49+
fn ptr_cast<T, U>(x: @T) -> @U { ret rustrt::debug_ptrcast::<T, U>(x); }
5050

5151
fn trap(s: str) { rustrt::debug_trap(s); }
5252
// Local Variables:

‎src/lib/deque.rs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -53,24 +53,24 @@ fn create<@T>() -> t<T> {
5353
fn add_front(t: &T) {
5454
let oldlo: uint = lo;
5555
if lo == 0u {
56-
lo = vec::len[cell<T>](elts) - 1u;
56+
lo = vec::len::<cell<T>>(elts) - 1u;
5757
} else { lo -= 1u; }
5858
if lo == hi {
59-
elts = grow[T](nelts, oldlo, elts);
60-
lo = vec::len[cell<T>](elts) - 1u;
59+
elts = grow::<T>(nelts, oldlo, elts);
60+
lo = vec::len::<cell<T>>(elts) - 1u;
6161
hi = nelts;
6262
}
63-
elts.(lo) = option::some[T](t);
63+
elts.(lo) = option::some::<T>(t);
6464
nelts += 1u;
6565
}
6666
fn add_back(t: &T) {
6767
if lo == hi && nelts != 0u {
68-
elts = grow[T](nelts, lo, elts);
68+
elts = grow::<T>(nelts, lo, elts);
6969
lo = 0u;
7070
hi = nelts;
7171
}
72-
elts.(hi) = option::some[T](t);
73-
hi = (hi + 1u) % vec::len[cell<T>](elts);
72+
elts.(hi) = option::some::<T>(t);
73+
hi = (hi + 1u) % vec::len::<cell<T>>(elts);
7474
nelts += 1u;
7575
}
7676

@@ -79,31 +79,31 @@ fn create<@T>() -> t<T> {
7979
* that we don't keep anyone's refcount up unexpectedly.
8080
*/
8181
fn pop_front() -> T {
82-
let t: T = get[T](elts, lo);
83-
elts.(lo) = option::none[T];
84-
lo = (lo + 1u) % vec::len[cell<T>](elts);
82+
let t: T = get::<T>(elts, lo);
83+
elts.(lo) = option::none::<T>;
84+
lo = (lo + 1u) % vec::len::<cell<T>>(elts);
8585
nelts -= 1u;
8686
ret t;
8787
}
8888
fn pop_back() -> T {
8989
if hi == 0u {
90-
hi = vec::len[cell<T>](elts) - 1u;
90+
hi = vec::len::<cell<T>>(elts) - 1u;
9191
} else { hi -= 1u; }
92-
let t: T = get[T](elts, hi);
93-
elts.(hi) = option::none[T];
92+
let t: T = get::<T>(elts, hi);
93+
elts.(hi) = option::none::<T>;
9494
nelts -= 1u;
9595
ret t;
9696
}
97-
fn peek_front() -> T { ret get[T](elts, lo); }
98-
fn peek_back() -> T { ret get[T](elts, hi - 1u); }
97+
fn peek_front() -> T { ret get::<T>(elts, lo); }
98+
fn peek_back() -> T { ret get::<T>(elts, hi - 1u); }
9999
fn get(i: int) -> T {
100-
let idx: uint = (lo + (i as uint)) % vec::len[cell<T>](elts);
101-
ret get[T](elts, idx);
100+
let idx: uint = (lo + (i as uint)) % vec::len::<cell<T>>(elts);
101+
ret get::<T>(elts, idx);
102102
}
103103
}
104104
let v: [mutable cell<T>] =
105105
vec::init_elt_mut(option::none, initial_capacity);
106-
ret deque[T](0u, 0u, 0u, v);
106+
ret deque::<T>(0u, 0u, 0u, v);
107107
}
108108
// Local Variables:
109109
// mode: rust;

‎src/lib/ebml.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ fn vint_at(data: &[u8], start: uint) -> {val: uint, next: uint} {
4040
}
4141

4242
fn new_doc(data: &@[u8]) -> doc {
43-
ret {data: data, start: 0u, end: vec::len[u8](*data)};
43+
ret {data: data, start: 0u, end: vec::len::<u8>(*data)};
4444
}
4545

4646
fn doc_at(data: &@[u8], start: uint) -> doc {
@@ -57,10 +57,10 @@ fn maybe_get_doc(d: doc, tg: uint) -> option::t<doc> {
5757
let elt_size = vint_at(*d.data, elt_tag.next);
5858
pos = elt_size.next + elt_size.val;
5959
if elt_tag.val == tg {
60-
ret some[doc]({data: d.data, start: elt_size.next, end: pos});
60+
ret some::<doc>({data: d.data, start: elt_size.next, end: pos});
6161
}
6262
}
63-
ret none[doc];
63+
ret none::<doc>;
6464
}
6565

6666
fn get_doc(d: doc, tg: uint) -> doc {
@@ -96,7 +96,7 @@ iter tagged_docs(d: doc, tg: uint) -> doc {
9696
}
9797
}
9898

99-
fn doc_data(d: doc) -> [u8] { ret vec::slice[u8](*d.data, d.start, d.end); }
99+
fn doc_data(d: doc) -> [u8] { ret vec::slice::<u8>(*d.data, d.start, d.end); }
100100

101101
fn be_uint_from_bytes(data: &@[u8], start: uint, size: uint) -> uint {
102102
let sz = size;
@@ -167,7 +167,7 @@ fn start_tag(w: &writer, tag_id: uint) {
167167
}
168168

169169
fn end_tag(w: &writer) {
170-
let last_size_pos = vec::pop[uint](w.size_positions);
170+
let last_size_pos = vec::pop::<uint>(w.size_positions);
171171
let cur_pos = w.writer.tell();
172172
w.writer.seek(last_size_pos as int, io::seek_set);
173173
write_sized_vint(w.writer, cur_pos - last_size_pos - 4u, 4u);

‎src/lib/extfmt.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ mod rt {
372372

373373
// FIXME: This might be useful in str: but needs to be utf8 safe first
374374
fn str_init_elt(c: char, n_elts: uint) -> str {
375-
let svec = vec::init_elt[u8](c as u8, n_elts);
375+
let svec = vec::init_elt::<u8>(c as u8, n_elts);
376376

377377
ret str::unsafe_from_bytes(svec);
378378
}

‎src/lib/generic_os.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import str::sbuf;
66
fn getenv(n: str) -> option::t<str> {
77
let s = os::libc::getenv(str::buf(n));
88
ret if s as int == 0 {
9-
option::none[str]
10-
} else { option::some[str](str::str_from_cstr(s)) };
9+
option::none::<str>
10+
} else { option::some::<str>(str::str_from_cstr(s)) };
1111
}
1212

1313
#[cfg(target_os = "linux")]

‎src/lib/getopts.rs

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ fn name_str(nm: name) -> str {
7777

7878
fn find_opt(opts: &[opt], nm: name) -> option::t<uint> {
7979
let i = 0u;
80-
let l = vec::len[opt](opts);
81-
while i < l { if opts.(i).name == nm { ret some[uint](i); } i += 1u; }
82-
ret none[uint];
80+
let l = vec::len::<opt>(opts);
81+
while i < l { if opts.(i).name == nm { ret some::<uint>(i); } i += 1u; }
82+
ret none::<uint>;
8383
}
8484

8585
tag fail_ {
@@ -107,11 +107,11 @@ fn fail_str(f: fail_) -> str {
107107
tag result { success(match); failure(fail_); }
108108

109109
fn getopts(args: &[str], opts: &[opt]) -> result {
110-
let n_opts = vec::len[opt](opts);
110+
let n_opts = vec::len::<opt>(opts);
111111
fn f(x: uint) -> [optval] { ret ~[]; }
112-
let vals = vec::init_fn_mut[[optval]](f, n_opts);
112+
let vals = vec::init_fn_mut::<[optval]>(f, n_opts);
113113
let free: [str] = ~[];
114-
let l = vec::len[str](args);
114+
let l = vec::len::<str>(args);
115115
let i = 0u;
116116
while i < l {
117117
let cur = args.(i);
@@ -124,7 +124,7 @@ fn getopts(args: &[str], opts: &[opt]) -> result {
124124
break;
125125
} else {
126126
let names;
127-
let i_arg = option::none[str];
127+
let i_arg = option::none::<str>;
128128
if cur.(1) == '-' as u8 {
129129
let tail = str::slice(cur, 2u, curlen);
130130
let eq = str::index(tail, '=' as u8);
@@ -133,8 +133,9 @@ fn getopts(args: &[str], opts: &[opt]) -> result {
133133
} else {
134134
names = ~[long(str::slice(tail, 0u, eq as uint))];
135135
i_arg =
136-
option::some[str](str::slice(tail, (eq as uint) + 1u,
137-
curlen - 2u));
136+
option::some::<str>(str::slice(tail,
137+
(eq as uint) + 1u,
138+
curlen - 2u));
138139
}
139140
} else {
140141
let j = 1u;
@@ -155,22 +156,22 @@ fn getopts(args: &[str], opts: &[opt]) -> result {
155156
}
156157
alt opts.(optid).hasarg {
157158
no. {
158-
if !option::is_none[str](i_arg) {
159+
if !option::is_none::<str>(i_arg) {
159160
ret failure(unexpected_argument(name_str(nm)));
160161
}
161162
vals.(optid) += ~[given];
162163
}
163164
maybe. {
164-
if !option::is_none[str](i_arg) {
165+
if !option::is_none::<str>(i_arg) {
165166
vals.(optid) += ~[val(option::get(i_arg))];
166-
} else if (name_pos < vec::len[name](names) ||
167+
} else if (name_pos < vec::len::<name>(names) ||
167168
i + 1u == l || is_arg(args.(i + 1u))) {
168169
vals.(optid) += ~[given];
169170
} else { i += 1u; vals.(optid) += ~[val(args.(i))]; }
170171
}
171172
yes. {
172-
if !option::is_none[str](i_arg) {
173-
vals.(optid) += ~[val(option::get[str](i_arg))];
173+
if !option::is_none::<str>(i_arg) {
174+
vals.(optid) += ~[val(option::get::<str>(i_arg))];
174175
} else if (i + 1u == l) {
175176
ret failure(argument_missing(name_str(nm)));
176177
} else { i += 1u; vals.(optid) += ~[val(args.(i))]; }
@@ -182,7 +183,7 @@ fn getopts(args: &[str], opts: &[opt]) -> result {
182183
}
183184
i = 0u;
184185
while i < n_opts {
185-
let n = vec::len[optval](vals.(i));
186+
let n = vec::len::<optval>(vals.(i));
186187
let occ = opts.(i).occur;
187188
if occ == req {
188189
if n == 0u {
@@ -209,7 +210,7 @@ fn opt_vals(m: &match, nm: str) -> [optval] {
209210
fn opt_val(m: &match, nm: str) -> optval { ret opt_vals(m, nm).(0); }
210211

211212
fn opt_present(m: &match, nm: str) -> bool {
212-
ret vec::len[optval](opt_vals(m, nm)) > 0u;
213+
ret vec::len::<optval>(opt_vals(m, nm)) > 0u;
213214
}
214215

215216
fn opt_str(m: &match, nm: str) -> str {
@@ -226,8 +227,8 @@ fn opt_strs(m: &match, nm: str) -> [str] {
226227

227228
fn opt_maybe_str(m: &match, nm: str) -> option::t<str> {
228229
let vals = opt_vals(m, nm);
229-
if vec::len[optval](vals) == 0u { ret none[str]; }
230-
ret alt vals.(0) { val(s) { some[str](s) } _ { none[str] } };
230+
if vec::len::<optval>(vals) == 0u { ret none::<str>; }
231+
ret alt vals.(0) { val(s) { some::<str>(s) } _ { none::<str> } };
231232
}
232233

233234

@@ -236,8 +237,8 @@ fn opt_maybe_str(m: &match, nm: str) -> option::t<str> {
236237
/// present and an argument was provided.
237238
fn opt_default(m: &match, nm: str, def: str) -> option::t<str> {
238239
let vals = opt_vals(m, nm);
239-
if vec::len[optval](vals) == 0u { ret none[str]; }
240-
ret alt vals.(0) { val(s) { some[str](s) } _ { some[str](def) } }
240+
if vec::len::<optval>(vals) == 0u { ret none::<str>; }
241+
ret alt vals.(0) { val(s) { some::<str>(s) } _ { some::<str>(def) } }
241242
}
242243
// Local Variables:
243244
// mode: rust;

0 commit comments

Comments
 (0)