Skip to content

Commit d9f3d06

Browse files
argerusSebastianSchildt
argerus
authored and
SebastianSchildt
committed
Fix clippy::uninlined_format_args lint
https://rust-lang.github.io/rust-clippy/master/#uninlined_format_args This lint was promoted from "pedantic" in Rust 1.67.0. It was subsequently [demoted to "pedantic" again](rust-lang/rust#107743) in 1.67.1, so one solution would be to just use another version for now. It does however seem likely that it will be reintroduced at some point, so applying the fix. rust-lang/rust-clippy#10265
1 parent e6952a2 commit d9f3d06

File tree

11 files changed

+65
-95
lines changed

11 files changed

+65
-95
lines changed

‎databroker-cli/src/main.rs

Lines changed: 21 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ async fn connect(
9494
}
9595
Err(err) => {
9696
set_disconnected_prompt(interface);
97-
writeln!(interface, "{}", err).unwrap();
97+
writeln!(interface, "{err}").unwrap();
9898
None
9999
}
100100
}
@@ -132,7 +132,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
132132

133133
let addr = std::env::var("KUKSA_DATA_BROKER_ADDR").unwrap_or_else(|_| "127.0.0.1".to_owned());
134134
let port = std::env::var("KUKSA_DATA_BROKER_PORT").unwrap_or_else(|_| "55555".to_owned());
135-
let mut uri = match addr_to_uri(format!("{}:{}", addr, port)) {
135+
let mut uri = match addr_to_uri(format!("{addr}:{port}")) {
136136
Some(uri) => uri,
137137
None => return Err(Box::new(ParseError {}).into()),
138138
};
@@ -154,10 +154,10 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
154154
let (cmd, args) = split_first_word(&line);
155155
match cmd {
156156
"help" => {
157-
println!("{} commands:", APP_NAME);
157+
println!("{APP_NAME} commands:");
158158
println!();
159159
for &(cmd, help) in CLI_COMMANDS {
160-
println!(" {:15} - {}", cmd, help);
160+
println!(" {cmd:15} - {help}");
161161
}
162162
println!();
163163
}
@@ -270,15 +270,11 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
270270
) {
271271
Some(error) => {
272272
println!(
273-
"-> Error setting id {}: {:?}",
274-
id, error
273+
"-> Error setting id {id}: {error:?}"
275274
)
276275
}
277276
None => {
278-
println!(
279-
"-> Error setting id {}",
280-
id
281-
)
277+
println!("-> Error setting id {id}")
282278
}
283279
}
284280
}
@@ -367,15 +363,11 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
367363
) {
368364
Some(error) => {
369365
println!(
370-
"-> Error setting id {}: {:?}",
371-
id, error
366+
"-> Error setting id {id}: {error:?}"
372367
)
373368
}
374369
None => {
375-
println!(
376-
"-> Error setting id {}",
377-
id
378-
)
370+
println!("-> Error setting id {id}")
379371
}
380372
}
381373
}
@@ -417,8 +409,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
417409
tonic::Request::new(proto::v1::SubscribeRequest { query });
418410
match client.subscribe(args).await {
419411
Ok(response) => {
420-
let sub_id =
421-
format!("subscription{}", subscription_nbr);
412+
let sub_id = format!("subscription{subscription_nbr}");
422413
subscription_nbr += 1;
423414
tokio::spawn(async move {
424415
let mut stream = response.into_inner();
@@ -441,8 +432,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
441432
}
442433
writeln!(
443434
iface,
444-
"-> {}:\n{}",
445-
sub_id, output
435+
"-> {sub_id}:\n{output}"
446436
)
447437
.unwrap();
448438
}
@@ -531,7 +521,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
531521
break;
532522
}
533523
ReadResult::Signal(sig) => {
534-
println!("received signal: {:?}", sig);
524+
println!("received signal: {sig:?}");
535525
}
536526
}
537527
}
@@ -778,9 +768,9 @@ where
778768
let real_delimiter = ", ";
779769
let mut delimiter = "";
780770
for value in array {
781-
write!(f, "{}", delimiter)?;
771+
write!(f, "{delimiter}")?;
782772
delimiter = real_delimiter;
783-
write!(f, "{}", value)?;
773+
write!(f, "{value}")?;
784774
}
785775
f.write_str("]")
786776
}
@@ -790,32 +780,32 @@ impl fmt::Display for DisplayDatapoint {
790780
match &self.0.value {
791781
Some(value) => match value {
792782
proto::v1::datapoint::Value::BoolValue(value) => {
793-
f.write_fmt(format_args!("{}", value))
783+
f.write_fmt(format_args!("{value}"))
794784
}
795785
proto::v1::datapoint::Value::FailureValue(failure) => f.write_fmt(format_args!(
796786
"( {:?} )",
797787
proto::v1::datapoint::Failure::from_i32(*failure).unwrap()
798788
)),
799789
proto::v1::datapoint::Value::Int32Value(value) => {
800-
f.write_fmt(format_args!("{}", value))
790+
f.write_fmt(format_args!("{value}"))
801791
}
802792
proto::v1::datapoint::Value::Int64Value(value) => {
803-
f.write_fmt(format_args!("{}", value))
793+
f.write_fmt(format_args!("{value}"))
804794
}
805795
proto::v1::datapoint::Value::Uint32Value(value) => {
806-
f.write_fmt(format_args!("{}", value))
796+
f.write_fmt(format_args!("{value}"))
807797
}
808798
proto::v1::datapoint::Value::Uint64Value(value) => {
809-
f.write_fmt(format_args!("{}", value))
799+
f.write_fmt(format_args!("{value}"))
810800
}
811801
proto::v1::datapoint::Value::FloatValue(value) => {
812-
f.write_fmt(format_args!("{:.2}", value))
802+
f.write_fmt(format_args!("{value:.2}"))
813803
}
814804
proto::v1::datapoint::Value::DoubleValue(value) => {
815-
f.write_fmt(format_args!("{}", value))
805+
f.write_fmt(format_args!("{value}"))
816806
}
817807
proto::v1::datapoint::Value::StringValue(value) => {
818-
f.write_fmt(format_args!("'{}'", value))
808+
f.write_fmt(format_args!("'{value}'"))
819809
}
820810
proto::v1::datapoint::Value::StringArray(array) => display_array(f, &array.values),
821811
proto::v1::datapoint::Value::BoolArray(array) => display_array(f, &array.values),

‎databroker-examples/examples/perf_setter.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ async fn run_streaming_set_test(iterations: i32, n_th_message: i32) {
5959
{
6060
Ok(metadata) => metadata.into_inner().results["Vehicle.ADAS.ABS.Error"],
6161
Err(err) => {
62-
println!("Couldn't retrieve metadata: {:?}", err);
62+
println!("Couldn't retrieve metadata: {err:?}");
6363
-1
6464
}
6565
};
@@ -108,7 +108,7 @@ async fn run_streaming_set_test(iterations: i32, n_th_message: i32) {
108108
Ok(_) => {
109109
eprintln!("START");
110110
}
111-
Err(err) => eprint!("{}", err),
111+
Err(err) => eprint!("{err}"),
112112
};
113113

114114
let mut n: i32 = 0;
@@ -135,7 +135,7 @@ async fn run_streaming_set_test(iterations: i32, n_th_message: i32) {
135135
}
136136
n += 1;
137137
}
138-
Err(err) => eprint!("{}", err),
138+
Err(err) => eprint!("{err}"),
139139
};
140140
}
141141

@@ -144,7 +144,7 @@ async fn run_streaming_set_test(iterations: i32, n_th_message: i32) {
144144
Ok(_) => {
145145
eprintln!("\rEND ");
146146
}
147-
Err(err) => eprint!("{}", err),
147+
Err(err) => eprint!("{err}"),
148148
};
149149

150150
(n, n_id)
@@ -153,7 +153,7 @@ async fn run_streaming_set_test(iterations: i32, n_th_message: i32) {
153153
let (n, n_id) = feeder.await.unwrap();
154154
match sender.await {
155155
Ok(_) => {}
156-
Err(err) => eprint!("{}", err),
156+
Err(err) => eprint!("{err}"),
157157
};
158158

159159
let seconds = now.elapsed().as_secs_f64();
@@ -167,10 +167,10 @@ async fn run_streaming_set_test(iterations: i32, n_th_message: i32) {
167167
n_id,
168168
n_id as f64 / seconds
169169
);
170-
println!("Completed in {:.3} s", seconds);
170+
println!("Completed in {seconds:.3} s");
171171
}
172172
Err(err) => {
173-
println!("{}", err);
173+
println!("{err}");
174174
}
175175
}
176176
}
@@ -194,7 +194,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
194194
None => DEFAULT_NTH_MESSAGE,
195195
};
196196

197-
println!("INPUT: Set {} times", iterations);
197+
println!("INPUT: Set {iterations} times");
198198

199199
// run_set_test(iterations).await;
200200
run_streaming_set_test(iterations, queue_size).await;

‎databroker-examples/examples/perf_subscriber.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
4545
match value {
4646
proto::v1::datapoint::Value::FailureValue(reason) => {
4747
if started {
48-
eprintln!("-> Failure: {:?}", reason);
48+
eprintln!("-> Failure: {reason:?}");
4949
}
5050
}
5151
proto::v1::datapoint::Value::StringValue(string_value) => {
@@ -66,7 +66,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
6666
n,
6767
n as f64 / seconds
6868
);
69-
eprintln!("Completed in {:.3} s", seconds);
69+
eprintln!("Completed in {seconds:.3} s");
7070
}
7171
}
7272
_ => {
@@ -105,7 +105,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
105105
}
106106
}
107107
Err(err) => {
108-
eprintln!("{}", err);
108+
eprintln!("{err}");
109109
}
110110
}
111111

‎databroker/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ fn main() -> Result<()> {
3636
Ok(ok) => Ok(ok),
3737
Err(e) => {
3838
// Swallow the errors for now (enable with -vv)
39-
eprintln!("vergen failed: {}", e);
39+
eprintln!("vergen failed: {e}");
4040
Ok(())
4141
}
4242
}

‎databroker/src/broker.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -961,7 +961,7 @@ impl DataBroker {
961961
let stream = ReceiverStream::new(receiver);
962962
Ok(stream)
963963
}
964-
Err(e) => Err(QueryError::CompilationError(format!("{:?}", e))),
964+
Err(e) => Err(QueryError::CompilationError(format!("{e:?}"))),
965965
}
966966
}
967967

‎databroker/src/grpc/kuksa_val_v1/val.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,7 @@ impl proto::val_server::Val for broker::DataBroker {
196196
},
197197
None => {
198198
return Err(tonic::Status::invalid_argument(format!(
199-
"Invalid Field (id: {})",
200-
id
199+
"Invalid Field (id: {id})"
201200
)))
202201
}
203202
};
@@ -212,7 +211,7 @@ impl proto::val_server::Val for broker::DataBroker {
212211
}
213212
Err(e) => Err(tonic::Status::new(
214213
tonic::Code::InvalidArgument,
215-
format!("{:?}", e),
214+
format!("{e:?}"),
216215
)),
217216
}
218217
}

‎databroker/src/grpc/sdv_databroker_v1/broker.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ impl proto::broker_server::Broker for broker::DataBroker {
146146
debug!("Subscribed to new query");
147147
Ok(Response::new(Box::pin(stream)))
148148
}
149-
Err(e) => Err(Status::new(Code::InvalidArgument, format!("{:?}", e))),
149+
Err(e) => Err(Status::new(Code::InvalidArgument, format!("{e:?}"))),
150150
}
151151
}
152152

‎databroker/src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ const DATAPOINTS: &[(
110110
fn init_logging() {
111111
let mut output = String::from("Init logging from RUST_LOG");
112112
let filter = EnvFilter::try_from_default_env().unwrap_or_else(|err| {
113-
output.write_fmt(format_args!(" ({})", err)).unwrap();
113+
output.write_fmt(format_args!(" ({err})")).unwrap();
114114
// If no environment variable set, this is the default
115115
EnvFilter::new("info")
116116
});
@@ -306,7 +306,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
306306
.await
307307
{
308308
Ok(_) => {}
309-
Err(e) => println!("{:?}", e),
309+
Err(e) => println!("{e:?}"),
310310
}
311311
}
312312
}

‎databroker/src/query/compiler.rs

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -163,17 +163,15 @@ pub fn compile_expr(
163163
Ok(left_expr) => (Box::new(left_expr), Box::new(right_expr)),
164164
Err(_) => {
165165
return Err(CompilationError::TypeError(format!(
166-
"left side is incompatible with right side in expression \"{}\"",
167-
expr
166+
"left side is incompatible with right side in expression \"{expr}\""
168167
)))
169168
}
170169
},
171170
(Ok(left_type), Err(literal)) => match resolve_literal(literal, left_type) {
172171
Ok(right_expr) => (Box::new(left_expr), Box::new(right_expr)),
173172
Err(_) => {
174173
return Err(CompilationError::TypeError(format!(
175-
"right side is incompatible with left side in expression \"{}\"",
176-
expr
174+
"right side is incompatible with left side in expression \"{expr}\""
177175
)))
178176
}
179177
},
@@ -222,8 +220,7 @@ pub fn compile_expr(
222220
}),
223221
),
224222
_ => return Err(CompilationError::TypeError(format!(
225-
"right side is incompatible with left side in expression \"{}\"",
226-
expr
223+
"right side is incompatible with left side in expression \"{expr}\""
227224
)))
228225
},
229226
}
@@ -232,8 +229,7 @@ pub fn compile_expr(
232229
}
233230
_ => {
234231
return Err(CompilationError::TypeError(format!(
235-
"right side is incompatible with left side in expression \"{}\"",
236-
expr
232+
"right side is incompatible with left side in expression \"{expr}\""
237233
)))
238234
}
239235
}
@@ -295,10 +291,9 @@ pub fn compile_expr(
295291
"OR requires boolean expressions on both sides".to_string(),
296292
)),
297293
},
298-
operator => Err(CompilationError::UnsupportedOperator(format!(
299-
"{}",
300-
operator,
301-
))),
294+
operator => Err(CompilationError::UnsupportedOperator(
295+
format!("{operator}",),
296+
)),
302297
}
303298
}
304299
ast::Expr::Nested(e) => compile_expr(e, input, output),
@@ -309,8 +304,7 @@ pub fn compile_expr(
309304
operator: UnaryOperator::Not,
310305
}),
311306
operator => Err(CompilationError::UnsupportedOperator(format!(
312-
"Unsupported unary operator \"{}\"",
313-
operator
307+
"Unsupported unary operator \"{operator}\""
314308
))),
315309
},
316310

@@ -326,8 +320,7 @@ pub fn compile_expr(
326320
high: Box::new(compile_expr(high, input, output)?),
327321
}),
328322
operator => Err(CompilationError::UnsupportedOperator(format!(
329-
"Unsupported operator \"{}\"",
330-
operator
323+
"Unsupported operator \"{operator}\""
331324
))),
332325
}
333326
}
@@ -476,6 +469,6 @@ pub fn compile(
476469
))
477470
}
478471
}
479-
Err(e) => Err(CompilationError::ParseError(format!("{}", e))),
472+
Err(e) => Err(CompilationError::ParseError(format!("{e}"))),
480473
}
481474
}

0 commit comments

Comments
 (0)