From 5ae2b372b4407deb5d6125766a581d3820df2b1d Mon Sep 17 00:00:00 2001 From: Charlie Gettys Date: Thu, 27 Jun 2024 13:00:37 -0700 Subject: [PATCH 1/2] Fix miri.bat --- src/tools/miri/miri.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/miri/miri.bat b/src/tools/miri/miri.bat index 98b59a56a0db4..92566e009675a 100644 --- a/src/tools/miri/miri.bat +++ b/src/tools/miri/miri.bat @@ -6,7 +6,7 @@ set MIRI_SCRIPT_TARGET_DIR=%0\..\miri-script\target :: If any other steps are added, the "|| exit /b" must be appended to early :: return from the script. If not, it will continue execution. cargo +stable build %CARGO_EXTRA_FLAGS% -q --target-dir %MIRI_SCRIPT_TARGET_DIR% --manifest-path %0\..\miri-script\Cargo.toml ^ - || echo Failed to build miri-script. Is the 'stable' toolchain installed? & exit /b + || echo Failed to build miri-script. Is the 'stable' toolchain installed? && exit /b :: Forwards all arguments to this file to the executable. :: We invoke the binary directly to avoid going through rustup, which would set some extra From e7e35d7d78544ae030d043209cfe25315fb4cfbd Mon Sep 17 00:00:00 2001 From: Charlie Gettys Date: Thu, 27 Jun 2024 16:30:33 -0700 Subject: [PATCH 2/2] Switch to the explicit parens version --- src/tools/miri/miri.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/miri/miri.bat b/src/tools/miri/miri.bat index 92566e009675a..6f9a8f38d6559 100644 --- a/src/tools/miri/miri.bat +++ b/src/tools/miri/miri.bat @@ -6,7 +6,7 @@ set MIRI_SCRIPT_TARGET_DIR=%0\..\miri-script\target :: If any other steps are added, the "|| exit /b" must be appended to early :: return from the script. If not, it will continue execution. cargo +stable build %CARGO_EXTRA_FLAGS% -q --target-dir %MIRI_SCRIPT_TARGET_DIR% --manifest-path %0\..\miri-script\Cargo.toml ^ - || echo Failed to build miri-script. Is the 'stable' toolchain installed? && exit /b + || (echo Failed to build miri-script. Is the 'stable' toolchain installed? & exit /b) :: Forwards all arguments to this file to the executable. :: We invoke the binary directly to avoid going through rustup, which would set some extra