Merge branch 'master' into rustup

.appveyor.yml

@@ -36,7 +36,7 @@ build_script:
     - cargo install --all-features --force --path . --locked --offline
     # Get ourselves a MIR-full libstd, and use it henceforth
     - 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 miri

src/bin/cargo-miri.rs

@@ -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.
-    let dirs = directories::ProjectDirs::from("miri", "miri", "miri").unwrap();
+    let dirs = directories::ProjectDirs::from("org", "rust-lang", "miri").unwrap();
     let dir = dirs.cache_dir();
     if !dir.exists() {
         fs::create_dir_all(&dir).unwrap();