Port the stdlib to the expr foo::<T> syntax.
This commit is contained in:
parent
3520499544
commit
d9327a61bb
20 changed files with 147 additions and 141 deletions
|
|
@ -15,30 +15,30 @@ fn mk<@T>() -> smallintmap<T> {
|
|||
}
|
||||
|
||||
fn insert<@T>(m: &smallintmap<T>, key: uint, val: &T) {
|
||||
vec::grow_set[option::t<T>](m.v, key, none[T], some[T](val));
|
||||
vec::grow_set::<option::t<T>>(m.v, key, none::<T>, some::<T>(val));
|
||||
}
|
||||
|
||||
fn find<@T>(m: &smallintmap<T>, key: uint) -> option::t<T> {
|
||||
if key < vec::len[option::t<T>](m.v) { ret m.v.(key); }
|
||||
ret none[T];
|
||||
if key < vec::len::<option::t<T>>(m.v) { ret m.v.(key); }
|
||||
ret none::<T>;
|
||||
}
|
||||
|
||||
fn get<@T>(m: &smallintmap<T>, key: uint) -> T {
|
||||
alt find[T](m, key) {
|
||||
none[T]. { log_err "smallintmap::get(): key not present"; fail; }
|
||||
some[T](v) { ret v; }
|
||||
alt find::<T>(m, key) {
|
||||
none::<T>. { log_err "smallintmap::get(): key not present"; fail; }
|
||||
some::<T>(v) { ret v; }
|
||||
}
|
||||
}
|
||||
|
||||
fn contains_key<@T>(m: &smallintmap<T>, key: uint) -> bool {
|
||||
ret !option::is_none(find[T](m, key));
|
||||
ret !option::is_none(find::<T>(m, key));
|
||||
}
|
||||
|
||||
fn truncate<@T>(m: &smallintmap<T>, len: uint) {
|
||||
m.v = vec::slice_mut[option::t<T>](m.v, 0u, len);
|
||||
m.v = vec::slice_mut::<option::t<T>>(m.v, 0u, len);
|
||||
}
|
||||
|
||||
fn max_key<T>(m: &smallintmap<T>) -> uint {
|
||||
ret vec::len[option::t<T>](m.v);
|
||||
ret vec::len::<option::t<T>>(m.v);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue