@@ -680,12 +680,22 @@ impl LowerRequest for MiriRequest {
680680 miriflags. push ( "-Zmiri-tree-borrows" ) ;
681681 }
682682
683+ miriflags. push ( "-Zmiri-disable-isolation" ) ;
684+
683685 let miriflags = miriflags. join ( " " ) ;
684686
685687 ExecuteCommandRequest {
686688 cmd : "cargo" . to_owned ( ) ,
687- args : vec ! [ "miri-playground" . to_owned( ) ] ,
688- envs : HashMap :: from_iter ( [ ( "MIRIFLAGS" . to_owned ( ) , miriflags) ] ) ,
689+ args : [ "miri" , "run" ] . map ( Into :: into) . into ( ) ,
690+ envs : HashMap :: from_iter ( [
691+ ( "MIRIFLAGS" . to_owned ( ) , miriflags) ,
692+ // Be sure that `cargo miri` will not build a new
693+ // sysroot. Creating a sysroot takes a while and Miri
694+ // will build one by default if it's missing. If
695+ // `MIRI_SYSROOT` is set and the sysroot is missing,
696+ // it will error instead.
697+ ( "MIRI_SYSROOT" . to_owned ( ) , "/playground/.cache/miri" . to_owned ( ) ) ,
698+ ] ) ,
689699 cwd : None ,
690700 }
691701 }
@@ -3963,8 +3973,7 @@ mod tests {
39633973 #[ tokio:: test]
39643974 #[ snafu:: report]
39653975 async fn miri ( ) -> Result < ( ) > {
3966- // cargo-miri-playground only exists inside the container
3967- let coordinator = new_coordinator_docker ( ) ;
3976+ let coordinator = new_coordinator ( ) ;
39683977
39693978 let req = MiriRequest {
39703979 code : r#"
0 commit comments