auto merge of rust-lang#1079 : alexcrichton/cargo/update-rust, r=alexcrichton

Continuation of rust-lang#1077
Closes rust-lang#1079

Author: bors

Cargo.lock

@@ -69,7 +69,7 @@ all: $(foreach target,$(CFG_TARGET),cargo-$(target))
 
 define CARGO_TARGET
 cargo-$(1): $$(CARGO)
-	"$$(CFG_RUSTC)" -v
+	"$$(CFG_RUSTC)" -V
 	$$(CARGO) build --target $(1) $$(OPT_FLAG) $$(ARGS)
 
 test-unit-$(1): $$(CARGO)

Makefile.in

@@ -313,7 +313,7 @@ if [ $HELP -eq 0 ]; then
     else
         probe_need CFG_RUSTC        rustc
     fi
-    DEFAULT_BUILD=$("${CFG_RUSTC}" --version verbose | grep 'host: ' | sed 's/host: //')
+    DEFAULT_BUILD=$("${CFG_RUSTC}" -vV | grep 'host: ' | sed 's/host: //')
 fi
 
 valopt build "${DEFAULT_BUILD}" "GNUs ./configure syntax LLVM build triple"

configure

@@ -1,11 +1,11 @@
 #![feature(phase, macro_rules)]
-#![deny(unused)]
+#![deny(warnings)]
 
 extern crate serialize;
 #[phase(plugin, link)] extern crate log;
 #[phase(plugin, link)] extern crate cargo;
 
-use std::collections::TreeSet;
+use std::collections::BTreeSet;
 use std::os;
 use std::io;
 use std::io::fs::{mod, PathExtensions};
@@ -187,9 +187,9 @@ fn execute_subcommand(cmd: &str, args: &[String], shell: &mut MultiShell) {
 
 /// List all runnable commands. find_command should always succeed
 /// if given one of returned command.
-fn list_commands() -> TreeSet<String> {
+fn list_commands() -> BTreeSet<String> {
     let command_prefix = "cargo-";
-    let mut commands = TreeSet::new();
+    let mut commands = BTreeSet::new();
     for dir in list_command_directory().iter() {
         let entries = match fs::readdir(dir) {
             Ok(entries) => entries,

src/bin/cargo.rs

@@ -1,4 +1,4 @@
-use std::collections::{HashMap, TreeMap};
+use std::collections::{HashMap, BTreeMap};
 
 use regex::Regex;
 use serialize::{Encodable, Encoder, Decodable, Decoder};
@@ -15,7 +15,7 @@ pub struct EncodableResolve {
     metadata: Option<Metadata>,
 }
 
-pub type Metadata = TreeMap<String, String>;
+pub type Metadata = BTreeMap<String, String>;
 
 impl EncodableResolve {
     pub fn to_resolve(&self, default: &SourceId) -> CargoResult<Resolve> {

src/cargo/core/resolver/encode.rs

@@ -3,7 +3,8 @@
 
 #![feature(macro_rules, phase)]
 #![feature(default_type_params)]
-#![deny(bad_style)]
+#![deny(unused)]
+#![cfg_attr(test, deny(warnings))]
 
 extern crate libc;
 extern crate regex;

src/cargo/lib.rs

@@ -468,7 +468,10 @@ fn rustc(package: &Package, target: &Target,
             t.is_lib()
         });
 
-        Ok((Work::new(move |desc_tx: Sender<String>| {
+        let rustc_dep_info_loc = root.join(target.file_stem()).with_extension("d");
+        let dep_info_loc = fingerprint::dep_info_loc(cx, package, target, kind);
+
+        Ok((Work::new(move |desc_tx| {
             let mut rustc = rustc;
 
             // Only at runtime have we discovered what the extra -L and -l
@@ -502,6 +505,8 @@ fn rustc(package: &Package, target: &Target,
                 human(format!("Could not compile `{}`.", name))
             }));
 
+            try!(fs::rename(&rustc_dep_info_loc, &dep_info_loc));
+
             Ok(())
 
         }), kind))
@@ -623,7 +628,7 @@ fn build_base_args(cx: &Context,
     }
 
     if profile.get_opt_level() != 0 {
-        cmd = cmd.arg("--opt-level").arg(profile.get_opt_level().to_string());
+        cmd = cmd.arg("-C").arg(format!("opt-level={}", profile.get_opt_level()));
     }
     if (target.is_bin() || target.is_staticlib()) && profile.get_lto() {
         cmd = cmd.args(&["-C", "lto"]);
@@ -676,8 +681,7 @@ fn build_plugin_args(mut cmd: ProcessBuilder, cx: &Context, pkg: &Package,
     cmd = cmd.arg("--out-dir");
     cmd = cmd.arg(cx.out_dir(pkg, kind, target));
 
-    let dep_info_loc = fingerprint::dep_info_loc(cx, pkg, target, kind);
-    cmd = cmd.arg("--dep-info").arg(dep_info_loc);
+    cmd = cmd.arg("--emit=dep-info,link");
 
     if kind == Kind::Target {
         fn opt(cmd: ProcessBuilder, key: &str, prefix: &str,

src/cargo/ops/cargo_rustc/mod.rs

@@ -1 +1 @@
-2014-12-19
+2014-12-21

src/rustversion.txt

@@ -1,3 +1,11 @@
+2014-12-21
+  linux-i386 4dea04e278192c5409f43794a98f20a8f59df2d9
+  linux-x86_64 3e48c573d3c4d26591feb7bfe988174720f08374
+  macos-i386 dc3d498c0567af4a0820e91756dcfff8fde0efac
+  macos-x86_64 f301bd8c3c93a5c88698c69190e464af1525ac96
+  winnt-i386 5b6bc87e302d1ff6ac9b0576292eb7cbff2c3b83
+  winnt-x86_64 a8bb8d3a7ed3fc8caf4a33d6b9d2e43544877409
+
 2014-12-20
   linux-i386 1cccab5a6ac8e73472bf78cdce019cd1a60d4638
   linux-x86_64 53c176fcda0a40fb77b901303c443de3dce3e58d

src/snapshots.txt

@@ -181,7 +181,7 @@ running 1 test
 test bench_hello ... ",
         COMPILING, p.url(), RUNNING))
               .with_stderr(format!("\
-task '<main>' panicked at 'assertion failed: \
+thread '<main>' panicked at 'assertion failed: \
     `(left == right) && (right == left)` (left: \
     `hello`, right: `nope`)', src{sep}foo.rs:13
 ", sep = path::SEP))
@@ -646,7 +646,6 @@ test!(bin_there_for_integration {
                             output);
 });
 
-#[cfg(not(windows))] // FIXME(#456)
 test!(bench_dylib {
     let p = project("foo")
         .file("Cargo.toml", r#"
@@ -696,11 +695,11 @@ test!(bench_dylib {
                 execs().with_status(0)
                        .with_stdout(format!("\
 {compiling} bar v0.0.1 ({dir})
-{running} [..] --opt-level 3 [..]
+{running} [..] -C opt-level=3 [..]
 {compiling} foo v0.0.1 ({dir})
-{running} [..] --opt-level 3 [..]
-{running} [..] --opt-level 3 [..]
-{running} [..] --opt-level 3 [..]
+{running} [..] -C opt-level=3 [..]
+{running} [..] -C opt-level=3 [..]
+{running} [..] -C opt-level=3 [..]
 {running} [..]target[..]release[..]bench-[..]
 
 running 1 test

tests/test_cargo_bench.rs

@@ -1,6 +1,7 @@
-use std::io::{TcpListener, Listener, Acceptor, BufferedStream};
-use std::io::net::tcp::TcpAcceptor;
 use std::collections::HashSet;
+use std::io::net::tcp::TcpAcceptor;
+use std::io::{TcpListener, Listener, Acceptor, BufferedStream};
+use std::thread::Thread;
 use git2;
 
 use support::{project, execs, ResultTest, UPDATING};
@@ -25,7 +26,6 @@ test!(http_auth_offered {
     let mut a = listener.listen().unwrap();
     let a2 = a.clone();
     let _c = Closer { a: a2 };
-    let (tx, rx) = channel();
 
     fn headers<R: Buffer>(rdr: &mut R) -> HashSet<String> {
         let valid = ["GET", "Authorization", "Accept", "User-Agent"];
@@ -38,7 +38,7 @@ test!(http_auth_offered {
            .collect()
     }
 
-    spawn(move|| {
+    let t = Thread::spawn(move|| {
         let mut s = BufferedStream::new(a.accept().unwrap());
         let req = headers(&mut s);
         s.write(b"\
@@ -66,8 +66,6 @@ test!(http_auth_offered {
             "Accept: */*",
             "User-Agent: git/1.0 (libgit2 0.21.0)",
         ].into_iter().map(|s| s.to_string()).collect());
-
-        tx.send(());
     });
 
     let script = project("script")
@@ -122,7 +120,7 @@ Caused by:
 ",
         addr = addr)));
 
-    rx.recv();
+    t.join().ok().unwrap();
 });
 
 // Boy, sure would be nice to have a TLS implementation in rust!
@@ -132,11 +130,8 @@ test!(https_something_happens {
     let mut a = listener.listen().unwrap();
     let a2 = a.clone();
     let _c = Closer { a: a2 };
-    let (tx, rx) = channel();
-    spawn(move|| {
+    let t = Thread::spawn(move|| {
         drop(a.accept().unwrap());
-
-        tx.send(());
     });
 
     let p = project("foo")
@@ -175,7 +170,7 @@ Caused by:
             "SSL error: [..]"
         })));
 
-    rx.recv();
+    t.join().ok().unwrap();
 });
 
 // Boy, sure would be nice to have an SSH implementation in rust!
@@ -185,11 +180,8 @@ test!(ssh_something_happens {
     let mut a = listener.listen().unwrap();
     let a2 = a.clone();
     let _c = Closer { a: a2 };
-    let (tx, rx) = channel();
-    spawn(move|| {
+    let t = Thread::spawn(move|| {
         drop(a.accept().unwrap());
-
-        tx.send(());
     });
 
     let p = project("foo")
@@ -221,6 +213,5 @@ Caused by:
   [23] Failed to start SSH session: Failed getting banner
 ",
         addr = addr)));
-
-    rx.recv();
+    t.join().ok().unwrap();
 });

tests/test_cargo_build_auth.rs

@@ -13,7 +13,7 @@ fn verbose_output_for_lib(p: &ProjectBuilder) -> String {
         -C metadata=[..] \
         -C extra-filename=-[..] \
         --out-dir {dir}{sep}target \
-        --dep-info [..] \
+        --emit=dep-info,link \
         -L {dir}{sep}target \
         -L {dir}{sep}target{sep}deps`
 ",

tests/test_cargo_build_lib.rs

@@ -699,8 +699,10 @@ test!(self_dependency {
                 execs().with_status(0));
 });
 
-#[cfg(not(windows))]
 test!(ignore_broken_symlinks {
+    // windows and symlinks don't currently agree that well
+    if cfg!(windows) { return }
+
     let p = project("foo")
         .file("Cargo.toml", basic_bin_manifest("foo").as_slice())
         .file("src/foo.rs", main_file(r#""i am foo""#, &[]).as_slice())
@@ -748,11 +750,11 @@ test!(lto_build {
                 execs().with_status(0).with_stdout(format!("\
 {compiling} test v0.0.0 ({url})
 {running} `rustc {dir}{sep}src{sep}main.rs --crate-name test --crate-type bin \
-        --opt-level 3 \
+        -C opt-level=3 \
         -C lto \
         --cfg ndebug \
         --out-dir {dir}{sep}target{sep}release \
-        --dep-info [..] \
+        --emit=dep-info,link \
         -L {dir}{sep}target{sep}release \
         -L {dir}{sep}target{sep}release{sep}deps`
 ",
@@ -780,7 +782,7 @@ test!(verbose_build {
         -C metadata=[..] \
         -C extra-filename=-[..] \
         --out-dir {dir}{sep}target \
-        --dep-info [..] \
+        --emit=dep-info,link \
         -L {dir}{sep}target \
         -L {dir}{sep}target{sep}deps`
 ",
@@ -805,12 +807,12 @@ test!(verbose_release_build {
                 execs().with_status(0).with_stdout(format!("\
 {compiling} test v0.0.0 ({url})
 {running} `rustc {dir}{sep}src{sep}lib.rs --crate-name test --crate-type lib \
-        --opt-level 3 \
+        -C opt-level=3 \
         --cfg ndebug \
         -C metadata=[..] \
         -C extra-filename=-[..] \
         --out-dir {dir}{sep}target{sep}release \
-        --dep-info [..] \
+        --emit=dep-info,link \
         -L {dir}{sep}target{sep}release \
         -L {dir}{sep}target{sep}release{sep}deps`
 ",
@@ -851,22 +853,22 @@ test!(verbose_release_build_deps {
 {compiling} foo v0.0.0 ({url})
 {running} `rustc {dir}{sep}foo{sep}src{sep}lib.rs --crate-name foo \
         --crate-type dylib --crate-type rlib -C prefer-dynamic \
-        --opt-level 3 \
+        -C opt-level=3 \
         --cfg ndebug \
         -C metadata=[..] \
         -C extra-filename=-[..] \
         --out-dir {dir}{sep}target{sep}release{sep}deps \
-        --dep-info [..] \
+        --emit=dep-info,link \
         -L {dir}{sep}target{sep}release{sep}deps \
         -L {dir}{sep}target{sep}release{sep}deps`
 {compiling} test v0.0.0 ({url})
 {running} `rustc {dir}{sep}src{sep}lib.rs --crate-name test --crate-type lib \
-        --opt-level 3 \
+        -C opt-level=3 \
         --cfg ndebug \
         -C metadata=[..] \
         -C extra-filename=-[..] \
         --out-dir {dir}{sep}target{sep}release \
-        --dep-info [..] \
+        --emit=dep-info,link \
         -L {dir}{sep}target{sep}release \
         -L {dir}{sep}target{sep}release{sep}deps \
         --extern foo={dir}{sep}target{sep}release{sep}deps/\