make 'fn convert_path_separator' to take Cow<> (to remove unnecessary allocation)

[rust.git] / miri

diff --git a/miri b/miri
index 1f46f04c13e8c1466f0466095c99313068f46ffc..47ff5024fc63356b44da641c12aadfe4c6855771 100755 (executable)
--- a/miri
+++ b/miri
@@ -11,6 +11,9 @@ working directory.
 ./miri build <flags>:
 Just build miri.  <flags> are passed to `cargo build`.
 
+./miri check <flags>:
+Just check miri.  <flags> are passed to `cargo check`.
+
 ./miri test <flags>:
 Build miri, set up a sysroot and then run the test suite. <flags> are passed
 to the final `cargo test` invocation.
@@ -45,7 +48,7 @@ fi
 # We set the rpath so that Miri finds the private rustc libraries it needs.
 # We enable debug-assertions to get tracing.
 # We enable line-only debuginfo for backtraces.
-export RUSTFLAGS="-C link-args=-Wl,-rpath,$LIBDIR -C debug-assertions -C debuginfo=1"
+export RUSTFLAGS="-C link-args=-Wl,-rpath,$LIBDIR -C debug-assertions -C debuginfo=1 $RUSTC_EXTRA_FLAGS"
 
 ## Helper functions
 
@@ -54,7 +57,7 @@ build_sysroot() {
     # Build once, for the user to see.
     cargo run $CARGO_BUILD_FLAGS --bin cargo-miri -- miri setup "$@"
     # Call again, to just set env var.
-    eval $(cargo run $CARGO_BUILD_FLAGS -q --bin cargo-miri -- miri setup --env "$@")
+    export MIRI_SYSROOT="$(cargo run $CARGO_BUILD_FLAGS -q --bin cargo-miri -- miri setup --print-sysroot "$@")"
 }
 
 # Prepare and set MIRI_SYSROOT.  Respects `MIRI_TEST_TARGET` and takes into account
@@ -65,16 +68,11 @@ find_sysroot() {
         return 0
     fi
     # We need to build a sysroot.
-    if echo "$SYSROOT" | egrep -q 'build/[^/]+/stage'; then
-        # A local rustc build. Use its source dir.
-        export XARGO_RUST_SRC="$SYSROOT/../../../src"
-    fi
     if [ -n "$MIRI_TEST_TARGET" ]; then
         build_sysroot --target "$MIRI_TEST_TARGET"
     else
         build_sysroot
     fi
-    export MIRI_SYSROOT
 }
 
 ## Main
@@ -104,6 +102,10 @@ install|install-debug)
     # "--offline" to avoid querying the registry (for yanked packages).
     exec cargo install $CARGO_INSTALL_FLAGS --path "$(dirname "$0")" --force --locked --offline "$@"
     ;;
+check|check-debug)
+    # Check, and let caller control flags.
+    exec cargo check $CARGO_BUILD_FLAGS "$@"
+    ;;
 build|build-debug)
     # Build, and let caller control flags.
     exec cargo build $CARGO_BUILD_FLAGS "$@"