File tree Expand file tree Collapse file tree 2 files changed +15
-4
lines changed Expand file tree Collapse file tree 2 files changed +15
-4
lines changed Original file line number Diff line number Diff line change @@ -111,6 +111,7 @@ RUN rm src/*.rs
111111COPY --from=build-orchestrator /playground/.cargo/bin/worker /playground/.cargo/bin/worker
112112COPY --from=wasm-tools /playground/.cargo/bin/wasm-tools /playground/.cargo/bin
113113COPY --chown=playground cargo-wasm /playground/.cargo/bin
114+ # `cargo-miri-playground` is vestigial and can be removed after a while
114115COPY --chown=playground cargo-miri-playground /playground/.cargo/bin
115116
116117ENTRYPOINT ["/playground/tools/entrypoint.sh" ]
Original file line number Diff line number Diff line change @@ -688,12 +688,23 @@ impl LowerRequest for MiriRequest {
688688 miriflags. push ( "-Zmiri-tree-borrows" ) ;
689689 }
690690
691+ miriflags. push ( "-Zmiri-disable-isolation" ) ;
692+
691693 let miriflags = miriflags. join ( " " ) ;
692694
693695 ExecuteCommandRequest {
694696 cmd : "cargo" . to_owned ( ) ,
695- args : vec ! [ "miri-playground" . to_owned( ) ] ,
696- envs : kvs ! ( "MIRIFLAGS" => miriflags) . collect ( ) ,
697+ args : [ "miri" , "run" ] . map ( Into :: into) . into ( ) ,
698+ envs : kvs ! {
699+ "MIRIFLAGS" => miriflags,
700+ // Be sure that `cargo miri` will not build a new
701+ // sysroot. Creating a sysroot takes a while and Miri
702+ // will build one by default if it's missing. If
703+ // `MIRI_SYSROOT` is set and the sysroot is missing,
704+ // it will error instead.
705+ "MIRI_SYSROOT" => "/playground/.cache/miri" ,
706+ }
707+ . collect ( ) ,
697708 cwd : None ,
698709 }
699710 }
@@ -3971,8 +3982,7 @@ mod tests {
39713982 #[ tokio:: test]
39723983 #[ snafu:: report]
39733984 async fn miri ( ) -> Result < ( ) > {
3974- // cargo-miri-playground only exists inside the container
3975- let coordinator = new_coordinator_docker ( ) ;
3985+ let coordinator = new_coordinator ( ) ;
39763986
39773987 let req = MiriRequest {
39783988 code : r#"
You can’t perform that action at this time.
0 commit comments