auto merge of #17590 : bjadamson/rust/rustc-improvements, r=alexcrichton

bors · bors · commit b2d4eb186e99 · 2014-10-02T15:57:19.000Z
Removes an unnecessary allocation when passing the command line arguments to the librustc driver.
diff --git a/src/librustc/driver/mod.rs b/src/librustc/driver/mod.rs
@@ -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
 }
 
diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
@@ -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);
 }

Original file line number	Diff line number	Diff line change
`@@ -29,16 +29,13 @@ use syntax::diagnostics;`
`29`	`29`
`30`	`30`	`use getopts;`
`31`	`31`
`32`		`-`
`33`	`32`	`pub mod driver;`
`34`	`33`	`pub mod session;`
`35`	`34`	`pub mod config;`
`36`	`35`	`pub mod pretty;`
`37`	`36`
`38`		`-`
`39`		`-pub fn main_args(args: &[String]) -> int {`
`40`		`- let owned_args = args.to_vec();`
`41`		`- monitor(proc() run_compiler(owned_args.as_slice()));`
	`37`	`+pub fn run(args: Vec<String>) -> int {`
	`38`	`+ monitor(proc() run_compiler(args.as_slice()));`
`42`	`39`	`0`
`43`	`40`	`}`
`44`	`41`
Original file line number	Diff line number	Diff line change
`@@ -150,5 +150,6 @@ mod rustc {`
`150`	`150`
`151`	`151`	`pub fn main() {`
`152`	`152`	`let args = std::os::args();`
`153`		`- std::os::set_exit_status(driver::main_args(args.as_slice()));`
	`153`	`+ let result = driver::run(args);`
	`154`	`+ std::os::set_exit_status(result);`
`154`	`155`	`}`