---

yaml
---
r: 4736
b: refs/heads/master
c: e4a0f99
h: refs/heads/master
v: v3

Author: erickt

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f764f9a8cf52e686ba6e54b594e6bbbdd5bc7b32
+refs/heads/master: e4a0f997fb01b9cbb650532fea1278159faff064

trunk/src/comp/README

@@ -33,7 +33,7 @@ The 3 central data structures:
     structure:
 
       - Many -- though not all -- nodes within this data structure are
-        wrapped in the type spanned[T], meaning that the front-end has
+        wrapped in the type spanned<T>, meaning that the front-end has
         marked the input coordinates of that node. The member .node is
         the data itself, the member .span is the input location (file,
         line, column; both low and high).

trunk/src/comp/back/link.rs

@@ -285,14 +285,14 @@ fn build_link_meta(sess: &session::session, c: &ast::crate, output: &str,
                    sha: sha1) -> link_meta {
 
     type provided_metas =
-        {name: option::t[str],
-         vers: option::t[str],
+        {name: option::t<str>,
+         vers: option::t<str>,
          cmh_items: [@ast::meta_item]};
 
     fn provided_link_metas(sess: &session::session, c: &ast::crate) ->
        provided_metas {
-        let name: option::t[str] = none;
-        let vers: option::t[str] = none;
+        let name: option::t<str> = none;
+        let vers: option::t<str> = none;
         let cmh_items: [@ast::meta_item] = ~[];
         let linkage_metas = attr::find_linkage_metas(c.node.attrs);
         attr::require_unique_names(sess, linkage_metas);

trunk/src/comp/driver/rustc.rs

@@ -437,7 +437,7 @@ fn opts() -> [getopts::opt] {
           optflag("lib"), optflag("static"), optflag("gc")];
 }
 
-fn main(args: vec[str]) {
+fn main(args: vec<str>) {
     let args_ivec = vec::from_vec(args);
     let binary = vec::shift(args_ivec);
     let binary_dir = fs::dirname(binary);

trunk/src/comp/driver/session.rs

@@ -54,7 +54,7 @@ obj session(targ_cfg: @config,
             parse_sess: parse_sess,
 
             // For a library crate, this is always none
-            mutable main_fn: option::t[node_id],
+            mutable main_fn: option::t<node_id>,
             mutable err_count: uint) {
     fn get_targ_cfg() -> @config { ret targ_cfg; }
     fn get_opts() -> @options { ret opts; }
@@ -111,7 +111,7 @@ obj session(targ_cfg: @config,
         ret codemap::span_to_str(sp, self.get_codemap());
     }
     fn set_main_id(d: node_id) { main_fn = some(d); }
-    fn get_main_id() -> option::t[node_id] { main_fn }
+    fn get_main_id() -> option::t<node_id> { main_fn }
 }
 // Local Variables:
 // fill-column: 78;

trunk/src/comp/front/attr.rs

@@ -45,7 +45,7 @@ fn find_attrs_by_name(attrs: &[ast::attribute], name: ast::ident) ->
    [ast::attribute] {
     let filter =
         bind fn (a: &ast::attribute, name: ast::ident) ->
-                option::t[ast::attribute] {
+                option::t<ast::attribute> {
                  if get_attr_name(a) == name {
                      option::some(a)
                  } else { option::none }
@@ -61,7 +61,7 @@ fn find_meta_items_by_name(metas: &[@ast::meta_item], name: ast::ident) ->
    [@ast::meta_item] {
     let filter =
         bind fn (m: &@ast::meta_item, name: ast::ident) ->
-                option::t[@ast::meta_item] {
+                option::t<@ast::meta_item> {
                  if get_meta_item_name(m) == name {
                      option::some(m)
                  } else { option::none }
@@ -79,7 +79,7 @@ fn get_meta_item_name(meta: &@ast::meta_item) -> ast::ident {
 
 // Gets the string value if the meta_item is a meta_name_value variant
 // containing a string, otherwise none
-fn get_meta_item_value_str(meta: &@ast::meta_item) -> option::t[str] {
+fn get_meta_item_value_str(meta: &@ast::meta_item) -> option::t<str> {
     alt meta.node {
       ast::meta_name_value(_, v) {
         alt v.node {
@@ -167,7 +167,7 @@ fn remove_meta_items_by_name(items: &[@ast::meta_item], name: str) ->
 
     let filter =
         bind fn (item: &@ast::meta_item, name: str) ->
-                option::t[@ast::meta_item] {
+                option::t<@ast::meta_item> {
                  if get_meta_item_name(item) != name {
                      option::some(item)
                  } else { option::none }
@@ -189,7 +189,7 @@ fn require_unique_names(sess: &session::session,
     }
 }
 
-fn span[T](item: &T) -> ast::spanned[T] {
+fn span[T](item: &T) -> ast::spanned<T> {
     ret {node: item, span: ast::mk_sp(0u, 0u)};
 }
 

trunk/src/comp/front/config.rs

@@ -25,7 +25,7 @@ fn strip_unconfigured_items(crate: @ast::crate) -> @ast::crate {
 }
 
 fn filter_item(cfg: &ast::crate_cfg, item: &@ast::item) ->
-   option::t[@ast::item] {
+   option::t<@ast::item> {
     if item_in_cfg(cfg, item) { option::some(item) } else { option::none }
 }
 
@@ -38,7 +38,7 @@ fn fold_mod(cfg: &ast::crate_cfg, m: &ast::_mod, fld: fold::ast_fold) ->
 }
 
 fn filter_native_item(cfg: &ast::crate_cfg, item: &@ast::native_item) ->
-   option::t[@ast::native_item] {
+   option::t<@ast::native_item> {
     if native_item_in_cfg(cfg, item) {
         option::some(item)
     } else { option::none }
@@ -55,7 +55,7 @@ fn fold_native_mod(cfg: &ast::crate_cfg, nm: &ast::native_mod,
 }
 
 fn filter_stmt(cfg: &ast::crate_cfg, stmt: &@ast::stmt) ->
-   option::t[@ast::stmt] {
+   option::t<@ast::stmt> {
     alt stmt.node {
       ast::stmt_decl(decl, _) {
         alt decl.node {

trunk/src/comp/front/test.rs

@@ -57,7 +57,7 @@ fn fold_mod(cx: &test_ctxt, m: &ast::_mod, fld: fold::ast_fold) -> ast::_mod {
     // the one we're going to add.  FIXME: This is sloppy. Instead we should
     // have some mechanism to indicate to the translation pass which function
     // we want to be main.
-    fn nomain(item: &@ast::item) -> option::t[@ast::item] {
+    fn nomain(item: &@ast::item) -> option::t<@ast::item> {
         alt item.node {
           ast::item_fn(f, _) {
             if item.ident == "main" {
@@ -167,7 +167,7 @@ fn mk_test_module(cx: &test_ctxt) -> @ast::item {
     ret @item;
 }
 
-fn nospan[T](t: &T) -> ast::spanned[T] {
+fn nospan[T](t: &T) -> ast::spanned<T> {
     ret {node: t, span: ast::dummy_sp()};
 }
 

trunk/src/comp/lib/llvm.rs

@@ -1420,8 +1420,8 @@ fn new_builder(llbb: BasicBlockRef) -> builder {
 
 /* Memory-managed object interface to type handles. */
 
-obj type_names(type_names: std::map::hashmap[TypeRef, str],
-               named_types: std::map::hashmap[str, TypeRef]) {
+obj type_names(type_names: std::map::hashmap<TypeRef, str>,
+               named_types: std::map::hashmap<str, TypeRef>) {
 
     fn associate(s: str, t: TypeRef) {
         assert (!named_types.contains_key(s));
@@ -1446,8 +1446,8 @@ fn mk_type_names() -> type_names {
 
     fn eq(a: &TypeRef, b: &TypeRef) -> bool { ret a as uint == b as uint; }
 
-    let hasher: std::map::hashfn[TypeRef] = hash;
-    let eqer: std::map::eqfn[TypeRef] = eq;
+    let hasher: std::map::hashfn<TypeRef> = hash;
+    let eqer: std::map::eqfn<TypeRef> = eq;
     let tn = std::map::mk_hashmap[TypeRef, str](hasher, eqer);
 
     ret type_names(tn, nt);

trunk/src/comp/metadata/creader.rs

@@ -45,7 +45,7 @@ fn read_crates(sess: session::session, crate: &ast::crate) {
 
 type env =
     @{sess: session::session,
-      crate_cache: @hashmap[str, int],
+      crate_cache: @hashmap<str, int>,
       library_search_paths: [str],
       mutable next_crate_num: ast::crate_num};
 
@@ -118,7 +118,7 @@ fn default_native_lib_naming(sess: session::session, static: bool) ->
 fn find_library_crate(sess: &session::session, ident: &ast::ident,
                       metas: &[@ast::meta_item],
                       library_search_paths: &[str]) ->
-   option::t[{ident: str, data: @[u8]}] {
+   option::t<{ident: str, data: @[u8]}> {
 
     attr::require_unique_names(sess, metas);
 
@@ -148,7 +148,7 @@ fn find_library_crate(sess: &session::session, ident: &ast::ident,
 fn find_library_crate_aux(nn: &{prefix: str, suffix: str}, crate_name: str,
                           metas: &[@ast::meta_item],
                           library_search_paths: &[str]) ->
-   option::t[{ident: str, data: @[u8]}] {
+   option::t<{ident: str, data: @[u8]}> {
     let prefix: str = nn.prefix + crate_name;
     // FIXME: we could probably use a 'glob' function in std::fs but it will
     // be much easier to write once the unsafe module knows more about FFI
@@ -183,7 +183,7 @@ fn find_library_crate_aux(nn: &{prefix: str, suffix: str}, crate_name: str,
     ret none;
 }
 
-fn get_metadata_section(filename: str) -> option::t[@[u8]] {
+fn get_metadata_section(filename: str) -> option::t<@[u8]> {
     let b = str::buf(filename);
     let mb = llvm::LLVMRustCreateMemoryBufferWithContentsOfFile(b);
     if mb as int == 0 { ret option::none[@[u8]]; }