about summary refs log tree commit diff
path: root/src/lib/smallintmap.rs
diff options
context:
space:
mode:
authorErick Tryzelaar <erick.tryzelaar@gmail.com>2011-08-10 09:27:11 -0700
committerGraydon Hoare <graydon@mozilla.com>2011-08-16 15:05:56 -0700
commitf764f9a8cf52e686ba6e54b594e6bbbdd5bc7b32 (patch)
tree24a39688027a41a7a3e7e4a2239cfedf12fb20e9 /src/lib/smallintmap.rs
parent8043788e3a71a951892577cbcb623ac94b908677 (diff)
downloadrust-f764f9a8cf52e686ba6e54b594e6bbbdd5bc7b32.tar.gz
rust-f764f9a8cf52e686ba6e54b594e6bbbdd5bc7b32.zip
Port the stdlib to the typaram foo<T> syntax.
Diffstat (limited to 'src/lib/smallintmap.rs')
-rw-r--r--src/lib/smallintmap.rs26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/lib/smallintmap.rs b/src/lib/smallintmap.rs
index c3da9dfa366..682cc47d647 100644
--- a/src/lib/smallintmap.rs
+++ b/src/lib/smallintmap.rs
@@ -7,38 +7,38 @@ import option::some;
 
 // FIXME: Should not be @; there's a bug somewhere in rustc that requires this
 // to be.
-type smallintmap[T] = @{mutable v: [mutable option::t[T]]};
+type smallintmap[T] = @{mutable v: [mutable option::t<T>]};
 
-fn mk[@T]() -> smallintmap[T] {
-    let v: [mutable option::t[T]] = ~[mutable];
+fn mk[@T]() -> smallintmap<T> {
+    let v: [mutable option::t<T>] = ~[mutable];
     ret @{mutable v: v};
 }
 
-fn insert[@T](m: &smallintmap[T], key: uint, val: &T) {
-    vec::grow_set[option::t[T]](m.v, key, none[T], some[T](val));
+fn insert[@T](m: &smallintmap<T>, key: uint, val: &T) {
+    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); }
+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];
 }
 
-fn get[@T](m: &smallintmap[T], key: uint) -> 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; }
     }
 }
 
-fn contains_key[@T](m: &smallintmap[T], key: uint) -> bool {
+fn contains_key[@T](m: &smallintmap<T>, key: uint) -> bool {
     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);
+fn truncate[@T](m: &smallintmap<T>, len: uint) {
+    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);
+fn max_key[T](m: &smallintmap<T>) -> uint {
+    ret vec::len[option::t<T>](m.v);
 }