about summary refs log tree commit diff
path: root/src/comp/back
diff options
context:
space:
mode:
authorTim Chevalier <chevalier@alum.wellesley.edu>2012-01-31 17:05:20 -0800
committerTim Chevalier <chevalier@alum.wellesley.edu>2012-01-31 17:05:20 -0800
commite5d095d67e3926fa104ac495076fe9d4cd4f5562 (patch)
tree07be94199b1062e4ba99be9c014178d26543a0aa /src/comp/back
parent1f795ff3b0c0cac31c1d9fd2406d0d53e774683a (diff)
downloadrust-e5d095d67e3926fa104ac495076fe9d4cd4f5562.tar.gz
rust-e5d095d67e3926fa104ac495076fe9d4cd4f5562.zip
Change option::t to option
Now that core exports "option" as a synonym for option::t, search-and-
replace option::t with option.

The only place that still refers to option::t are the modules in libcore
that use option, because fixing this requires a new snapshot
(forthcoming).
Diffstat (limited to 'src/comp/back')
-rw-r--r--src/comp/back/link.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/comp/back/link.rs b/src/comp/back/link.rs
index 068c8fddb33..b7a16d7e863 100644
--- a/src/comp/back/link.rs
+++ b/src/comp/back/link.rs
@@ -38,7 +38,7 @@ fn llvm_err(sess: session, msg: str) unsafe {
     } else { sess.fatal(msg + ": " + str::from_cstr(buf)); }
 }
 
-fn load_intrinsics_bc(sess: session) -> option::t<ModuleRef> {
+fn load_intrinsics_bc(sess: session) -> option<ModuleRef> {
     let path = alt filesearch::search(
         sess.filesearch,
         bind filesearch::pick_file("intrinsics.bc", _)) {
@@ -368,14 +368,14 @@ fn build_link_meta(sess: session, c: ast::crate, output: str,
                    sha: sha1) -> link_meta {
 
     type provided_metas =
-        {name: option::t<str>,
-         vers: option::t<str>,
+        {name: option<str>,
+         vers: option<str>,
          cmh_items: [@ast::meta_item]};
 
     fn provided_link_metas(sess: session, c: ast::crate) ->
        provided_metas {
-        let name: option::t<str> = none;
-        let vers: option::t<str> = none;
+        let name: option<str> = none;
+        let vers: option<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);