Skip to content

Commit dac2eb2

Browse files
tconley1428tconley1428
authored
Fix bridge clippy warnings with new rust version (#924)
* Fix bridge clippy warnings with new rust version * Clippy fix on additional change
1 parent 34bb050 commit dac2eb2

File tree

6 files changed

+35
-40
lines changed

6 files changed

+35
-40
lines changed

‎temporalio/bridge/src/client.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ pub fn connect_client<'a>(
8989
.connect_no_namespace(runtime.core.telemetry().get_temporal_metric_meter())
9090
.await
9191
.map_err(|err| {
92-
PyRuntimeError::new_err(format!("Failed client connect: {}", err))
92+
PyRuntimeError::new_err(format!("Failed client connect: {err}"))
9393
})?,
9494
runtime,
9595
})
@@ -518,14 +518,14 @@ impl ClientRef {
518518

519519
fn rpc_req<P: prost::Message + Default>(call: RpcCall) -> PyResult<tonic::Request<P>> {
520520
let proto = P::decode(&*call.req)
521-
.map_err(|err| PyValueError::new_err(format!("Invalid proto: {}", err)))?;
521+
.map_err(|err| PyValueError::new_err(format!("Invalid proto: {err}")))?;
522522
let mut req = tonic::Request::new(proto);
523523
for (k, v) in call.metadata {
524524
req.metadata_mut().insert(
525525
MetadataKey::from_str(k.as_str())
526-
.map_err(|err| PyValueError::new_err(format!("Invalid metadata key: {}", err)))?,
526+
.map_err(|err| PyValueError::new_err(format!("Invalid metadata key: {err}")))?,
527527
v.parse()
528-
.map_err(|err| PyValueError::new_err(format!("Invalid metadata value: {}", err)))?,
528+
.map_err(|err| PyValueError::new_err(format!("Invalid metadata value: {err}")))?,
529529
);
530530
}
531531
if let Some(timeout_millis) = call.timeout_millis {
@@ -561,7 +561,7 @@ impl TryFrom<ClientConfig> for ClientOptions {
561561
gateway_opts
562562
.target_url(
563563
Url::parse(&opts.target_url)
564-
.map_err(|err| PyValueError::new_err(format!("invalid target URL: {}", err)))?,
564+
.map_err(|err| PyValueError::new_err(format!("invalid target URL: {err}")))?,
565565
)
566566
.client_name(opts.client_name)
567567
.client_version(opts.client_version)
@@ -581,7 +581,7 @@ impl TryFrom<ClientConfig> for ClientOptions {
581581
}
582582
gateway_opts
583583
.build()
584-
.map_err(|err| PyValueError::new_err(format!("Invalid client config: {}", err)))
584+
.map_err(|err| PyValueError::new_err(format!("Invalid client config: {err}")))
585585
}
586586
}
587587

‎temporalio/bridge/src/envconfig.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ fn load_client_config_inner(
100100
config_file_strict,
101101
};
102102
core_load_client_config(options, env_vars.as_ref())
103-
.map_err(|e| ConfigError::new_err(format!("{}", e)))?
103+
.map_err(|e| ConfigError::new_err(format!("{e}")))?
104104
};
105105

106106
core_config_to_dict(py, &core_config)
@@ -124,7 +124,7 @@ fn load_client_connect_config_inner(
124124
};
125125

126126
let profile = core_load_client_config_profile(options, env_vars.as_ref())
127-
.map_err(|e| ConfigError::new_err(format!("{}", e)))?;
127+
.map_err(|e| ConfigError::new_err(format!("{e}")))?;
128128

129129
profile_to_dict(py, &profile)
130130
}

‎temporalio/bridge/src/metric.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,7 @@ fn metric_key_value_from_py(
255255
metrics::MetricValue::Float(v)
256256
} else {
257257
return Err(PyTypeError::new_err(format!(
258-
"Invalid value type for key {}, must be str, int, float, or bool",
259-
k
258+
"Invalid value type for key {k}, must be str, int, float, or bool"
260259
)));
261260
};
262261
Ok(metrics::MetricKeyValue::new(k, val))

‎temporalio/bridge/src/runtime.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,10 @@ pub fn init_runtime(telemetry_config: TelemetryConfig) -> PyResult<RuntimeRef> {
124124
let mut core = CoreRuntime::new(
125125
telemetry_build
126126
.build()
127-
.map_err(|err| PyValueError::new_err(format!("Invalid telemetry config: {}", err)))?,
127+
.map_err(|err| PyValueError::new_err(format!("Invalid telemetry config: {err}")))?,
128128
TokioRuntimeBuilder::default(),
129129
)
130-
.map_err(|err| PyRuntimeError::new_err(format!("Failed initializing telemetry: {}", err)))?;
130+
.map_err(|err| PyRuntimeError::new_err(format!("Failed initializing telemetry: {err}")))?;
131131

132132
// We late-bind the metrics after core runtime is created since it needs
133133
// the Tokio handle
@@ -314,7 +314,7 @@ impl TryFrom<MetricsConfig> for Arc<dyn CoreMeter> {
314314
build
315315
.url(
316316
Url::parse(&otel_conf.url).map_err(|err| {
317-
PyValueError::new_err(format!("Invalid OTel URL: {}", err))
317+
PyValueError::new_err(format!("Invalid OTel URL: {err}"))
318318
})?,
319319
)
320320
.headers(otel_conf.headers)
@@ -333,17 +333,17 @@ impl TryFrom<MetricsConfig> for Arc<dyn CoreMeter> {
333333
}
334334
let otel_options = build
335335
.build()
336-
.map_err(|err| PyValueError::new_err(format!("Invalid OTel config: {}", err)))?;
336+
.map_err(|err| PyValueError::new_err(format!("Invalid OTel config: {err}")))?;
337337
Ok(Arc::new(build_otlp_metric_exporter(otel_options).map_err(
338-
|err| PyValueError::new_err(format!("Failed building OTel exporter: {}", err)),
338+
|err| PyValueError::new_err(format!("Failed building OTel exporter: {err}")),
339339
)?))
340340
} else if let Some(prom_conf) = conf.prometheus {
341341
// Start prom exporter
342342
let mut build = PrometheusExporterOptionsBuilder::default();
343343
build
344344
.socket_addr(
345345
SocketAddr::from_str(&prom_conf.bind_address).map_err(|err| {
346-
PyValueError::new_err(format!("Invalid Prometheus address: {}", err))
346+
PyValueError::new_err(format!("Invalid Prometheus address: {err}"))
347347
})?,
348348
)
349349
.counters_total_suffix(prom_conf.counters_total_suffix)
@@ -358,11 +358,11 @@ impl TryFrom<MetricsConfig> for Arc<dyn CoreMeter> {
358358
);
359359
}
360360
let prom_options = build.build().map_err(|err| {
361-
PyValueError::new_err(format!("Invalid Prometheus config: {}", err))
361+
PyValueError::new_err(format!("Invalid Prometheus config: {err}"))
362362
})?;
363363
Ok(start_prometheus_metric_exporter(prom_options)
364364
.map_err(|err| {
365-
PyValueError::new_err(format!("Failed starting Prometheus exporter: {}", err))
365+
PyValueError::new_err(format!("Failed starting Prometheus exporter: {err}"))
366366
})?
367367
.meter)
368368
} else {

‎temporalio/bridge/src/testing.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ pub fn start_dev_server<'a>(
5252
runtime_ref.runtime.future_into_py(py, async move {
5353
Ok(EphemeralServerRef {
5454
server: Some(opts.start_server().await.map_err(|err| {
55-
PyRuntimeError::new_err(format!("Failed starting Temporal dev server: {}", err))
55+
PyRuntimeError::new_err(format!("Failed starting Temporal dev server: {err}"))
5656
})?),
5757
runtime,
5858
})
@@ -69,7 +69,7 @@ pub fn start_test_server<'a>(
6969
runtime_ref.runtime.future_into_py(py, async move {
7070
Ok(EphemeralServerRef {
7171
server: Some(opts.start_server().await.map_err(|err| {
72-
PyRuntimeError::new_err(format!("Failed starting test server: {}", err))
72+
PyRuntimeError::new_err(format!("Failed starting test server: {err}"))
7373
})?),
7474
runtime,
7575
})
@@ -101,7 +101,7 @@ impl EphemeralServerRef {
101101
self.runtime.future_into_py(py, async move {
102102
if let Some(mut server) = server {
103103
server.shutdown().await.map_err(|err| {
104-
PyRuntimeError::new_err(format!("Failed shutting down Temporalite: {}", err))
104+
PyRuntimeError::new_err(format!("Failed shutting down Temporalite: {err}"))
105105
})?;
106106
}
107107
Ok(())
@@ -138,7 +138,7 @@ impl TryFrom<DevServerConfig> for ephemeral_server::TemporalDevServerConfig {
138138
.log((conf.log_format, conf.log_level))
139139
.extra_args(conf.extra_args)
140140
.build()
141-
.map_err(|err| PyValueError::new_err(format!("Invalid Temporalite config: {}", err)))
141+
.map_err(|err| PyValueError::new_err(format!("Invalid Temporalite config: {err}")))
142142
}
143143
}
144144

@@ -166,6 +166,6 @@ impl TryFrom<TestServerConfig> for ephemeral_server::TestServerConfig {
166166
.port(conf.port)
167167
.extra_args(conf.extra_args)
168168
.build()
169-
.map_err(|err| PyValueError::new_err(format!("Invalid test server config: {}", err)))
169+
.map_err(|err| PyValueError::new_err(format!("Invalid test server config: {err}")))
170170
}
171171
}

‎temporalio/bridge/src/worker.rs‎

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -366,8 +366,7 @@ impl<SK: SlotKind + Send + Sync> SlotSupplierTrait for CustomSlotSupplierOfType<
366366
Ok(f) => f,
367367
Err(e) => {
368368
error!(
369-
"Unexpected error in custom slot supplier `reserve_slot`: {}",
370-
e
369+
"Unexpected error in custom slot supplier `reserve_slot`: {e}"
371370
);
372371
continue;
373372
}
@@ -402,8 +401,7 @@ impl<SK: SlotKind + Send + Sync> SlotSupplierTrait for CustomSlotSupplierOfType<
402401
})
403402
.unwrap_or_else(|e| {
404403
error!(
405-
"Uncaught error in custom slot supplier `try_reserve_slot`: {}",
406-
e
404+
"Uncaught error in custom slot supplier `try_reserve_slot`: {e}"
407405
);
408406
None
409407
})
@@ -427,8 +425,7 @@ impl<SK: SlotKind + Send + Sync> SlotSupplierTrait for CustomSlotSupplierOfType<
427425
PyResult::Ok(())
428426
}) {
429427
error!(
430-
"Uncaught error in custom slot supplier `mark_slot_used`: {}",
431-
e
428+
"Uncaught error in custom slot supplier `mark_slot_used`: {e}"
432429
);
433430
}
434431
}
@@ -450,8 +447,7 @@ impl<SK: SlotKind + Send + Sync> SlotSupplierTrait for CustomSlotSupplierOfType<
450447
PyResult::Ok(())
451448
}) {
452449
error!(
453-
"Uncaught error in custom slot supplier `release_slot`: {}",
454-
e
450+
"Uncaught error in custom slot supplier `release_slot`: {e}"
455451
);
456452
}
457453
}
@@ -509,7 +505,7 @@ pub fn new_replay_worker<'a>(
509505
let worker = WorkerRef {
510506
worker: Some(Arc::new(
511507
temporal_sdk_core::init_replay_worker(ReplayWorkerInput::new(config, stream)).map_err(
512-
|err| PyValueError::new_err(format!("Failed creating replay worker: {}", err)),
508+
|err| PyValueError::new_err(format!("Failed creating replay worker: {err}")),
513509
)?,
514510
)),
515511
event_loop_task_locals: Default::default(),
@@ -551,7 +547,7 @@ impl WorkerRef {
551547
let bytes = match worker.poll_workflow_activation().await {
552548
Ok(act) => act.encode_to_vec(),
553549
Err(PollError::ShutDown) => return Err(PollShutdownError::new_err(())),
554-
Err(err) => return Err(PyRuntimeError::new_err(format!("Poll failure: {}", err))),
550+
Err(err) => return Err(PyRuntimeError::new_err(format!("Poll failure: {err}"))),
555551
};
556552
Ok(bytes)
557553
})
@@ -563,7 +559,7 @@ impl WorkerRef {
563559
let bytes = match worker.poll_activity_task().await {
564560
Ok(task) => task.encode_to_vec(),
565561
Err(PollError::ShutDown) => return Err(PollShutdownError::new_err(())),
566-
Err(err) => return Err(PyRuntimeError::new_err(format!("Poll failure: {}", err))),
562+
Err(err) => return Err(PyRuntimeError::new_err(format!("Poll failure: {err}"))),
567563
};
568564
Ok(bytes)
569565
})
@@ -576,7 +572,7 @@ impl WorkerRef {
576572
) -> PyResult<Bound<'p, PyAny>> {
577573
let worker = self.worker.as_ref().unwrap().clone();
578574
let completion = WorkflowActivationCompletion::decode(proto.as_bytes())
579-
.map_err(|err| PyValueError::new_err(format!("Invalid proto: {}", err)))?;
575+
.map_err(|err| PyValueError::new_err(format!("Invalid proto: {err}")))?;
580576
self.runtime.future_into_py(py, async move {
581577
worker
582578
.complete_workflow_activation(completion)
@@ -593,7 +589,7 @@ impl WorkerRef {
593589
) -> PyResult<Bound<'p, PyAny>> {
594590
let worker = self.worker.as_ref().unwrap().clone();
595591
let completion = ActivityTaskCompletion::decode(proto.as_bytes())
596-
.map_err(|err| PyValueError::new_err(format!("Invalid proto: {}", err)))?;
592+
.map_err(|err| PyValueError::new_err(format!("Invalid proto: {err}")))?;
597593
self.runtime.future_into_py(py, async move {
598594
worker
599595
.complete_activity_task(completion)
@@ -606,7 +602,7 @@ impl WorkerRef {
606602
fn record_activity_heartbeat(&self, proto: &Bound<'_, PyBytes>) -> PyResult<()> {
607603
enter_sync!(self.runtime);
608604
let heartbeat = ActivityHeartbeat::decode(proto.as_bytes())
609-
.map_err(|err| PyValueError::new_err(format!("Invalid proto: {}", err)))?;
605+
.map_err(|err| PyValueError::new_err(format!("Invalid proto: {err}")))?;
610606
self.worker
611607
.as_ref()
612608
.unwrap()
@@ -701,7 +697,7 @@ fn convert_worker_config(
701697
.collect::<HashMap<String, HashSet<WorkflowErrorType>>>(),
702698
)
703699
.build()
704-
.map_err(|err| PyValueError::new_err(format!("Invalid worker config: {}", err)))
700+
.map_err(|err| PyValueError::new_err(format!("Invalid worker config: {err}")))
705701
}
706702

707703
fn convert_tuner_holder(
@@ -770,7 +766,7 @@ fn convert_tuner_holder(
770766
)?);
771767
Ok(options
772768
.build()
773-
.map_err(|e| PyValueError::new_err(format!("Invalid tuner holder options: {}", e)))?
769+
.map_err(|e| PyValueError::new_err(format!("Invalid tuner holder options: {e}")))?
774770
.build_tuner_holder()
775771
.context("Failed building tuner holder")?)
776772
}
@@ -863,7 +859,7 @@ impl HistoryPusher {
863859
history_proto: &Bound<'_, PyBytes>,
864860
) -> PyResult<Bound<'p, PyAny>> {
865861
let history = History::decode(history_proto.as_bytes())
866-
.map_err(|err| PyValueError::new_err(format!("Invalid proto: {}", err)))?;
862+
.map_err(|err| PyValueError::new_err(format!("Invalid proto: {err}")))?;
867863
let wfid = workflow_id.to_string();
868864
let tx = if let Some(tx) = self.tx.as_ref() {
869865
tx.clone()

0 commit comments

Comments
 (0)