user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #1474 - RalfJung:canonical, r=RalfJung

Browse source 
go back to using canonicalize()

Newer xargo should hopefully work with the paths this produces on Windows.
This commit is contained in:
bors 2020-07-11 09:08:03 +00:00
commit eee22ffdda
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cargo-miri/bin.rs
View file

@ -10,7 +10,7 @@ use std::process::Command;
use rustc_version::VersionMeta;
const XARGO_MIN_VERSION: (u32, u32, u32) = (0, 3, 20);
const XARGO_MIN_VERSION: (u32, u32, u32) = (0, 3, 21);
const CARGO_MIRI_HELP: &str = r#"Interprets bin crates and tests in Miri
@ -258,8 +258,9 @@ fn setup(subcommand: MiriCommand) {
// Determine where the rust sources are located. `XARGO_RUST_SRC` env var trumps everything.
let rust_src = match std::env::var_os("XARGO_RUST_SRC") {
Some(path) => {
// Make path absolute, but not via `canonicalize` (which does not work very well on Windows).
env::current_dir().unwrap().join(path)
let path = PathBuf::from(path);
// Make path absolute if possible.
path.canonicalize().unwrap_or(path)
}
None => {
// Check for `rust-src` rustup component.