Skip to content

Commit 7dd9c15

Browse files
brsonbrson
committed
---
yaml --- r: 2841 b: refs/heads/master c: ed0eb8f h: refs/heads/master i: 2839: e4b0f0f v: v3
1 parent aa85987 commit 7dd9c15

File tree

10 files changed

+56
-56
lines changed

10 files changed

+56
-56
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: c1d97a41ebd823b90b6d7e741733152d7b931680
2+
refs/heads/master: ed0eb8f45ab979f866208a0c06179bd2f73a2ec1

‎trunk/src/lib/deque.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ fn create[T]() -> t[T] {
4848

4949
fn get[T](vec[cell[T]] elts, uint i) -> T {
5050
ret alt (elts.(i)) {
51-
case (option::some[T](?t)) { t }
51+
case (option::some(?t)) { t }
5252
case (_) { fail }
5353
};
5454
}

‎trunk/src/lib/ebml.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ fn maybe_get_doc(doc d, uint tg) -> option::t[doc] {
6363

6464
fn get_doc(doc d, uint tg) -> doc {
6565
alt (maybe_get_doc(d, tg)) {
66-
case (some[doc](?d)) {ret d;}
67-
case (none[doc]) {
66+
case (some(?d)) {ret d;}
67+
case (none) {
6868
log_err "failed to find block with tag " + uint::to_str(tg, 10u);
6969
fail;
7070
}

‎trunk/src/lib/extfmt.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,10 @@ mod ct {
130130

131131
auto n = (c - ('0' as u8)) as uint;
132132
ret alt (peek_num(s, i + 1u, lim)) {
133-
case (none[tup(uint, uint)]) {
133+
case (none) {
134134
some[tup(uint, uint)](tup(n, i + 1u))
135135
}
136-
case (some[tup(uint, uint)](?next)) {
136+
case (some(?next)) {
137137
auto m = next._0;
138138
auto j = next._1;
139139
some[tup(uint, uint)](tup(n * 10u + m, j))
@@ -162,10 +162,10 @@ mod ct {
162162

163163
auto num = peek_num(s, i, lim);
164164
ret alt (num) {
165-
case (none[tup(uint, uint)]) {
165+
case (none) {
166166
tup(none[int], i)
167167
}
168-
case (some[tup(uint, uint)](?t)) {
168+
case (some(?t)) {
169169
auto n = t._0;
170170
auto j = t._1;
171171
if (j < lim && s.(j) == '$' as u8) {
@@ -218,20 +218,20 @@ mod ct {
218218
auto param = parse_parameter(s, i + 1u, lim);
219219
auto j = param._1;
220220
alt (param._0) {
221-
case (none[int]) {
221+
case (none) {
222222
tup(count_is_next_param, j)
223223
}
224-
case (some[int](?n)) {
224+
case (some(?n)) {
225225
tup(count_is_param(n), j)
226226
}
227227
}
228228
} else {
229229
auto num = peek_num(s, i, lim);
230230
alt (num) {
231-
case (none[tup(uint, uint)]) {
231+
case (none) {
232232
tup(count_implied, i)
233233
}
234-
case (some[tup(uint, uint)](?num)) {
234+
case (some(?num)) {
235235
tup(count_is(num._0 as int), num._1)
236236
}
237237
}

‎trunk/src/lib/getopts.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,8 @@ fn getopts(vec[str] args, vec[opt] opts) -> result {
175175
name_pos += 1u;
176176
auto optid;
177177
alt (find_opt(opts, nm)) {
178-
case (some[uint](?id)) {optid = id;}
179-
case (none[uint]) {
178+
case (some(?id)) {optid = id;}
179+
case (none) {
180180
ret failure(unrecognized_option(name_str(nm)));
181181
}
182182
}
@@ -234,8 +234,8 @@ fn getopts(vec[str] args, vec[opt] opts) -> result {
234234

235235
fn opt_vals(match m, str nm) -> vec[optval] {
236236
ret alt (find_opt(m.opts, mkname(nm))) {
237-
case (some[uint](?id)) { m.vals.(id) }
238-
case (none[uint]) {
237+
case (some(?id)) { m.vals.(id) }
238+
case (none) {
239239
log_err "No option '" + nm + "' defined.";
240240
fail
241241
}

‎trunk/src/lib/list.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ fn from_vec[T](vec[T] v) -> list[T] {
2323

2424
fn foldl[T,U](&list[T] ls, &U u, fn(&T t, &U u) -> U f) -> U {
2525
alt(ls) {
26-
case (cons[T](?hd, ?tl)) {
26+
case (cons(?hd, ?tl)) {
2727
auto u_ = f(hd, u);
2828
be foldl[T,U](*tl, u_, f);
2929
}
30-
case (nil[T]) {
30+
case (nil) {
3131
ret u;
3232
}
3333
}
@@ -36,32 +36,32 @@ fn foldl[T,U](&list[T] ls, &U u, fn(&T t, &U u) -> U f) -> U {
3636
fn find[T,U](&list[T] ls,
3737
(fn(&T) -> option::t[U]) f) -> option::t[U] {
3838
alt(ls) {
39-
case (cons[T](?hd, ?tl)) {
39+
case (cons(?hd, ?tl)) {
4040
alt (f(hd)) {
41-
case (none[U]) {
41+
case (none) {
4242
be find[T,U](*tl, f);
4343
}
44-
case (some[U](?res)) {
44+
case (some(?res)) {
4545
ret some[U](res);
4646
}
4747
}
4848
}
49-
case (nil[T]) {
49+
case (nil) {
5050
ret none[U];
5151
}
5252
}
5353
}
5454

5555
fn has[T](&list[T] ls, &T elt) -> bool {
5656
alt(ls) {
57-
case (cons[T](?hd, ?tl)) {
57+
case (cons(?hd, ?tl)) {
5858
if (elt == hd) {
5959
ret true;
6060
} else {
6161
be has(*tl, elt);
6262
}
6363
}
64-
case (nil[T]) { ret false; }
64+
case (nil) { ret false; }
6565
}
6666
}
6767

@@ -74,22 +74,22 @@ fn length[T](&list[T] ls) -> uint {
7474

7575
fn cdr[T](&list[T] ls) -> list[T] {
7676
alt (ls) {
77-
case (cons[T](_, ?tl)) {ret *tl;}
77+
case (cons(_, ?tl)) {ret *tl;}
7878
}
7979
}
8080
fn car[T](&list[T] ls) -> T {
8181
alt (ls) {
82-
case (cons[T](?hd, _)) {ret hd;}
82+
case (cons(?hd, _)) {ret hd;}
8383
}
8484
}
8585

8686

8787
fn append[T](&list[T] l, &list[T] m) -> list[T] {
8888
alt (l) {
89-
case (nil[T]) {
89+
case (nil) {
9090
ret m;
9191
}
92-
case (cons[T](?x, ?xs)) {
92+
case (cons(?x, ?xs)) {
9393
let list[T] rest = append[T](*xs, m);
9494
ret cons[T](x, @rest);
9595
}

‎trunk/src/lib/map.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ fn mk_hashmap[K, V](&hashfn[K] hasher, &eqfn[K] eqer) -> hashmap[K, V] {
7575
while (i < nbkts) {
7676
let uint j = hash(h, nbkts, i);
7777
alt (bkts.(j)) {
78-
case (some[K, V](?k, _)) {
78+
case (some(?k, _)) {
7979
if (eqer(key, k)) {
8080
bkts.(j) = some[K, V](k, val);
8181
ret false;
@@ -103,12 +103,12 @@ fn mk_hashmap[K, V](&hashfn[K] hasher, &eqfn[K] eqer) -> hashmap[K, V] {
103103
while (i < nbkts) {
104104
let uint j = (hash(h, nbkts, i));
105105
alt (bkts.(j)) {
106-
case (some[K, V](?k, ?v)) {
106+
case (some(?k, ?v)) {
107107
if (eqer(key, k)) {
108108
ret option::some[V](v);
109109
}
110110
}
111-
case (nil[K, V]) {
111+
case (nil) {
112112
ret option::none[V];
113113
}
114114
case (deleted[K, V]) { }
@@ -126,7 +126,7 @@ fn mk_hashmap[K, V](&hashfn[K] hasher, &eqfn[K] eqer) -> hashmap[K, V] {
126126
{
127127
for (bucket[K, V] b in oldbkts) {
128128
alt (b) {
129-
case (some[K, V](?k, ?v)) {
129+
case (some(?k, ?v)) {
130130
insert_common[K, V](hasher, eqer, newbkts,
131131
nnewbkts, k, v);
132132
}
@@ -167,14 +167,14 @@ fn mk_hashmap[K, V](&hashfn[K] hasher, &eqfn[K] eqer) -> hashmap[K, V] {
167167

168168
fn contains_key(&K key) -> bool {
169169
ret alt (find_common[K, V](hasher, eqer, bkts, nbkts, key)) {
170-
case (option::some[V](_)) { true }
170+
case (option::some(_)) { true }
171171
case (_) { false }
172172
};
173173
}
174174

175175
fn get(&K key) -> V {
176176
ret alt (find_common[K, V](hasher, eqer, bkts, nbkts, key)) {
177-
case (option::some[V](?val)) { val }
177+
case (option::some(?val)) { val }
178178
case (_) { fail }
179179
};
180180
}
@@ -189,15 +189,15 @@ fn mk_hashmap[K, V](&hashfn[K] hasher, &eqfn[K] eqer) -> hashmap[K, V] {
189189
while (i < nbkts) {
190190
let uint j = (hash(h, nbkts, i));
191191
alt (bkts.(j)) {
192-
case (some[K, V](?k, ?v)) {
192+
case (some(?k, ?v)) {
193193
if (eqer(key, k)) {
194194
bkts.(j) = deleted[K, V];
195195
nelts -= 1u;
196196
ret option::some[V](v);
197197
}
198198
}
199-
case (deleted[K, V]) { }
200-
case (nil[K, V]) {
199+
case (deleted) { }
200+
case (nil) {
201201
ret option::none[V];
202202
}
203203
}
@@ -216,7 +216,7 @@ fn mk_hashmap[K, V](&hashfn[K] hasher, &eqfn[K] eqer) -> hashmap[K, V] {
216216
iter items() -> @tup(K,V) {
217217
for (bucket[K,V] b in bkts) {
218218
alt (b) {
219-
case(some[K,V](?k,?v)) {
219+
case(some(?k,?v)) {
220220
put @tup(k,v);
221221
}
222222
case (_) { }

‎trunk/src/lib/option.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,30 +9,30 @@ type operator[T, U] = fn(&T) -> U;
99

1010
fn get[T](&t[T] opt) -> T {
1111
ret alt (opt) {
12-
case (some[T](?x)) {
12+
case (some(?x)) {
1313
x
1414
}
15-
case (none[T]) {
15+
case (none) {
1616
fail
1717
}
1818
};
1919
}
2020

2121
fn map[T, U](&operator[T, U] f, &t[T] opt) -> t[U] {
2222
ret alt (opt) {
23-
case (some[T](?x)) {
23+
case (some(?x)) {
2424
some[U](f(x))
2525
}
26-
case (none[T]) {
26+
case (none) {
2727
none[U]
2828
}
2929
};
3030
}
3131

3232
fn is_none[T](&t[T] opt) -> bool {
3333
ret alt (opt) {
34-
case (none[T]) { true }
35-
case (some[T](_)) { false }
34+
case (none) { true }
35+
case (some(_)) { false }
3636
};
3737
}
3838

@@ -43,16 +43,16 @@ fn from_maybe[T](&T def, &t[T] opt) -> T {
4343

4444
fn maybe[T, U](&U def, fn(&T) -> U f, &t[T] opt) -> U {
4545
ret alt (opt) {
46-
case (none[T]) { def }
47-
case (some[T](?t)) { f(t) }
46+
case (none) { def }
47+
case (some(?t)) { f(t) }
4848
};
4949
}
5050

5151
// Can be defined in terms of the above when/if we have const bind.
5252
fn may[T](fn(&T) f, &t[T] opt) {
5353
alt (opt) {
54-
case (none[T]) { /* nothing */ }
55-
case (some[T](?t)) { f(t); }
54+
case (none) { /* nothing */ }
55+
case (some(?t)) { f(t); }
5656
}
5757
}
5858

‎trunk/src/lib/ufind.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ fn make_set(&ufind ufnd) -> uint {
2222

2323
fn find(&ufind ufnd, uint n) -> uint {
2424
alt (ufnd.nodes.(n)) {
25-
case (none[uint]) { ret n; }
26-
case (some[uint](?m)) { be find(ufnd, m); }
25+
case (none) { ret n; }
26+
case (some(?m)) { be find(ufnd, m); }
2727
}
2828
}
2929

‎trunk/src/lib/vec.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,8 @@ fn filter_map[T, U](&fn(&T) -> option::t[U] f, &array[T] v) -> vec[U] {
233233
let vec[U] res = []; //TODO does this work these days?
234234
for(T ve in v) {
235235
alt(f(ve)) {
236-
case (some[U](?elt)) { res += [elt]; }
237-
case (none[U]) {}
236+
case (some(?elt)) { res += [elt]; }
237+
case (none) {}
238238
}
239239
}
240240
ret res;
@@ -305,8 +305,8 @@ fn clone[T](&vec[T] v) -> vec[T] {
305305

306306
fn plus_option[T](&vec[T] v, &option::t[T] o) -> () {
307307
alt (o) {
308-
case (none[T]) {}
309-
case (some[T](?x)) { v += [x]; }
308+
case (none) {}
309+
case (some(?x)) { v += [x]; }
310310
}
311311
}
312312

@@ -315,8 +315,8 @@ fn cat_options[T](&vec[option::t[T]] v) -> vec[T] {
315315

316316
for (option::t[T] o in v) {
317317
alt (o) {
318-
case (none[T]) { }
319-
case (some[T](?t)) {
318+
case (none) { }
319+
case (some(?t)) {
320320
res += [t];
321321
}
322322
}

0 commit comments

Comments
 (0)