Merge #298

298: release version 0.3.21 r=jethrogb a=RalfJung

Also do `cargo update` (`cargo install` ignores lockfiles so this just syncs CI with what people would install anyway).

r? @jethrogb 

Co-authored-by: Ralf Jung <[email protected]>

Author: bors[bot]

.travis.yml

@@ -12,7 +12,7 @@ matrix:
     - env: TARGET=x86_64-unknown-linux-gnu
       # Don't remove this target; test coverage in `smoke.rs` relies on us running at least
       # one pinned toolchain.
-      rust: nightly-2019-02-01 # old version without rustc-std-workspace-core
+      rust: nightly-2019-11-01
       if: branch = staging OR branch = trying
 
     # Linux (build only)

CHANGELOG.md

@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [v0.3.21] - 2020-07-11
+
+### Fixed
+
+- Make xargo fail on non-nightly, instead of continuing with the wrong sysroot.
+- Avoid adding '/' or '..' to paths for better Windows compatibility.
+
 ## [v0.3.20] - 2020-03-25
 
 ### Fixed

Cargo.lock

@@ -8,7 +8,7 @@ keywords = ["cli", "cross", "compilation", "std"]
 license = "MIT OR Apache-2.0"
 name = "xargo"
 repository = "https://github.com/japaric/xargo"
-version = "0.3.20"
+version = "0.3.21"
 default-run = "xargo"
 
 [dependencies]

Cargo.toml

@@ -814,36 +814,21 @@ fn host_twice() {
     run!()
 }
 
-/// Check multi stage sysroot builds with `xargo test`
+/// Check we can build+run `xargo test`
 #[cfg(feature = "dev")]
 #[test]
 fn host_libtest() {
     fn run() -> Result<()> {
         let project = HProject::new(true)?;
 
-        if std::env::var("TRAVIS_RUST_VERSION").ok().map_or(false,
-            |var| var.starts_with("nightly-"))
-        {
-            // Testing an old version on CI, we need a different Xargo.toml.
-            project.xargo_toml(
+        project.xargo_toml(
             "
 [dependencies.std]
 features = [\"panic_unwind\"]
 
-[dependencies.test]
-stage = 1
-",
-            )?;
-        } else {
-            project.xargo_toml(
-                "
-[dependencies.std]
-features = [\"panic_unwind\"]
-
 [dependencies.test]
 ",
-            )?;
-        }
+        )?;
 
         project.build("test")
     }
@@ -889,7 +874,7 @@ features = ["panic_unwind"]
 
 [patch.crates-io.cc]
 git = "https://github.com/alexcrichton/cc-rs"
-tag = "1.0.28"
+tag = "1.0.37"
 "#,
         )?;
         let stderr = project.build_and_get_stderr()?;