mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #1472 - RalfJung:abs, r=RalfJung

Browse Source 
better way to get an absolute path

suggested by @matklad
This commit is contained in:
bors 2020-07-09 11:03:15 +00:00
commit eb5ff1791b
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cargo-miri/bin.rs
View File

@ -257,21 +257,9 @@ fn setup(subcommand: MiriCommand) {
// Determine where the rust sources are located. `XARGO_RUST_SRC` env var trumps everything. // 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") { let rust_src = match std::env::var_os("XARGO_RUST_SRC") {
Some(val) => { Some(path) => {
let path = PathBuf::from(val); // Make path absolute, but not via `canonicalize` (which does not work very well on Windows).
let path = path.canonicalize().unwrap_or(path); env::current_dir().unwrap().join(path)
// On Windows, this produces a path starting with `\\?\`, which xargo cannot deal with.
// Strip that prefix; the resulting path should still be valid.
#[cfg(windows)]
let path = {
let str = path.into_os_string().into_string()
.expect("non-unicode paths are currently not supported");
let str = str.strip_prefix(r"\\?\").map(String::from).unwrap_or(str);
PathBuf::from(str)
};
path
} }
None => { None => {
// Check for `rust-src` rustup component. // Check for `rust-src` rustup component.