Merge pull request #76 from nikomatsakis/main

add `symposium cargo`

Author: nikomatsakis

Cargo.lock

@@ -39,6 +39,10 @@ struct Cli {
     #[arg(long, default_value = "crate_source", value_delimiter = ',')]
     ferris_tools: Vec<String>,
 
+    /// Enable or disable Cargo tools (default: yes)
+    #[arg(long, default_value = "yes", value_parser = parse_yes_no)]
+    cargo: bool,
+
     /// Enable trace logging to the specified directory.
     /// Traces are written as timestamped .jsons files viewable with sacp-trace-viewer.
     #[arg(long)]
@@ -98,7 +102,8 @@ async fn main() -> Result<()> {
 
     let mut symposium = symposium_acp_proxy::Symposium::new()
         .sparkle(cli.sparkle)
-        .ferris(ferris_config);
+        .ferris(ferris_config)
+        .cargo(cli.cargo);
 
     if let Some(trace_dir) = cli.trace_dir {
         symposium = symposium.trace_dir(trace_dir);

src/symposium-acp-agent/src/main.rs

@@ -35,5 +35,6 @@ tokio-util = { version = "0.7", features = ["compat"] }
 
 # Proxy components
 symposium-ferris = { path = "../symposium-ferris", version = "1.0.0" }
+symposium-cargo = "0.2.0"
 sacp-tee.workspace = true
 sparkle.workspace = true

src/symposium-acp-proxy/Cargo.toml

@@ -24,6 +24,7 @@ use std::path::PathBuf;
 /// Shared configuration for Symposium proxy chains.
 struct SymposiumConfig {
     ferris: Option<symposium_ferris::Ferris>,
+    cargo: bool,
     sparkle: bool,
     trace_dir: Option<PathBuf>,
 }
@@ -33,6 +34,7 @@ impl SymposiumConfig {
         SymposiumConfig {
             sparkle: true,
             ferris: Some(symposium_ferris::Ferris::default()),
+            cargo: true,
             trace_dir: None,
         }
     }
@@ -64,6 +66,12 @@ impl Symposium {
         self
     }
 
+    /// Enable or disable Cargo tools.
+    pub fn cargo(mut self, enable: bool) -> Self {
+        self.config.cargo = enable;
+        self
+    }
+
     /// Enable trace logging to a directory.
     /// Traces will be written as `<timestamp>.jsons` files.
     pub fn trace_dir(mut self, dir: impl Into<PathBuf>) -> Self {
@@ -84,6 +92,7 @@ impl Component<ProxyToConductor> for Symposium {
         let Self { config } = self;
 
         let ferris = config.ferris;
+        let cargo = config.cargo;
         let sparkle = config.sparkle;
         let trace_dir = config.trace_dir;
 
@@ -101,6 +110,10 @@ impl Component<ProxyToConductor> for Symposium {
                     )));
                 }
 
+                if cargo {
+                    proxies.push(DynComponent::new(symposium_cargo::CargoProxy));
+                }
+
                 if sparkle {
                     proxies.push(DynComponent::new(sparkle::SparkleComponent::new()));
                 }
@@ -153,6 +166,7 @@ impl Component<AgentToClient> for SymposiumAgent {
         let Self { config, agent } = self;
 
         let ferris = config.ferris;
+        let cargo = config.cargo;
         let sparkle = config.sparkle;
         let trace_dir = config.trace_dir;
 
@@ -170,6 +184,10 @@ impl Component<AgentToClient> for SymposiumAgent {
                     )));
                 }
 
+                if cargo {
+                    proxies.push(DynComponent::new(symposium_cargo::CargoProxy));
+                }
+
                 if sparkle {
                     proxies.push(DynComponent::new(sparkle::SparkleComponent::new()));
                 }

src/symposium-acp-proxy/src/lib.rs

@@ -29,6 +29,10 @@ struct Cli {
     #[arg(long, default_value = "crate_source", value_delimiter = ',')]
     ferris_tools: Vec<String>,
 
+    /// Enable or disable Cargo tools (default: yes)
+    #[arg(long, default_value = "yes", value_parser = parse_yes_no)]
+    cargo: bool,
+
     /// Enable trace logging to the specified directory.
     /// Traces are written as timestamped .jsons files viewable with sacp-trace-viewer.
     #[arg(long)]
@@ -80,7 +84,8 @@ async fn main() -> Result<()> {
 
     let mut symposium = symposium_acp_proxy::Symposium::new()
         .sparkle(cli.sparkle)
-        .ferris(ferris_config);
+        .ferris(ferris_config)
+        .cargo(cli.cargo);
 
     if let Some(trace_dir) = cli.trace_dir {
         symposium = symposium.trace_dir(trace_dir);