File tree Expand file tree Collapse file tree 2 files changed +3
-6
lines changed
src/tools/miri/miri-script/src Expand file tree Collapse file tree 2 files changed +3
-6
lines changed Original file line number Diff line number Diff line change @@ -252,12 +252,11 @@ impl Command {
252
252
// Fetch given rustc commit.
253
253
cmd ! ( sh, "git fetch http://localhost:{JOSH_PORT}/rust-lang/rust.git@{commit}{JOSH_FILTER}.git" )
254
254
. run ( )
255
- . map_err ( |e | {
255
+ . inspect_err ( |_ | {
256
256
// Try to un-do the previous `git commit`, to leave the repo in the state we found it.
257
257
cmd ! ( sh, "git reset --hard HEAD^" )
258
258
. run ( )
259
259
. expect ( "FAILED to clean up again after failed `git fetch`, sorry for that" ) ;
260
- e
261
260
} )
262
261
. context ( "FAILED to fetch new commits, something went wrong (committing the rust-version file has been undone)" ) ?;
263
262
@@ -545,9 +544,8 @@ impl Command {
545
544
if let Some ( seed_range) = many_seeds {
546
545
e. run_many_times ( seed_range, |sh, seed| {
547
546
eprintln ! ( "Trying seed: {seed}" ) ;
548
- run_miri ( sh, Some ( format ! ( "-Zmiri-seed={seed}" ) ) ) . map_err ( |err | {
547
+ run_miri ( sh, Some ( format ! ( "-Zmiri-seed={seed}" ) ) ) . inspect_err ( |_ | {
549
548
eprintln ! ( "FAILING SEED: {seed}" ) ;
550
- err
551
549
} )
552
550
} ) ?;
553
551
} else {
Original file line number Diff line number Diff line change @@ -219,10 +219,9 @@ impl MiriEnv {
219
219
break ;
220
220
}
221
221
// Run the command with this seed.
222
- run ( & local_shell, cur) . map_err ( |err | {
222
+ run ( & local_shell, cur) . inspect_err ( |_ | {
223
223
// If we failed, tell everyone about this.
224
224
failed. store ( true , Ordering :: Relaxed ) ;
225
- err
226
225
} ) ?;
227
226
// Check if some other command failed (in which case we'll stop as well).
228
227
if failed. load ( Ordering :: Relaxed ) {
You can’t perform that action at this time.
0 commit comments