changes

Cargo.toml

@@ -607,8 +607,9 @@ opt-level = 3
 #
 # Local client generation during development.
 #
-#[patch."https://github.com/oxidecomputer/progenitor"]
-#progenitor = { path = "../progenitor/progenitor" }
+[patch."https://github.com/oxidecomputer/progenitor"]
+progenitor = { path = "../progenitor/progenitor" }
+progenitor-client = { path = "../progenitor/progenitor-client" }
 #[patch."https://github.com/oxidecomputer/typify"]
 #typify = { path = "../typify/typify" }
 

dev-tools/oxlog/src/lib.rs

@@ -351,8 +351,7 @@ fn load_svc_logs(dir: Utf8PathBuf, logs: &mut BTreeMap<ServiceName, SvcLogs>) {
 
             let is_current = filename.ends_with(".log");
 
-            let svc_logs =
-                logs.entry(svc_name.to_string()).or_insert(SvcLogs::default());
+            let svc_logs = logs.entry(svc_name.to_string()).or_default();
 
             if is_current {
                 svc_logs.current = Some(logfile.clone());
@@ -374,8 +373,7 @@ fn load_extra_logs(
         return;
     };
 
-    let svc_logs =
-        logs.entry(svc_name.to_string()).or_insert(SvcLogs::default());
+    let svc_logs = logs.entry(svc_name.to_string()).or_default();
 
     for entry in entries {
         let Ok(entry) = entry else {

dev-tools/xtask/src/main.rs

@@ -26,23 +26,35 @@ enum Cmds {
     /// workspace
     CheckWorkspaceDeps,
     /// Run configured clippy checks
-    Clippy,
+    Clippy(ClippyArgs),
+}
+
+#[derive(Parser)]
+struct ClippyArgs {
+    /// Automatically apply lint suggestions.
+    #[clap(long)]
+    fix: bool,
 }
 
 fn main() -> Result<()> {
     let args = Args::parse();
     match args.cmd {
-        Cmds::Clippy => cmd_clippy(),
+        Cmds::Clippy(args) => cmd_clippy(args),
         Cmds::CheckWorkspaceDeps => cmd_check_workspace_deps(),
     }
 }
 
-fn cmd_clippy() -> Result<()> {
+fn cmd_clippy(args: ClippyArgs) -> Result<()> {
     let cargo =
         std::env::var("CARGO").unwrap_or_else(|_| String::from("cargo"));
     let mut command = Command::new(&cargo);
+    command.arg("clippy");
+
+    if args.fix {
+        command.arg("--fix");
+    }
+
     command
-        .arg("clippy")
         // Make sure we check everything.
         .arg("--all-targets")
         .arg("--")

nexus/src/app/background/mod.rs

@@ -20,6 +20,4 @@ mod region_replacement;
 mod status;
 mod sync_service_zone_nat;
 
-pub use common::Driver;
-pub use common::TaskHandle;
 pub use init::BackgroundTasks;