use cargo miri setup for CI

diff --git a/.travis.yml b/.travis.yml
index 85dd50cb5e3c3f8e3b3f828c331730c152892f52..e5a47a40a9bef942411b068d1da76179f4683880 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,8 +28,6 @@ before_script:
 - rustup target add i686-unknown-linux-gnu
 - rustup target add i686-pc-windows-gnu
 - rustup target add i686-pc-windows-msvc
-- rustup component add rust-src
-- cargo install xargo || echo "Skipping xargo install"
 
 script:
 - set -e
@@ -39,9 +37,9 @@ script:
   cargo test --release --all-features &&
   cargo install --all-features --force --path .
 - |
-  # get ourselves a MIR-full libstd
-  xargo/build.sh &&
-  export MIRI_SYSROOT=~/.xargo/HOST
+  # starting here, use MIR-full libstd
+  cargo miri setup &&
+  export MIRI_SYSROOT=~/.miri/HOST
 - |
   # run all tests with full mir
   cargo test --release --all-features

diff --git a/appveyor.yml b/appveyor.yml
index 3dc47f1c67b6aef0e1e3b16145f20ee02e68c908..5757d1d27967c26e96fab813ba837985a22530b1 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -21,16 +21,6 @@ install:
     - rustup-init.exe -y --default-host %TARGET% --default-toolchain %RUST_TOOLCHAIN%
     - set PATH=%USERPROFILE%\.cargo\bin;%PATH%
     - rustc --version
-    # Customize installation.
-    - rustup component add rust-src
-    - cargo install xargo
-    # Prepare a libstd with MIR (cannot use bash script, obviously).
-    # The flags here should be kept in sync with `add_miri_default_args` in `src/lib.rs`.
-    - cd xargo
-    - set RUSTFLAGS=-Zalways-encode-mir -Zmir-emit-retag -Zmir-opt-level=0
-    - xargo build
-    - set RUSTFLAGS=
-    - cd ..
 
 build: false
 
@@ -39,7 +29,8 @@ test_script:
     - set RUST_BACKTRACE=1
     - cargo build --release --all-features --all-targets
     - cargo test --release --all-features
-    - set MIRI_SYSROOT=%USERPROFILE%\.xargo\HOST
+    - cargo run --release --all-features --bin cargo-miri -- miri setup
+    - set MIRI_SYSROOT=%USERPROFILE%\.miri\HOST
     - cargo test --release --all-features
 
 notifications: