Added cargo-script support

compiler/base/orchestrator/src/coordinator.rs

@@ -362,6 +362,7 @@ pub struct ExecuteRequest {
     pub tests: bool,
     pub backtrace: bool,
     pub code: String,
+    pub cargo_script: bool,
 }
 
 impl ExecuteRequest {
@@ -374,7 +375,13 @@ impl ExecuteRequest {
     }
 
     fn execute_cargo_request(&self) -> ExecuteCommandRequest {
-        let mut args = vec![];
+        let is_cargo_script_enabled =
+            self.channel == Channel::Nightly && self.cargo_script && self.crate_type.is_binary();
+        let mut args = if is_cargo_script_enabled {
+            vec!["-Zscript"]
+        } else {
+            vec![]
+        };
 
         let cmd = match (self.tests, self.crate_type.is_binary()) {
             (true, _) => "test",
@@ -387,6 +394,11 @@ impl ExecuteRequest {
             args.push("--release");
         }
 
+        if is_cargo_script_enabled {
+            args.push("--manifest-path");
+            args.push("src/main.rs");
+        }
+
         let mut envs = HashMap::new();
         if self.backtrace {
             envs.insert("RUST_BACKTRACE".to_owned(), "1".to_owned());
@@ -452,6 +464,7 @@ pub struct CompileRequest {
     pub tests: bool,
     pub backtrace: bool,
     pub code: String,
+    pub cargo_script: bool,
 }
 
 impl CompileRequest {
@@ -558,6 +571,7 @@ pub struct FormatRequest {
     pub crate_type: CrateType,
     pub edition: Edition,
     pub code: String,
+    pub cargo_script: bool,
 }
 
 impl FormatRequest {
@@ -607,6 +621,7 @@ pub struct ClippyRequest {
     pub crate_type: CrateType,
     pub edition: Edition,
     pub code: String,
+    pub cargo_script: bool,
 }
 
 impl ClippyRequest {
@@ -655,6 +670,7 @@ pub struct MiriRequest {
     pub crate_type: CrateType,
     pub edition: Edition,
     pub code: String,
+    pub cargo_script: bool,
 }
 
 impl MiriRequest {
@@ -703,6 +719,7 @@ pub struct MacroExpansionRequest {
     pub crate_type: CrateType,
     pub edition: Edition,
     pub code: String,
+    pub cargo_script: bool,
 }
 
 impl MacroExpansionRequest {
@@ -2592,8 +2609,6 @@ fn basic_secure_docker_command() -> Command {
         "--platform",
         DOCKER_ARCH,
         "--cap-drop=ALL",
-        "--net",
-        "none",
         "--memory",
         "512m",
         "--memory-swap",
@@ -2635,6 +2650,7 @@ impl Backend for DockerBackend {
         let mut command = basic_secure_docker_command();
         command
             .args(["--name", &name])
+            .args(["--network", "host"])
             .arg("-i")
             .args(["-a", "stdin", "-a", "stdout", "-a", "stderr"])
             .args(["-e", "PLAYGROUND_ORCHESTRATOR=1"])
@@ -2908,6 +2924,7 @@ mod tests {
         tests: false,
         backtrace: false,
         code: String::new(),
+        cargo_script: false,
     };
 
     fn new_execute_request() -> ExecuteRequest {
@@ -3357,6 +3374,7 @@ mod tests {
         tests: false,
         backtrace: false,
         code: String::new(),
+        cargo_script: false,
     };
 
     #[tokio::test]
@@ -3455,6 +3473,7 @@ mod tests {
         tests: false,
         backtrace: false,
         code: String::new(),
+        cargo_script: false,
     };
 
     const DEFAULT_ASSEMBLY_FLAVOR: AssemblyFlavor = AssemblyFlavor::Intel;
@@ -3601,6 +3620,7 @@ mod tests {
         tests: false,
         backtrace: false,
         code: String::new(),
+        cargo_script: false,
     };
 
     #[tokio::test]
@@ -3637,6 +3657,7 @@ mod tests {
             tests: false,
             backtrace: false,
             code: r#"pub fn mul(a: u8, b: u8) -> u8 { a * b }"#.into(),
+            cargo_script: false,
         };
 
         let response = coordinator.compile(req).with_timeout().await.unwrap();
@@ -3664,6 +3685,7 @@ mod tests {
             tests: false,
             backtrace: false,
             code: r#"#[export_name = "inc"] pub fn inc(a: u8) -> u8 { a + 1 }"#.into(),
+            cargo_script: false,
         };
 
         let response = coordinator.compile(req).with_timeout().await.unwrap();
@@ -3684,6 +3706,7 @@ mod tests {
         crate_type: CrateType::Binary,
         edition: Edition::Rust2015,
         code: String::new(),
+        cargo_script: false,
     };
 
     const ARBITRARY_FORMAT_INPUT: &str = "fn main(){1+1;}";
@@ -3772,6 +3795,7 @@ mod tests {
         crate_type: CrateType::Library(LibraryType::Rlib),
         edition: Edition::Rust2021,
         code: String::new(),
+        cargo_script: false,
     };
 
     #[tokio::test]
@@ -3846,6 +3870,7 @@ mod tests {
         crate_type: CrateType::Binary,
         edition: Edition::Rust2021,
         code: String::new(),
+        cargo_script: false,
     };
 
     #[tokio::test]
@@ -3885,6 +3910,7 @@ mod tests {
         crate_type: CrateType::Library(LibraryType::Cdylib),
         edition: Edition::Rust2018,
         code: String::new(),
+        cargo_script: false,
     };
 
     #[tokio::test]
@@ -3935,6 +3961,7 @@ mod tests {
             tests: false,
             backtrace: false,
             code: "pub fn alpha() {}".into(),
+            cargo_script: false,
         };
 
         let response = coordinator
@@ -3955,6 +3982,7 @@ mod tests {
             tests: req.tests,
             backtrace: req.backtrace,
             code: "pub fn beta() {}".into(),
+            cargo_script: false,
         };
 
         let response = coordinator
@@ -3985,6 +4013,7 @@ mod tests {
             tests: false,
             backtrace: false,
             code: r#"fn main() { println!("hello") }"#.into(),
+            cargo_script: false,
         };
 
         let res = coordinator.execute(req.clone()).await.unwrap();
@@ -4013,6 +4042,7 @@ mod tests {
             tests: false,
             backtrace: false,
             code: r#"fn main() { std::process::abort(); }"#.into(),
+            cargo_script: false,
         };
 
         let res = coordinator.execute(req.clone()).await.unwrap();
@@ -4034,6 +4064,7 @@ mod tests {
             tests: false,
             backtrace: false,
             code: Default::default(),
+            cargo_script: false,
         }
     }
 

ui/frontend/ConfigMenu.tsx

@@ -9,12 +9,15 @@ import { useAppDispatch, useAppSelector } from './hooks';
 import * as config from './reducers/configuration';
 import {
   AssemblyFlavor,
+  CargoScript,
+  Channel,
   DemangleAssembly,
   Editor,
   Orientation,
   PairCharacters,
   ProcessAssembly,
 } from './types';
+import { shallowEqual } from 'react-redux';
 
 const MONACO_THEMES = [
   'vs', 'vs-dark', 'vscode-dark-plus',
@@ -30,6 +33,8 @@ const ConfigMenu: React.FC = () => {
   const assemblyFlavor = useAppSelector((state) => state.configuration.assemblyFlavor);
   const demangleAssembly = useAppSelector((state) => state.configuration.demangleAssembly);
   const processAssembly = useAppSelector((state) => state.configuration.processAssembly);
+  const cargoScript = useAppSelector((state) => state.configuration.cargoScript);
+  const isNightly = useAppSelector((state) => state.configuration.channel === Channel.Nightly, shallowEqual);
 
   const dispatch = useAppDispatch();
   const changeAceTheme = useCallback((t: string) => dispatch(config.changeAceTheme(t)), [dispatch]);
@@ -45,6 +50,8 @@ const ConfigMenu: React.FC = () => {
     useCallback((p: ProcessAssembly) => dispatch(config.changeProcessAssembly(p)), [dispatch]);
   const changeDemangleAssembly =
     useCallback((d: DemangleAssembly) => dispatch(config.changeDemangleAssembly(d)), [dispatch]);
+  const changeCargoScript =
+    useCallback((c: CargoScript) => dispatch(config.changeCargoScript(c)), [dispatch]);
 
   return (
     <Fragment>
@@ -142,6 +149,20 @@ const ConfigMenu: React.FC = () => {
           onChange={changeProcessAssembly}
         />
       </MenuGroup>
+
+      {isNightly && (
+        <MenuGroup title="Cargo">
+          <EitherConfig
+            id="cargo-script"
+            name="Cargo Script"
+            a={CargoScript.Enabled}
+            b={CargoScript.Disabled}
+            value={cargoScript}
+            onChange={changeCargoScript}
+          />
+
+        </MenuGroup>
+      )}
     </Fragment>
   );
 };

ui/frontend/compileActions.ts

@@ -17,6 +17,7 @@ interface CompileRequestBody {
   assemblyFlavor: string;
   demangleAssembly: string;
   processAssembly: string;
+  cargoScript: boolean;
 }
 
 const CompileResponseBody = z.object({

ui/frontend/reducers/configuration.ts

@@ -4,6 +4,7 @@ import { ThunkAction } from '../actions';
 import {
   AssemblyFlavor,
   Backtrace,
+  CargoScript,
   Channel,
   DemangleAssembly,
   Edition,
@@ -35,6 +36,7 @@ interface State {
   mode: Mode;
   edition: Edition;
   backtrace: Backtrace;
+  cargoScript: CargoScript
 }
 
 const initialState: State = {
@@ -56,6 +58,7 @@ const initialState: State = {
   mode: Mode.Debug,
   edition: Edition.Rust2021,
   backtrace: Backtrace.Disabled,
+  cargoScript: CargoScript.Enabled
 };
 
 const slice = createSlice({
@@ -117,6 +120,9 @@ const slice = createSlice({
     changeProcessAssembly: (state, action: PayloadAction<ProcessAssembly>) => {
       state.processAssembly = action.payload;
     },
+    changeCargoScript: (state, action: PayloadAction<CargoScript>) => {
+      state.cargoScript = action.payload;
+    },
   },
 });
 
@@ -135,16 +141,17 @@ export const {
   changePairCharacters,
   changePrimaryAction,
   changeProcessAssembly,
+  changeCargoScript
 } = slice.actions;
 
 export const changeEdition =
   (edition: Edition): ThunkAction =>
-  (dispatch) => {
-    if (edition === Edition.Rust2024) {
-      dispatch(changeChannel(Channel.Nightly));
-    }
+    (dispatch) => {
+      if (edition === Edition.Rust2024) {
+        dispatch(changeChannel(Channel.Nightly));
+      }
 
-    dispatch(changeEditionRaw(edition));
-  };
+      dispatch(changeEditionRaw(edition));
+    };
 
 export default slice.reducer;

ui/frontend/reducers/output/clippy.ts

@@ -23,6 +23,7 @@ interface ClippyRequestBody {
   crateType: string;
   edition: string;
   code: string;
+  cargoScript: boolean;
 }
 
 const ClippyResponseBody = z.object({