Fix cargo clippy warnings

def- · def- · commit c58b2ebb275b · 2025-12-08T17:22:43.000Z
diff --git a/src/adapter/src/catalog/state.rs b/src/adapter/src/catalog/state.rs
@@ -994,7 +994,7 @@ impl CatalogState {
         let (stmt, resolved_ids) = mz_sql::names::resolve(catalog, stmt)?;
         let plan = mz_sql::plan::plan(pcx, catalog, stmt, &Params::empty(), &resolved_ids)?;
 
-        return Ok((plan, resolved_ids));
+        Ok((plan, resolved_ids))
     }
 
     /// Parses the given SQL string into a pair of [`CatalogItem`].
diff --git a/src/adapter/src/coord.rs b/src/adapter/src/coord.rs
@@ -2612,7 +2612,7 @@ impl Coordinator {
     /// table.
     #[instrument]
     fn bootstrap_audit_log_table<'a>(
-        &mut self,
+        &self,
         table_id: CatalogItemId,
         name: &'a QualifiedItemName,
         table: &'a Table,
diff --git a/src/adapter/src/coord/catalog_implications.rs b/src/adapter/src/coord/catalog_implications.rs
@@ -156,7 +156,7 @@ impl Coordinator {
     #[instrument(level = "debug")]
     async fn apply_catalog_implications_inner(
         &mut self,
-        mut ctx: Option<&mut ExecuteContext>,
+        ctx: Option<&mut ExecuteContext>,
         implications: Vec<(CatalogItemId, CatalogImplication)>,
         cluster_commands: Vec<(ClusterId, CatalogImplication)>,
         cluster_replica_commands: Vec<((ClusterId, ReplicaId), CatalogImplication)>,
@@ -203,7 +203,7 @@ impl Coordinator {
             match implication {
                 CatalogImplication::Table(CatalogImplicationKind::Added(table)) => {
                     self.handle_create_table(
-                        &mut ctx,
+                        &ctx,
                         &mut table_collections_to_create,
                         &mut storage_policies_to_initialize,
                         &mut execution_timestamps_to_set,
@@ -900,8 +900,8 @@ impl Coordinator {
 
     #[instrument(level = "debug")]
     async fn handle_create_table(
-        &mut self,
-        ctx: &mut Option<&mut ExecuteContext>,
+        &self,
+        ctx: &Option<&mut ExecuteContext>,
         storage_collections_to_create: &mut BTreeMap<GlobalId, CollectionDescription<Timestamp>>,
         storage_policies_to_initialize: &mut BTreeMap<CompactionWindow, BTreeSet<GlobalId>>,
         execution_timestamps_to_set: &mut BTreeSet<StatementLoggingId>,
@@ -1155,7 +1155,7 @@ impl Coordinator {
 
     #[instrument(level = "debug")]
     async fn handle_create_source(
-        &mut self,
+        &self,
         storage_collections_to_create: &mut BTreeMap<GlobalId, CollectionDescription<Timestamp>>,
         storage_policies_to_initialize: &mut BTreeMap<CompactionWindow, BTreeSet<GlobalId>>,
         item_id: CatalogItemId,
diff --git a/src/adapter/src/coord/cluster_scheduling.rs b/src/adapter/src/coord/cluster_scheduling.rs
@@ -109,7 +109,7 @@ impl SchedulingDecision {
 impl Coordinator {
     #[mz_ore::instrument(level = "debug")]
     /// Call each scheduling policy.
-    pub(crate) async fn check_scheduling_policies(&mut self) {
+    pub(crate) async fn check_scheduling_policies(&self) {
         // (So far, we have only this one policy.)
         self.check_refresh_policy();
     }
diff --git a/src/adapter/src/coord/command_handler.rs b/src/adapter/src/coord/command_handler.rs
@@ -444,7 +444,7 @@ impl Coordinator {
 
     #[mz_ore::instrument(level = "debug")]
     async fn handle_generate_sasl_challenge(
-        &mut self,
+        &self,
         tx: oneshot::Sender<Result<SASLChallengeResponse, AdapterError>>,
         role_name: String,
         client_nonce: String,
@@ -521,7 +521,7 @@ impl Coordinator {
 
     #[mz_ore::instrument(level = "debug")]
     async fn handle_authenticate_password(
-        &mut self,
+        &self,
         tx: oneshot::Sender<Result<AuthResponse, AdapterError>>,
         role_name: String,
         password: Option<Password>,
diff --git a/src/adapter/src/coord/ddl.rs b/src/adapter/src/coord/ddl.rs
@@ -290,7 +290,7 @@ impl Coordinator {
     /// called after this function successfully returns on any built
     /// [`DataflowDesc`](mz_compute_types::dataflows::DataflowDesc).
     #[instrument(name = "coord::catalog_transact_inner")]
-    pub(crate) async fn catalog_transact_inner<'a>(
+    pub(crate) async fn catalog_transact_inner(
         &mut self,
         conn_id: Option<&ConnectionId>,
         ops: Vec<catalog::Op>,
diff --git a/src/adapter/src/coord/message_handler.rs b/src/adapter/src/coord/message_handler.rs
@@ -207,7 +207,7 @@ impl Coordinator {
     }
 
     #[mz_ore::instrument(level = "debug")]
-    pub async fn storage_usage_fetch(&mut self) {
+    pub async fn storage_usage_fetch(&self) {
         let internal_cmd_tx = self.internal_cmd_tx.clone();
         let client = self.storage_usage_client.clone();
 
diff --git a/src/adapter/src/coord/sequencer.rs b/src/adapter/src/coord/sequencer.rs
@@ -542,7 +542,7 @@ impl Coordinator {
                 }
                 Plan::AlterMaterializedViewApplyReplacement(plan) => {
                     let result = self
-                        .sequence_alter_materialized_view_apply_replacement(&mut ctx, plan)
+                        .sequence_alter_materialized_view_apply_replacement(&ctx, plan)
                         .await;
                     ctx.retire(result);
                 }
diff --git a/src/adapter/src/coord/sequencer/inner.rs b/src/adapter/src/coord/sequencer/inner.rs
@@ -838,7 +838,7 @@ impl Coordinator {
     #[instrument]
     pub(super) async fn sequence_create_database(
         &mut self,
-        session: &mut Session,
+        session: &Session,
         plan: plan::CreateDatabasePlan,
     ) -> Result<ExecuteResponse, AdapterError> {
         let ops = vec![catalog::Op::CreateDatabase {
@@ -861,7 +861,7 @@ impl Coordinator {
     #[instrument]
     pub(super) async fn sequence_create_schema(
         &mut self,
-        session: &mut Session,
+        session: &Session,
         plan: plan::CreateSchemaPlan,
     ) -> Result<ExecuteResponse, AdapterError> {
         let op = catalog::Op::CreateSchema {
@@ -3644,7 +3644,7 @@ impl Coordinator {
     #[instrument]
     pub(crate) async fn sequence_alter_connection_stage_finish(
         &mut self,
-        session: &mut Session,
+        session: &Session,
         id: CatalogItemId,
         connection: Connection,
     ) -> Result<ExecuteResponse, AdapterError> {
@@ -4251,7 +4251,7 @@ impl Coordinator {
     // Returns the name of the portal to execute.
     #[instrument]
     pub(super) fn sequence_execute(
-        &mut self,
+        &self,
         session: &mut Session,
         plan: plan::ExecutePlan,
     ) -> Result<String, AdapterError> {
@@ -4703,7 +4703,7 @@ impl Coordinator {
     #[instrument]
     pub(super) async fn sequence_alter_materialized_view_apply_replacement(
         &mut self,
-        ctx: &mut ExecuteContext,
+        ctx: &ExecuteContext,
         plan: AlterMaterializedViewApplyReplacementPlan,
     ) -> Result<ExecuteResponse, AdapterError> {
         let AlterMaterializedViewApplyReplacementPlan { id, replacement_id } = plan;
diff --git a/src/adapter/src/coord/sequencer/inner/cluster.rs b/src/adapter/src/coord/sequencer/inner/cluster.rs
@@ -129,7 +129,7 @@ impl Coordinator {
 
     #[instrument]
     async fn alter_cluster_validate(
-        &mut self,
+        &self,
         session: &Session,
         plan: plan::AlterClusterPlan,
     ) -> Result<ClusterStage, AdapterError> {
diff --git a/src/adapter/src/coord/sequencer/inner/create_index.rs b/src/adapter/src/coord/sequencer/inner/create_index.rs
@@ -188,7 +188,7 @@ impl Coordinator {
 
     #[instrument]
     pub(crate) fn explain_index(
-        &mut self,
+        &self,
         ctx: &ExecuteContext,
         plan::ExplainPlanPlan {
             stage,
@@ -277,7 +277,7 @@ impl Coordinator {
     // sequencing an EXPLAIN for this statement.
     #[instrument]
     fn create_index_validate(
-        &mut self,
+        &self,
         plan: plan::CreateIndexPlan,
         resolved_ids: ResolvedIds,
         explain_ctx: ExplainContext,
@@ -528,7 +528,7 @@ impl Coordinator {
 
     #[instrument]
     async fn create_index_explain(
-        &mut self,
+        &self,
         session: &Session,
         CreateIndexExplain {
             exported_index_id,
diff --git a/src/adapter/src/coord/sequencer/inner/create_materialized_view.rs b/src/adapter/src/coord/sequencer/inner/create_materialized_view.rs
@@ -216,7 +216,7 @@ impl Coordinator {
 
     #[instrument]
     pub(super) fn explain_materialized_view(
-        &mut self,
+        &self,
         ctx: &ExecuteContext,
         plan::ExplainPlanPlan {
             stage,
@@ -315,7 +315,7 @@ impl Coordinator {
 
     #[instrument]
     fn create_materialized_view_validate(
-        &mut self,
+        &self,
         session: &Session,
         plan: plan::CreateMaterializedViewPlan,
         resolved_ids: ResolvedIds,
@@ -868,7 +868,7 @@ impl Coordinator {
 
     #[instrument]
     async fn create_materialized_view_explain(
-        &mut self,
+        &self,
         session: &Session,
         CreateMaterializedViewExplain {
             global_id,
diff --git a/src/adapter/src/coord/sequencer/inner/create_view.rs b/src/adapter/src/coord/sequencer/inner/create_view.rs
@@ -188,7 +188,7 @@ impl Coordinator {
 
     #[instrument]
     pub(crate) fn explain_view(
-        &mut self,
+        &self,
         ctx: &ExecuteContext,
         plan::ExplainPlanPlan {
             stage,
@@ -242,7 +242,7 @@ impl Coordinator {
 
     #[instrument]
     fn create_view_validate(
-        &mut self,
+        &self,
         plan: plan::CreateViewPlan,
         resolved_ids: ResolvedIds,
         // An optional context set iff the state machine is initiated from
@@ -437,7 +437,7 @@ impl Coordinator {
 
     #[instrument]
     async fn create_view_explain(
-        &mut self,
+        &self,
         session: &Session,
         CreateViewExplain {
             id,
diff --git a/src/adapter/src/coord/sequencer/inner/peek.rs b/src/adapter/src/coord/sequencer/inner/peek.rs
@@ -925,7 +925,7 @@ impl Coordinator {
 
     #[instrument]
     async fn peek_copy_to_preflight(
-        &mut self,
+        &self,
         copy_to: PeekStageCopyTo,
     ) -> Result<StageResult<Box<PeekStage>>, AdapterError> {
         let connection_context = self.connection_context().clone();
diff --git a/src/adapter/src/coord/sequencer/inner/secret.rs b/src/adapter/src/coord/sequencer/inner/secret.rs
@@ -93,7 +93,7 @@ impl Coordinator {
 
     #[instrument]
     async fn create_secret_validate(
-        &mut self,
+        &self,
         session: &Session,
         plan: plan::CreateSecretPlan,
     ) -> Result<SecretStage, AdapterError> {
@@ -265,7 +265,7 @@ impl Coordinator {
 
     #[instrument]
     fn alter_secret(
-        &mut self,
+        &self,
         session: &Session,
         plan: plan::AlterSecretPlan,
     ) -> Result<StageResult<Box<SecretStage>>, AdapterError> {
@@ -304,7 +304,7 @@ impl Coordinator {
 
     #[instrument]
     fn rotate_keys_ensure(
-        &mut self,
+        &self,
         RotateKeysSecretEnsure { validity, id }: RotateKeysSecretEnsure,
     ) -> Result<StageResult<Box<SecretStage>>, AdapterError> {
         let secrets_controller = Arc::clone(&self.secrets_controller);
diff --git a/src/adapter/src/coord/sequencer/inner/subscribe.rs b/src/adapter/src/coord/sequencer/inner/subscribe.rs
@@ -85,7 +85,7 @@ impl Coordinator {
 
     #[instrument]
     fn subscribe_validate(
-        &mut self,
+        &self,
         session: &mut Session,
         plan: plan::SubscribePlan,
         target_cluster: TargetCluster,
@@ -171,7 +171,7 @@ impl Coordinator {
 
     #[instrument]
     fn subscribe_optimize_mir(
-        &mut self,
+        &self,
         session: &Session,
         SubscribeOptimizeMir {
             mut validity,
diff --git a/src/catalog/src/durable/persist.rs b/src/catalog/src/durable/persist.rs
@@ -856,9 +856,7 @@ impl<U: ApplyUpdate<StateUpdateKind>> PersistHandle<StateUpdateKind, U> {
     ///
     /// The output is consolidated and sorted by timestamp in ascending order.
     #[mz_ore::instrument(level = "debug")]
-    async fn persist_snapshot(
-        &mut self,
-    ) -> impl Iterator<Item = StateUpdate> + DoubleEndedIterator {
+    async fn persist_snapshot(&self) -> impl Iterator<Item = StateUpdate> + DoubleEndedIterator {
         let mut read_handle = self.read_handle().await;
         let as_of = as_of(&read_handle, self.upper);
         let snapshot = snapshot_binary(&mut read_handle, as_of, &self.metrics)
diff --git a/src/compute-client/src/controller/instance.rs b/src/compute-client/src/controller/instance.rs
@@ -947,17 +947,6 @@ impl<T: ComputeControllerTimestamp> Instance<T> {
         Ok(all_hydrated)
     }
 
-    /// Returns `true` if all non-transient, non-excluded collections are hydrated on at least one
-    /// replica.
-    ///
-    /// This also returns `true` in case this cluster does not have any
-    /// replicas.
-    #[mz_ore::instrument(level = "debug")]
-    pub fn collections_hydrated(&self, exclude_collections: &BTreeSet<GlobalId>) -> bool {
-        self.collections_hydrated_on_replicas(None, exclude_collections)
-            .expect("Cannot error if target_replica_ids is None")
-    }
-
     /// Clean up collection state that is not needed anymore.
     ///
     /// Three conditions need to be true before we can remove state for a collection:
diff --git a/src/compute-client/src/controller/replica.rs b/src/compute-client/src/controller/replica.rs
@@ -293,7 +293,7 @@ where
 
     /// Update task state according to an observed command.
     #[mz_ore::instrument(level = "debug")]
-    fn observe_command(&mut self, command: &ComputeCommand<T>) {
+    fn observe_command(&self, command: &ComputeCommand<T>) {
         if let ComputeCommand::Peek(peek) = command {
             peek.otel_ctx.attach_as_parent();
         }
@@ -309,7 +309,7 @@ where
 
     /// Update task state according to an observed response.
     #[mz_ore::instrument(level = "debug")]
-    fn observe_response(&mut self, response: &ComputeResponse<T>) {
+    fn observe_response(&self, response: &ComputeResponse<T>) {
         if let ComputeResponse::PeekResponse(_, _, otel_ctx) = response {
             otel_ctx.attach_as_parent();
         }
diff --git a/src/ore-proc/tests/instrument.rs b/src/ore-proc/tests/instrument.rs
@@ -10,10 +10,10 @@
 use mz_ore_proc::instrument;
 
 #[instrument(name = "my_span", level = "trace", ret, fields(next = 1, shard = %"abc"))]
-fn test_instrument() {}
+pub fn test_instrument() {}
 
 #[instrument]
-fn test_instrument_skipall() {}
+pub fn test_instrument_skipall() {}
 
 #[instrument]
-async fn test_instrument_async() {}
+pub async fn test_instrument_async() {}
diff --git a/src/repr/src/explain/tracing.rs b/src/repr/src/explain/tracing.rs
@@ -442,19 +442,19 @@ mod test {
     #[instrument(level = "info", name = "logical")]
     fn logical_optimizer(plan: &mut String) {
         some_optimization(plan);
-        let _ = plan.replace("RawPlan", "LogicalPlan");
+        *plan = plan.replace("RawPlan", "LogicalPlan");
         trace_plan(plan);
     }
 
     #[instrument(level = "info", name = "physical")]
     fn physical_optimizer(plan: &mut String) {
-        let _ = plan.replace("LogicalPlan", "PhysicalPlan");
+        *plan = plan.replace("LogicalPlan", "PhysicalPlan");
         trace_plan(plan);
     }
 
     #[mz_ore::instrument(level = "debug", fields(path.segment ="my_optimization"))]
     fn some_optimization(plan: &mut String) {
-        let _ = plan.replace("42", "47");
+        *plan = plan.replace("42", "47");
         trace_plan(plan);
     }
 
diff --git a/src/storage-client/src/storage_collections.rs b/src/storage-client/src/storage_collections.rs
@@ -3026,7 +3026,7 @@ where
     }
 
     #[instrument(level = "debug")]
-    async fn update_write_frontiers(&mut self, updates: &[(GlobalId, &Antichain<T>)]) {
+    async fn update_write_frontiers(&self, updates: &[(GlobalId, &Antichain<T>)]) {
         let mut read_capability_changes = BTreeMap::default();
 
         let mut self_collections = self.collections.lock().expect("lock poisoned");

Original file line number	Diff line number	Diff line change
`@@ -994,7 +994,7 @@ impl CatalogState {`
`994`	`994`	`let (stmt, resolved_ids) = mz_sql::names::resolve(catalog, stmt)?;`
`995`	`995`	`let plan = mz_sql::plan::plan(pcx, catalog, stmt, &Params::empty(), &resolved_ids)?;`
`996`	`996`
`997`		`- return Ok((plan, resolved_ids));`
	`997`	`+ Ok((plan, resolved_ids))`
`998`	`998`	`}`
`999`	`999`
`1000`	`1000`	/// Parses the given SQL string into a pair of [`CatalogItem`].
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ impl SchedulingDecision {`
`109`	`109`	`impl Coordinator {`
`110`	`110`	`#[mz_ore::instrument(level = "debug")]`
`111`	`111`	`/// Call each scheduling policy.`
`112`		`- pub(crate) async fn check_scheduling_policies(&mut self) {`
	`112`	`+ pub(crate) async fn check_scheduling_policies(&self) {`
`113`	`113`	`// (So far, we have only this one policy.)`
`114`	`114`	`self.check_refresh_policy();`
`115`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ impl Coordinator {`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`#[mz_ore::instrument(level = "debug")]`
`210`		`- pub async fn storage_usage_fetch(&mut self) {`
	`210`	`+ pub async fn storage_usage_fetch(&self) {`
`211`	`211`	`let internal_cmd_tx = self.internal_cmd_tx.clone();`
`212`	`212`	`let client = self.storage_usage_client.clone();`
`213`	`213`
Original file line number	Diff line number	Diff line change
`@@ -542,7 +542,7 @@ impl Coordinator {`
`542`	`542`	`}`
`543`	`543`	`Plan::AlterMaterializedViewApplyReplacement(plan) => {`
`544`	`544`	`let result = self`
`545`		`- .sequence_alter_materialized_view_apply_replacement(&mut ctx, plan)`
	`545`	`+ .sequence_alter_materialized_view_apply_replacement(&ctx, plan)`
`546`	`546`	`.await;`
`547`	`547`	`ctx.retire(result);`
`548`	`548`	`}`