tweak comments, remove debug output

diff --git a/.travis.yml b/.travis.yml
index e5a47a40a9bef942411b068d1da76179f4683880..9a8b80689000363e5ac8bd0f1d416a4ee4b16ee6 100644 (file)
--- a/.travis.yml
+++ b/.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

diff --git a/appveyor.yml b/appveyor.yml
index 5757d1d27967c26e96fab813ba837985a22530b1..4287a08613f1930d5e6e7248e95f4f107adab014 100644 (file)
--- a/appveyor.yml
+++ b/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:

diff --git a/src/bin/cargo-miri.rs b/src/bin/cargo-miri.rs
index 1a5553ca10945e361ea129fe44e1d33aea0a4c22..20d9e9ba71e4cbce66e8d27dda1f5389493eff33 100644 (file)
--- a/src/bin/cargo-miri.rs
+++ b/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?");
         }