update to Rust 1.78.0 / bump OPTE to 0.29.250

.github/buildomat/jobs/a4x2-deploy.sh

@@ -2,7 +2,7 @@
 #:
 #: name = "a4x2-deploy"
 #: variety = "basic"
-#: target = "lab-2.0-opte-0.27"
+#: target = "lab-2.0-opte-0.29"
 #: output_rules = [
 #:	"/out/falcon/*.log",
 #:	"/out/falcon/*.err",

.github/buildomat/jobs/a4x2-prepare.sh

@@ -3,7 +3,7 @@
 #: name = "a4x2-prepare"
 #: variety = "basic"
 #: target = "helios-2.0"
-#: rust_toolchain = "1.77.2"
+#: rust_toolchain = "1.78.0"
 #: output_rules = [
 #:	"=/out/cargo-bay-ce.tgz",
 #:	"=/out/cargo-bay-cr1.tgz",

.github/buildomat/jobs/build-and-test-helios.sh

@@ -3,7 +3,7 @@
 #: name = "build-and-test (helios)"
 #: variety = "basic"
 #: target = "helios-2.0"
-#: rust_toolchain = "1.77.2"
+#: rust_toolchain = "1.78.0"
 #: output_rules = [
 #:	"%/work/*",
 #:	"%/var/tmp/omicron_tmp/*",

.github/buildomat/jobs/build-and-test-linux.sh

@@ -3,7 +3,7 @@
 #: name = "build-and-test (ubuntu-22.04)"
 #: variety = "basic"
 #: target = "ubuntu-22.04"
-#: rust_toolchain = "1.77.2"
+#: rust_toolchain = "1.78.0"
 #: output_rules = [
 #:	"%/work/*",
 #:	"%/var/tmp/omicron_tmp/*",

.github/buildomat/jobs/clippy.sh

@@ -3,7 +3,7 @@
 #: name = "clippy (helios)"
 #: variety = "basic"
 #: target = "helios-2.0"
-#: rust_toolchain = "1.77.2"
+#: rust_toolchain = "1.78.0"
 #: output_rules = []
 
 # Run clippy on illumos (not just other systems) because a bunch of our code

.github/buildomat/jobs/omicron-common.sh

@@ -3,7 +3,7 @@
 #: name = "omicron-common (helios)"
 #: variety = "basic"
 #: target = "helios-2.0"
-#: rust_toolchain = "1.77.2"
+#: rust_toolchain = "1.78.0"
 #: output_rules = []
 
 # Verify that omicron-common builds successfully when used as a dependency

.github/buildomat/jobs/package.sh

@@ -3,7 +3,7 @@
 #: name = "helios / package"
 #: variety = "basic"
 #: target = "helios-2.0"
-#: rust_toolchain = "1.77.2"
+#: rust_toolchain = "1.78.0"
 #: output_rules = [
 #:	"=/work/package.tar.gz",
 #: ]

.github/buildomat/jobs/tuf-repo.sh

@@ -3,7 +3,7 @@
 #: name = "helios / build TUF repo"
 #: variety = "basic"
 #: target = "helios-2.0"
-#: rust_toolchain = "1.77.2"
+#: rust_toolchain = "1.78.0"
 #: output_rules = [
 #:	"=/work/manifest.toml",
 #:	"=/work/repo.zip",

Cargo.toml

@@ -347,14 +347,14 @@ omicron-sled-agent = { path = "sled-agent" }
 omicron-test-utils = { path = "test-utils" }
 omicron-zone-package = "0.11.0"
 oxide-client = { path = "clients/oxide-client" }
-oxide-vpc = { git = "https://github.com/oxidecomputer/opte", rev = "4cc823b50d3e4a629cdfaab2b3d3382514174ba9", features = [ "api", "std" ] }
+oxide-vpc = { git = "https://github.com/oxidecomputer/opte", rev = "194a8d1d6443f78d59702a25849607dba33db732", features = [ "api", "std" ] }
 once_cell = "1.19.0"
 openapi-lint = { git = "https://github.com/oxidecomputer/openapi-lint", branch = "main" }
 openapiv3 = "2.0.0"
 # must match samael's crate!
 openssl = "0.10"
 openssl-sys = "0.9"
-opte-ioctl = { git = "https://github.com/oxidecomputer/opte", rev = "4cc823b50d3e4a629cdfaab2b3d3382514174ba9" }
+opte-ioctl = { git = "https://github.com/oxidecomputer/opte", rev = "194a8d1d6443f78d59702a25849607dba33db732" }
 oso = "0.27"
 owo-colors = "4.0.0"
 oximeter = { path = "oximeter/oximeter" }

certificates/src/lib.rs

@@ -412,7 +412,7 @@ mod tests {
         // Valid certs: either no key usage values, or valid ones.
         for ext_key_usage in &valid_ext_key_usage {
             let mut params = CertificateParams::new(vec![HOST.to_string()]);
-            params.extended_key_usages = ext_key_usage.clone();
+            params.extended_key_usages.clone_from(ext_key_usage);
 
             assert!(
                 validate_cert_with_params(params, &[HOST]).is_ok(),
@@ -431,7 +431,7 @@ mod tests {
 
         for ext_key_usage in &invalid_ext_key_usage {
             let mut params = CertificateParams::new(vec![HOST.to_string()]);
-            params.extended_key_usages = ext_key_usage.clone();
+            params.extended_key_usages.clone_from(ext_key_usage);
 
             assert!(
                 matches!(

dev-tools/omdb/src/bin/omdb/db.rs

@@ -1273,16 +1273,6 @@ async fn cmd_db_disk_physical(
 
 // SERVICES
 
-#[derive(Tabled)]
-#[tabled(rename_all = "SCREAMING_SNAKE_CASE")]
-struct ServiceInstanceRow {
-    #[tabled(rename = "SERVICE")]
-    kind: String,
-    instance_id: Uuid,
-    addr: String,
-    sled_serial: String,
-}
-
 // Snapshots
 fn format_snapshot(state: &SnapshotState) -> impl Display {
     match state {
@@ -1438,15 +1428,6 @@ async fn cmd_db_snapshot_info(
 
 // SLEDS
 
-#[derive(Tabled)]
-#[tabled(rename_all = "SCREAMING_SNAKE_CASE")]
-struct ServiceInstanceSledRow {
-    #[tabled(rename = "SERVICE")]
-    kind: String,
-    instance_id: Uuid,
-    addr: String,
-}
-
 #[derive(Tabled)]
 #[tabled(rename_all = "SCREAMING_SNAKE_CASE")]
 struct SledRow {

dev-tools/omdb/src/bin/omdb/mgs/dashboard.rs

@@ -101,16 +101,6 @@ trait Attributes: DynClone {
     fn y_axis_label(&self) -> String;
     fn axis_value(&self, val: f64) -> String;
     fn legend_value(&self, val: f64) -> String;
-
-    fn increase(&mut self, _ndx: usize) -> Option<u8> {
-        None
-    }
-
-    fn decrease(&mut self, _ndx: usize) -> Option<u8> {
-        None
-    }
-
-    fn clear(&mut self) {}
 }
 
 dyn_clone::clone_trait_object!(Attributes);

dev-tools/omdb/src/bin/omdb/mgs/sensors.rs

@@ -480,12 +480,10 @@ fn sp_info_csv<R: std::io::Read>(
             }
 
             if let Some(sensor) = Sensor::from_string(&record[1], &record[2]) {
-                if sensors.get(&sensor).is_some() {
+                if !sensors.insert(sensor.clone()) {
                     break;
                 }
 
-                sensors.insert(sensor.clone());
-
                 for (ndx, sp) in sps.iter().enumerate() {
                     if let Some(sp) = sp {
                         let value = match record[ndx + len].parse::<f32>() {

nexus/db-model/src/omicron_zone_config.rs

@@ -92,7 +92,7 @@ impl OmicronZone {
                 let (first_port, last_port) = snat_cfg.port_range_raw();
                 ntp_ntp_servers = Some(ntp_servers.clone());
                 ntp_dns_servers = Some(dns_servers.clone());
-                ntp_ntp_domain = domain.clone();
+                ntp_ntp_domain.clone_from(domain);
                 snat_ip = Some(IpNetwork::from(snat_cfg.ip));
                 snat_first_port = Some(SqlU16::from(first_port));
                 snat_last_port = Some(SqlU16::from(last_port));
@@ -162,7 +162,7 @@ impl OmicronZone {
             } => {
                 ntp_ntp_servers = Some(ntp_servers.clone());
                 ntp_dns_servers = Some(dns_servers.clone());
-                ntp_ntp_domain = domain.clone();
+                ntp_ntp_domain.clone_from(domain);
                 (ZoneType::InternalNtp, address, None)
             }
             OmicronZoneType::Nexus {

nexus/db-queries/src/db/datastore/mod.rs

@@ -984,8 +984,8 @@ mod test {
                 // This is a little goofy, but it catches a bug that has
                 // happened before. The returned columns share names (like
                 // "id"), so we need to process them in-order.
-                assert!(regions.get(&dataset.id()).is_none());
-                assert!(disk_datasets.get(&region.id()).is_none());
+                assert!(!regions.contains(&dataset.id()));
+                assert!(!disk_datasets.contains(&region.id()));
 
                 // Dataset must not be eligible for provisioning.
                 if let Some(kind) =

nexus/db-queries/src/db/explain.rs

@@ -4,6 +4,11 @@
 
 //! Utility allowing Diesel to EXPLAIN queries.
 
+// These utilities can be useful during development, so we don't want to
+// `#[cfg(test)]` the module, but it's likely they won't be used outside of
+// tests.
+#![cfg_attr(not(test), allow(dead_code))]
+
 use super::pool::DbConnection;
 use async_bb8_diesel::AsyncRunQueryDsl;
 use async_trait::async_trait;
@@ -17,33 +22,6 @@ use diesel::result::Error as DieselError;
 /// Q: The Query we're explaining.
 ///
 /// EXPLAIN: <https://www.cockroachlabs.com/docs/stable/explain.html>
-pub trait Explainable<Q> {
-    /// Syncronously issues an explain statement.
-    fn explain(
-        self,
-        conn: &mut DbConnection,
-    ) -> Result<String, diesel::result::Error>;
-}
-
-impl<Q> Explainable<Q> for Q
-where
-    Q: QueryFragment<Pg>
-        + QueryId
-        + RunQueryDsl<DbConnection>
-        + Sized
-        + 'static,
-{
-    fn explain(
-        self,
-        conn: &mut DbConnection,
-    ) -> Result<String, diesel::result::Error> {
-        Ok(ExplainStatement { query: self }
-            .get_results::<String>(conn)?
-            .join("\n"))
-    }
-}
-
-/// An async variant of [`Explainable`].
 #[async_trait]
 pub trait ExplainableAsync<Q> {
     /// Asynchronously issues an explain statement.
@@ -185,7 +163,8 @@ mod test {
         logctx.cleanup_successful();
     }
 
-    // Tests that ".explain()" can tell us when we're doing full table scans.
+    // Tests that ".explain_async()" can tell us when we're doing full table
+    // scans.
     #[tokio::test]
     async fn test_explain_full_table_scan() {
         let logctx = dev::test_setup_log("test_explain_full_table_scan");

nexus/db-queries/src/db/raw_query_builder.rs

@@ -69,18 +69,6 @@ enum TrustedStrVariants {
     ValidatedExplicitly(String),
 }
 
-trait SqlQueryBinds {
-    fn add_bind(self, bind_counter: &BindParamCounter) -> Self;
-}
-
-impl<'a, Query> SqlQueryBinds
-    for diesel::query_builder::BoxedSqlQuery<'a, Pg, Query>
-{
-    fn add_bind(self, bind_counter: &BindParamCounter) -> Self {
-        self.sql("$").sql(bind_counter.next().to_string())
-    }
-}
-
 type BoxedQuery = diesel::query_builder::BoxedSqlQuery<
     'static,
     Pg,

nexus/src/app/background/sync_switch_configuration.rs

@@ -551,7 +551,8 @@ impl BackgroundTask for SwitchPortSettingsManager {
 
                         // Same thing as above, check to see if we've already built the announce set,
                         // if so we'll skip this step
-                        if bgp_announce_prefixes.get(&bgp_config.bgp_announce_set_id).is_none() {
+                        #[allow(clippy::map_entry)]
+                        if !bgp_announce_prefixes.contains_key(&bgp_config.bgp_announce_set_id) {
                             let announcements = match self
                                 .datastore
                                 .bgp_announce_list(

nexus/src/app/sagas/snapshot_create.rs

@@ -1572,12 +1572,9 @@ fn create_snapshot_from_disk(
 
             if let Some(socket_map) = socket_map {
                 for target in &mut opts.target {
-                    *target = socket_map
-                        .get(target)
-                        .ok_or_else(|| {
-                            anyhow!("target {} not found in map!", target)
-                        })?
-                        .clone();
+                    target.clone_from(socket_map.get(target).ok_or_else(
+                        || anyhow!("target {} not found in map!", target),
+                    )?);
                 }
             }
 

oximeter/db/src/oxql/ast/table_ops/group_by.rs

@@ -496,7 +496,7 @@ mod tests {
             )
             .unwrap();
             ts0.points.start_times = None;
-            ts0.points.timestamps = timestamps.clone();
+            ts0.points.timestamps.clone_from(&timestamps);
             *ts0.points.values_mut(0).unwrap() = ValueArray::Double(vec![
                 Some(1.0),
                 if matches!(

oximeter/db/src/oxql/ast/table_ops/limit.rs

@@ -150,7 +150,7 @@ mod tests {
             MetricType::Gauge,
         )
         .unwrap();
-        timeseries.points.timestamps = timestamps.clone();
+        timeseries.points.timestamps.clone_from(&timestamps);
         timeseries.points.values[0].values.as_integer_mut().unwrap().extend([
             Some(1),
             Some(2),
@@ -166,7 +166,7 @@ mod tests {
             MetricType::Gauge,
         )
         .unwrap();
-        timeseries.points.timestamps = timestamps.clone();
+        timeseries.points.timestamps.clone_from(&timestamps);
         timeseries.points.values[0].values.as_integer_mut().unwrap().extend([
             Some(4),
             Some(5),

rust-toolchain.toml

@@ -4,5 +4,5 @@
 #
 # We choose a specific toolchain (rather than "stable") for repeatability.  The
 # intent is to keep this up-to-date with recently-released stable Rust.
-channel = "1.77.2"
+channel = "1.78.0"
 profile = "default"