Auto merge of #190 - japaric:no-lockfile, r=japaric

Revert "use Cargo.lock file from rust-src if present"

None

src/sysroot.rs

@@ -4,7 +4,7 @@ use std::hash::{Hash, Hasher};
 use std::path::PathBuf;
 use std::process::Command;
 use std::io::{self, Write};
-use std::{fs, env};
+use std::{env, fs};
 
 use rustc_version::VersionMeta;
 use tempdir::TempDir;
@@ -35,7 +35,6 @@ fn build(
     ctoml: &cargo::Toml,
     home: &Home,
     rustflags: &Rustflags,
-    src: &Src,
     sysroot: &Sysroot,
     hash: u64,
     verbose: bool,
@@ -84,13 +83,6 @@ version = "0.0.0"
             stoml.push_str(&profile.to_string())
         }
 
-        {
-            // Recent rust-src comes with a lockfile for libstd. Use it.
-            let lockfile = src.path().join("Cargo.lock");
-            if lockfile.exists() {
-                fs::copy(lockfile, &td.join("Cargo.lock")).chain_err(|| "couldn't copy lock file")?;
-            }
-        }
         util::write(&td.join("Cargo.toml"), &stoml)?;
         util::mkdir(&td.join("src"))?;
         util::write(&td.join("src/lib.rs"), "")?;
@@ -226,17 +218,7 @@ pub fn update(
     let hash = hash(cmode, &blueprint, rustflags, &ctoml, meta)?;
 
     if old_hash(cmode, home)? != Some(hash) {
-        build(
-            cmode,
-            blueprint,
-            &ctoml,
-            home,
-            rustflags,
-            src,
-            sysroot,
-            hash,
-            verbose,
-        )?;
+        build(cmode, blueprint, &ctoml, home, rustflags, sysroot, hash, verbose)?;
     }
 
     // copy host artifacts into the sysroot, if necessary

tests/smoke.rs

@@ -752,22 +752,18 @@ fn host_twice() {
 }
 
 /// Check multi stage sysroot builds with `xargo test`
-// We avoid Windows here just because it would be tricky to modify the rust-src
-// component (cf. #36501) from within the appveyor environment
 #[cfg(feature = "dev")]
-#[cfg(not(windows))]
-#[ignore]
 #[test]
-fn test() {
+fn stage() {
     fn run() -> Result<()> {
         let project = HProject::new(true)?;
 
         project.xargo_toml(
             "
-[dependencies.std]
-features = [\"panic_unwind\"]
+[dependencies.core]
+stage = 0
 
-[dependencies.test]
+[dependencies.compiler_builtins]
 stage = 1
 ",
         )?;