From e4a0f997fb01b9cbb650532fea1278159faff064 Mon Sep 17 00:00:00 2001 From: Erick Tryzelaar Date: Fri, 12 Aug 2011 07:15:18 -0700 Subject: Port the compiler to the typaram foo syntax. --- src/comp/driver/rustc.rs | 2 +- src/comp/driver/session.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/comp/driver') diff --git a/src/comp/driver/rustc.rs b/src/comp/driver/rustc.rs index 0500244d010..8bd185bb9d4 100644 --- a/src/comp/driver/rustc.rs +++ b/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) { let args_ivec = vec::from_vec(args); let binary = vec::shift(args_ivec); let binary_dir = fs::dirname(binary); diff --git a/src/comp/driver/session.rs b/src/comp/driver/session.rs index fb5ab249669..ea3eae60767 100644 --- a/src/comp/driver/session.rs +++ b/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, 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 { main_fn } } // Local Variables: // fill-column: 78; -- cgit 1.4.1-3-g733a5