Skip to content

Commit

Permalink
auto merge of rust-lang#17590 : bjadamson/rust/rustc-improvements, r=…
Browse files Browse the repository at this point in the history
…alexcrichton

Removes an unnecessary allocation when passing the command line arguments to the librustc driver.
  • Loading branch information
bors committed Oct 2, 2014
2 parents b419e9e + d96faf7 commit b2d4eb1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
7 changes: 2 additions & 5 deletions src/librustc/driver/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,13 @@ use syntax::diagnostics;

use getopts;


pub mod driver;
pub mod session;
pub mod config;
pub mod pretty;


pub fn main_args(args: &[String]) -> int {
let owned_args = args.to_vec();
monitor(proc() run_compiler(owned_args.as_slice()));
pub fn run(args: Vec<String>) -> int {
monitor(proc() run_compiler(args.as_slice()));
0
}

Expand Down
3 changes: 2 additions & 1 deletion src/librustc/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -150,5 +150,6 @@ mod rustc {

pub fn main() {
let args = std::os::args();
std::os::set_exit_status(driver::main_args(args.as_slice()));
let result = driver::run(args);
std::os::set_exit_status(result);
}

0 comments on commit b2d4eb1

Please sign in to comment.