tweak comments, remove debug output

Author: RalfJung

.travis.yml

@@ -11,7 +11,7 @@ os:
 - osx
 
 before_script:
-# macOS weirdness (https://github.com/travis-ci/travis-ci/issues/6307)
+# macOS weirdness (https://github.com/travis-ci/travis-ci/issues/6307, https://github.com/travis-ci/travis-ci/issues/10165)
 - if [[ "$TRAVIS_OS_NAME" == osx ]]; then rvm get stable; fi
 # Compute the rust version we use. We do not use "language: rust" to have more control here.
 - |
@@ -37,11 +37,11 @@ script:
   cargo test --release --all-features &&
   cargo install --all-features --force --path .
 - |
-  # starting here, use MIR-full libstd
+  # Get ourselves a MIR-full libstd
   cargo miri setup &&
   export MIRI_SYSROOT=~/.miri/HOST
 - |
-  # run all tests with full mir
+  # Test miri with full MIR
   cargo test --release --all-features
 - |
   # Test cargo integration

appveyor.yml

@@ -27,10 +27,13 @@ build: false
 test_script:
     - set RUSTFLAGS=-g
     - set RUST_BACKTRACE=1
+    # Test plain miri
     - cargo build --release --all-features --all-targets
     - cargo test --release --all-features
+    # Get ourselves a MIR-full libstd
     - cargo run --release --all-features --bin cargo-miri -- miri setup
     - set MIRI_SYSROOT=%USERPROFILE%\.miri\HOST
+    # Test miri with full MIR
     - cargo test --release --all-features
 
 notifications:

src/bin/cargo-miri.rs

@@ -137,9 +137,8 @@ fn setup(ask_user: bool) {
     // Then, we also need rust-src.  Let's see if it is already installed.
     let sysroot = Command::new("rustc").args(&["--print", "sysroot"]).output().unwrap().stdout;
     let sysroot = std::str::from_utf8(&sysroot[..]).unwrap();
-    let src = Path::new(sysroot.trim_end_matches('\n')).join("lib/rustlib/src");
+    let src = Path::new(sysroot.trim_end_matches('\n')).join("lib").join("rustlib").join("src");
     if !src.exists() {
-        println!("Could not find {:?}", src);
         if ask_user {
             ask("It seems you do not have the rust-src component installed. I will run `rustup component add rust-src`. Proceed?");
         }