---

yaml
---
r: 62814
b: refs/heads/snap-stage3
c: 844b5cf
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: faf1afee16cfacf0318ca2b88bc4fa5e507418dd
+refs/heads/snap-stage3: 844b5cff363cdb4ca2baa9152263a5f14a0dcdb0
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/compiletest/compiletest.rc

@@ -12,6 +12,7 @@
 
 #[allow(non_camel_case_types)];
 
+#[no_core]; // XXX: Remove after snapshot
 #[no_std];
 
 extern mod core(name = "std", vers = "0.7-pre");

branches/snap-stage3/src/librust/rust.rc

@@ -152,15 +152,15 @@ fn cmd_help(args: &[~str]) -> ValidUsage {
     }
 
     match args {
-        [command_string] => print_usage(command_string),
-        _                => Invalid
+        [ref command_string] => print_usage(copy *command_string),
+        _                    => Invalid
     }
 }
 
 fn cmd_test(args: &[~str]) -> ValidUsage {
     match args {
-        [filename] => {
-            let test_exec = Path(filename).filestem().unwrap() + "test~";
+        [ref filename] => {
+            let test_exec = Path(*filename).filestem().unwrap() + "test~";
             invoke("rustc", &[~"--test", filename.to_owned(),
                               ~"-o", test_exec.to_owned()], rustc::main);
             let exit_code = run::process_status(~"./" + test_exec, []);
@@ -172,8 +172,8 @@ fn cmd_test(args: &[~str]) -> ValidUsage {
 
 fn cmd_run(args: &[~str]) -> ValidUsage {
     match args {
-        [filename, ..prog_args] => {
-            let exec = Path(filename).filestem().unwrap() + "~";
+        [ref filename, ..prog_args] => {
+            let exec = Path(*filename).filestem().unwrap() + "~";
             invoke("rustc", &[filename.to_owned(), ~"-o", exec.to_owned()],
                    rustc::main);
             let exit_code = run::process_status(~"./"+exec, prog_args);

branches/snap-stage3/src/librustc/back/link.rs

@@ -202,8 +202,6 @@ pub mod write {
                       output_type: output_type,
                       output: &Path) {
         unsafe {
-            llvm::LLVMInitializePasses();
-
             let opts = sess.opts;
             if sess.time_llvm_passes() { llvm::LLVMRustEnableTimePasses(); }
             let td = mk_target_data(sess.targ_cfg.target_strs.data_layout);
@@ -234,21 +232,14 @@ pub mod write {
             let mut mpm = passes::PassManager::new(td.lltd);
 
             if !sess.no_verify() {
-                mpm.add_pass_from_name("verify");
+                mpm.addPass(llvm::LLVMCreateVerifierPass());
             }
 
-            let passes = if sess.opts.custom_passes.len() > 0 {
-                copy sess.opts.custom_passes
-            } else {
-                if sess.lint_llvm() {
-                    mpm.add_pass_from_name("lint");
-                }
-                passes::create_standard_passes(opts.optimize)
-            };
-
+            if sess.lint_llvm() {
+                mpm.addPass(llvm::LLVMCreateLintPass());
+            }
 
-            debug!("Passes: %?", passes);
-            passes::populate_pass_manager(sess, &mut mpm, passes);
+            passes::populatePassManager(&mut mpm, opts.optimize);
 
             debug!("Running Module Optimization Pass");
             mpm.run(llmod);