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

Merge branch 'master' into rustup

Browse Source
This commit is contained in:
Ralf Jung 2019-06-20 21:37:12 +02:00 committed by GitHub
commit 86868b6946
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.appveyor.yml
View File

@ -36,7 +36,7 @@ build_script:
- cargo install --all-features --force --path . --locked --offline - cargo install --all-features --force --path . --locked --offline
# Get ourselves a MIR-full libstd, and use it henceforth # Get ourselves a MIR-full libstd, and use it henceforth
- cargo miri setup - cargo miri setup
- set MIRI_SYSROOT=%USERPROFILE%\AppData\Local\miri\miri\cache\HOST - set MIRI_SYSROOT=%USERPROFILE%\AppData\Local\rust-lang\miri\cache\HOST
test_script: test_script:
# Test miri # Test miri

2
src/bin/cargo-miri.rs
View File

@ -248,7 +248,7 @@ fn setup(ask_user: bool) {
} }
// Next, we need our own libstd. We will do this work in whatever is a good cache dir for this platform. // Next, we need our own libstd. We will do this work in whatever is a good cache dir for this platform.
let dirs = directories::ProjectDirs::from("miri", "miri", "miri").unwrap(); let dirs = directories::ProjectDirs::from("org", "rust-lang", "miri").unwrap();
let dir = dirs.cache_dir(); let dir = dirs.cache_dir();
if !dir.exists() { if !dir.exists() {
fs::create_dir_all(&dir).unwrap(); fs::create_dir_all(&dir).unwrap();