Skip to content

Commit e3d0939

Browse files
hamirmahalhamirmahal
committed
style: simplify string interpolation
1 parent c1b0516 commit e3d0939

File tree

43 files changed

+71
-78
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+71
-78
lines changed

‎src/tools/rust-analyzer/crates/flycheck/src/lib.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ impl FlycheckActor {
288288
Some(c) => c,
289289
None => continue,
290290
};
291-
let formatted_command = format!("{:?}", command);
291+
let formatted_command = format!("{command:?}");
292292

293293
tracing::debug!(?command, "will restart flycheck");
294294
let (sender, receiver) = unbounded();
@@ -301,8 +301,7 @@ impl FlycheckActor {
301301
}
302302
Err(error) => {
303303
self.report_progress(Progress::DidFailToRestart(format!(
304-
"Failed to run the following command: {} error={}",
305-
formatted_command, error
304+
"Failed to run the following command: {formatted_command} error={error}"
306305
)));
307306
}
308307
}
@@ -313,7 +312,7 @@ impl FlycheckActor {
313312
// Watcher finished
314313
let command_handle = self.command_handle.take().unwrap();
315314
self.command_receiver.take();
316-
let formatted_handle = format!("{:?}", command_handle);
315+
let formatted_handle = format!("{command_handle:?}");
317316

318317
let res = command_handle.join();
319318
if let Err(error) = &res {

‎src/tools/rust-analyzer/crates/hir-ty/src/consteval/tests.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -73,23 +73,23 @@ fn check_answer(ra_fixture: &str, check: impl FnOnce(&[u8], &MemoryMap)) {
7373
Ok(t) => t,
7474
Err(e) => {
7575
let err = pretty_print_err(e, db);
76-
panic!("Error in evaluating goal: {}", err);
76+
panic!("Error in evaluating goal: {err}");
7777
}
7878
};
7979
match &r.data(Interner).value {
8080
chalk_ir::ConstValue::Concrete(c) => match &c.interned {
8181
ConstScalar::Bytes(b, mm) => {
8282
check(b, mm);
8383
}
84-
x => panic!("Expected number but found {:?}", x),
84+
x => panic!("Expected number but found {x:?}"),
8585
},
8686
_ => panic!("result of const eval wasn't a concrete const"),
8787
}
8888
}
8989

9090
fn pretty_print_err(e: ConstEvalError, db: TestDB) -> String {
9191
let mut err = String::new();
92-
let span_formatter = |file, range| format!("{:?} {:?}", file, range);
92+
let span_formatter = |file, range| format!("{file:?} {range:?}");
9393
match e {
9494
ConstEvalError::MirLowerError(e) => e.pretty_print(&mut err, &db, span_formatter),
9595
ConstEvalError::MirEvalError(e) => e.pretty_print(&mut err, &db, span_formatter),

‎src/tools/rust-analyzer/crates/hir-ty/src/display.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@ fn render_const_scalar(
670670
TyKind::FnDef(..) => ty.hir_fmt(f),
671671
TyKind::Function(_) | TyKind::Raw(_, _) => {
672672
let it = u128::from_le_bytes(pad16(b, false));
673-
write!(f, "{:#X} as ", it)?;
673+
write!(f, "{it:#X} as ")?;
674674
ty.hir_fmt(f)
675675
}
676676
TyKind::Array(ty, len) => {

‎src/tools/rust-analyzer/crates/hir-ty/src/mir/eval.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ impl MirEvalError {
363363
)?;
364364
}
365365
Either::Right(closure) => {
366-
writeln!(f, "In {:?}", closure)?;
366+
writeln!(f, "In {closure:?}")?;
367367
}
368368
}
369369
let source_map = db.body_with_source_map(*def).1;
@@ -424,7 +424,7 @@ impl MirEvalError {
424424
| MirEvalError::StackOverflow
425425
| MirEvalError::CoerceUnsizedError(_)
426426
| MirEvalError::InternalError(_)
427-
| MirEvalError::InvalidVTableId(_) => writeln!(f, "{:?}", err)?,
427+
| MirEvalError::InvalidVTableId(_) => writeln!(f, "{err:?}")?,
428428
}
429429
Ok(())
430430
}

‎src/tools/rust-analyzer/crates/hir-ty/src/mir/eval/tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ fn check_panic(ra_fixture: &str, expected_panic: &str) {
7777
let (db, file_ids) = TestDB::with_many_files(ra_fixture);
7878
let file_id = *file_ids.last().unwrap();
7979
let e = eval_main(&db, file_id).unwrap_err();
80-
assert_eq!(e.is_panic().unwrap_or_else(|| panic!("unexpected error: {:?}", e)), expected_panic);
80+
assert_eq!(e.is_panic().unwrap_or_else(|| panic!("unexpected error: {e:?}")), expected_panic);
8181
}
8282

8383
#[test]

‎src/tools/rust-analyzer/crates/hir-ty/src/mir/lower.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ impl MirLowerError {
213213
| MirLowerError::LangItemNotFound(_)
214214
| MirLowerError::MutatingRvalue
215215
| MirLowerError::UnresolvedLabel
216-
| MirLowerError::UnresolvedUpvar(_) => writeln!(f, "{:?}", self)?,
216+
| MirLowerError::UnresolvedUpvar(_) => writeln!(f, "{self:?}")?,
217217
}
218218
Ok(())
219219
}

‎src/tools/rust-analyzer/crates/hir/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2414,9 +2414,9 @@ impl Const {
24142414
let value_signed =
24152415
i128::from_le_bytes(mir::pad16(b, matches!(s, Scalar::Int(_))));
24162416
if value >= 10 {
2417-
return Ok(format!("{} ({:#X})", value_signed, value));
2417+
return Ok(format!("{value_signed} ({value:#X})"));
24182418
} else {
2419-
return Ok(format!("{}", value_signed));
2419+
return Ok(format!("{value_signed}"));
24202420
}
24212421
}
24222422
}

‎src/tools/rust-analyzer/crates/ide-assists/src/handlers/auto_import.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ pub(crate) fn auto_import(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<
140140
acc.add_group(
141141
&group_label,
142142
assist_id,
143-
format!("Import `{}`", import_name),
143+
format!("Import `{import_name}`"),
144144
range,
145145
|builder| {
146146
let scope = match scope.clone() {
@@ -165,7 +165,7 @@ pub(crate) fn auto_import(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<
165165
acc.add_group(
166166
&group_label,
167167
assist_id,
168-
format!("Import `{} as _`", import_name),
168+
format!("Import `{import_name} as _`"),
169169
range,
170170
|builder| {
171171
let scope = match scope.clone() {

‎src/tools/rust-analyzer/crates/ide-assists/src/handlers/bool_to_enum.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ fn replace_usages(
228228

229229
edit.replace(
230230
prefix_expr.syntax().text_range(),
231-
format!("{} == Bool::False", inner_expr),
231+
format!("{inner_expr} == Bool::False"),
232232
);
233233
} else if let Some((record_field, initializer)) = name
234234
.as_name_ref()
@@ -275,7 +275,7 @@ fn replace_usages(
275275
} else if let Some(receiver) = find_method_call_expr_usage(&name) {
276276
edit.replace(
277277
receiver.syntax().text_range(),
278-
format!("({} == Bool::True)", receiver),
278+
format!("({receiver} == Bool::True)"),
279279
);
280280
} else if name.syntax().ancestors().find_map(ast::UseTree::cast).is_none() {
281281
// for any other usage in an expression, replace it with a check that it is the true variant

‎src/tools/rust-analyzer/crates/ide-assists/src/handlers/destructure_struct_binding.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ fn generate_field_names(ctx: &AssistContext<'_>, data: &StructEditData) -> Vec<(
242242
.iter()
243243
.enumerate()
244244
.map(|(index, _)| {
245-
let new_name = new_field_name((format!("_{}", index)).into(), &data.names_in_scope);
245+
let new_name = new_field_name((format!("_{index}")).into(), &data.names_in_scope);
246246
(index.to_string().into(), new_name)
247247
})
248248
.collect(),

‎src/tools/rust-analyzer/crates/ide-assists/src/handlers/generate_delegate_trait.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -758,7 +758,7 @@ fn ty_assoc_item(item: syntax::ast::TypeAlias, qual_path_ty: Path) -> Option<Ass
758758
}
759759

760760
fn qualified_path(qual_path_ty: ast::Path, path_expr_seg: ast::Path) -> ast::Path {
761-
make::path_from_text(&format!("{}::{}", qual_path_ty, path_expr_seg))
761+
make::path_from_text(&format!("{qual_path_ty}::{path_expr_seg}"))
762762
}
763763

764764
#[cfg(test)]

‎src/tools/rust-analyzer/crates/ide-assists/src/handlers/generate_getter_or_setter.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ pub(crate) fn generate_setter(acc: &mut Assists, ctx: &AssistContext<'_>) -> Opt
4747
}
4848

4949
// Prepend set_ to fn names.
50-
fn_names.iter_mut().for_each(|name| *name = format!("set_{}", name));
50+
fn_names.iter_mut().for_each(|name| *name = format!("set_{name}"));
5151

5252
// Return early if we've found an existing fn
5353
let impl_def = find_struct_impl(ctx, &ast::Adt::Struct(strukt.clone()), &fn_names)?;

‎src/tools/rust-analyzer/crates/ide-assists/src/handlers/generate_mut_trait_impl.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ pub(crate) fn generate_mut_trait_impl(acc: &mut Assists, ctx: &AssistContext<'_>
105105
"Generate `IndexMut` impl from this `Index` trait",
106106
target,
107107
|edit| {
108-
edit.insert(target.start(), format!("$0{}\n\n", impl_def));
108+
edit.insert(target.start(), format!("$0{impl_def}\n\n"));
109109
},
110110
)
111111
}

‎src/tools/rust-analyzer/crates/ide-assists/src/handlers/into_to_qualified_from.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ pub(crate) fn into_to_qualified_from(acc: &mut Assists, ctx: &AssistContext<'_>)
6767
edit.replace(
6868
method_call.syntax().text_range(),
6969
if sc.chars().all(|c| c.is_alphanumeric() || c == ':') {
70-
format!("{}::from({})", sc, receiver)
70+
format!("{sc}::from({receiver})")
7171
} else {
72-
format!("<{}>::from({})", sc, receiver)
72+
format!("<{sc}>::from({receiver})")
7373
},
7474
);
7575
},

‎src/tools/rust-analyzer/crates/ide-assists/src/handlers/merge_nested_if.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ pub(crate) fn merge_nested_if(acc: &mut Assists, ctx: &AssistContext<'_>) -> Opt
8686
nested_if_cond.syntax().text().to_string()
8787
};
8888

89-
let replace_cond = format!("{} && {}", cond_text, nested_if_cond_text);
89+
let replace_cond = format!("{cond_text} && {nested_if_cond_text}");
9090

9191
edit.replace(cond_range, replace_cond);
9292
edit.replace(then_branch_range, nested_if_then_branch.syntax().text());

‎src/tools/rust-analyzer/crates/ide-assists/src/handlers/remove_parentheses.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ pub(crate) fn remove_parentheses(acc: &mut Assists, ctx: &AssistContext<'_>) ->
4848
}
4949
None => false,
5050
};
51-
let expr = if need_to_add_ws { format!(" {}", expr) } else { expr.to_string() };
51+
let expr = if need_to_add_ws { format!(" {expr}") } else { expr.to_string() };
5252

5353
builder.replace(parens.syntax().text_range(), expr)
5454
},

‎src/tools/rust-analyzer/crates/ide-completion/src/completions/postfix/format_like.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ pub(crate) fn add_format_like_completions(
6565
let exprs = with_placeholders(exprs);
6666
for (label, macro_name) in KINDS {
6767
let snippet = if exprs.is_empty() {
68-
format!(r#"{}({})"#, macro_name, out)
68+
format!(r#"{macro_name}({out})"#)
6969
} else {
7070
format!(r#"{}({}, {})"#, macro_name, out, exprs.join(", "))
7171
};
@@ -108,7 +108,7 @@ mod tests {
108108

109109
for (kind, input, output) in test_vector {
110110
let (parsed_string, _exprs) = parse_format_exprs(input).unwrap();
111-
let snippet = format!(r#"{}("{}")"#, kind, parsed_string);
111+
let snippet = format!(r#"{kind}("{parsed_string}")"#);
112112
assert_eq!(&snippet, output);
113113
}
114114
}

‎src/tools/rust-analyzer/crates/ide-diagnostics/src/handlers/json_is_not_rust.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ impl State {
3737
self.names.insert(name.clone(), 1);
3838
1
3939
};
40-
make::name(&format!("{}{}", name, count))
40+
make::name(&format!("{name}{count}"))
4141
}
4242

4343
fn serde_derive(&self) -> String {

‎src/tools/rust-analyzer/crates/ide-diagnostics/src/handlers/trait_impl_redundant_assoc_item.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pub(crate) fn trait_impl_redundant_assoc_item(
2727
hir::AssocItem::Function(id) => {
2828
let function = id;
2929
(
30-
format!("`fn {}`", redundant_assoc_item_name),
30+
format!("`fn {redundant_assoc_item_name}`"),
3131
function
3232
.source(db)
3333
.map(|it| it.syntax().value.text_range())
@@ -38,7 +38,7 @@ pub(crate) fn trait_impl_redundant_assoc_item(
3838
hir::AssocItem::Const(id) => {
3939
let constant = id;
4040
(
41-
format!("`const {}`", redundant_assoc_item_name),
41+
format!("`const {redundant_assoc_item_name}`"),
4242
constant
4343
.source(db)
4444
.map(|it| it.syntax().value.text_range())
@@ -49,7 +49,7 @@ pub(crate) fn trait_impl_redundant_assoc_item(
4949
hir::AssocItem::TypeAlias(id) => {
5050
let type_alias = id;
5151
(
52-
format!("`type {}`", redundant_assoc_item_name),
52+
format!("`type {redundant_assoc_item_name}`"),
5353
type_alias
5454
.source(db)
5555
.map(|it| it.syntax().value.text_range())

‎src/tools/rust-analyzer/crates/ide-diagnostics/src/handlers/unresolved_method.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,11 @@ fn assoc_func_fix(ctx: &DiagnosticsContext<'_>, d: &hir::UnresolvedMethodCall) -
162162
if !need_to_take_receiver_as_first_arg && !generic_parameters.is_empty() {
163163
let generic_parameters = generic_parameters.join(", ");
164164
receiver_type_adt_name =
165-
format!("{}::<{}>", receiver_type_adt_name, generic_parameters);
165+
format!("{receiver_type_adt_name}::<{generic_parameters}>");
166166
}
167167

168168
let method_name = call.name_ref()?;
169-
let assoc_func_call = format!("{}::{}()", receiver_type_adt_name, method_name);
169+
let assoc_func_call = format!("{receiver_type_adt_name}::{method_name}()");
170170

171171
let assoc_func_call = make::expr_path(make::path_from_text(&assoc_func_call));
172172

@@ -184,8 +184,7 @@ fn assoc_func_fix(ctx: &DiagnosticsContext<'_>, d: &hir::UnresolvedMethodCall) -
184184
Some(Assist {
185185
id: AssistId("method_call_to_assoc_func_call_fix", AssistKind::QuickFix),
186186
label: Label::new(format!(
187-
"Use associated func call instead: `{}`",
188-
assoc_func_call_expr_string
187+
"Use associated func call instead: `{assoc_func_call_expr_string}`"
189188
)),
190189
group: None,
191190
target: range,

‎src/tools/rust-analyzer/crates/ide/src/interpret_function.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ fn find_and_interpret(db: &RootDatabase, position: FilePosition) -> Option<Strin
4343
let path = path.as_deref().unwrap_or("<unknown file>");
4444
match db.line_index(file_id).try_line_col(text_range.start()) {
4545
Some(line_col) => format!("file://{path}#{}:{}", line_col.line + 1, line_col.col),
46-
None => format!("file://{path} range {:?}", text_range),
46+
None => format!("file://{path} range {text_range:?}"),
4747
}
4848
};
4949
Some(def.eval(db, span_formatter))

‎src/tools/rust-analyzer/crates/ide/src/view_memory_layout.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ impl fmt::Display for RecursiveMemoryLayout {
4040
"{}: {} (size: {}, align: {}, field offset: {})\n",
4141
node.item_name, node.typename, node.size, node.alignment, node.offset
4242
);
43-
write!(fmt, "{}", out)?;
43+
write!(fmt, "{out}")?;
4444
if node.children_start != -1 {
4545
for j in nodes[idx].children_start
4646
..(nodes[idx].children_start + nodes[idx].children_len as i64)

‎src/tools/rust-analyzer/crates/parser/src/grammar.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ fn delimited(
418418
}
419419
if !p.eat(delim) {
420420
if p.at_ts(first_set) {
421-
p.error(format!("expected {:?}", delim));
421+
p.error(format!("expected {delim:?}"));
422422
} else {
423423
break;
424424
}

‎src/tools/rust-analyzer/crates/paths/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ impl AbsPathBuf {
106106
/// Panics if `path` is not absolute.
107107
pub fn assert(path: Utf8PathBuf) -> AbsPathBuf {
108108
AbsPathBuf::try_from(path)
109-
.unwrap_or_else(|path| panic!("expected absolute path, got {}", path))
109+
.unwrap_or_else(|path| panic!("expected absolute path, got {path}"))
110110
}
111111

112112
/// Wrap the given absolute path in `AbsPathBuf`

‎src/tools/rust-analyzer/crates/proc-macro-api/src/process.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ impl ProcMacroProcessSrv {
5050
Ok(v) if v > CURRENT_API_VERSION => Err(io::Error::new(
5151
io::ErrorKind::Other,
5252
format!(
53-
"proc-macro server's api version ({}) is newer than rust-analyzer's ({})",
54-
v, CURRENT_API_VERSION
53+
"proc-macro server's api version ({v}) is newer than rust-analyzer's ({CURRENT_API_VERSION})"
5554
),
5655
)),
5756
Ok(v) => {

‎src/tools/rust-analyzer/crates/project-model/src/sysroot.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,7 @@ impl Sysroot {
219219
", try running `rustup component add rust-src` to possibly fix this"
220220
};
221221
sysroot.error = Some(format!(
222-
"sysroot at `{}` is missing a `core` library{var_note}",
223-
src_root,
222+
"sysroot at `{src_root}` is missing a `core` library{var_note}",
224223
));
225224
}
226225
}

‎src/tools/rust-analyzer/crates/project-model/src/tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ fn replace_fake_sys_root(s: &mut String) {
126126
let fake_sysroot_path = get_test_path("fake-sysroot");
127127
let fake_sysroot_path = if cfg!(windows) {
128128
let normalized_path = fake_sysroot_path.as_str().replace('\\', r#"\\"#);
129-
format!(r#"{}\\"#, normalized_path)
129+
format!(r#"{normalized_path}\\"#)
130130
} else {
131131
format!("{}/", fake_sysroot_path.as_str())
132132
};

‎src/tools/rust-analyzer/crates/rust-analyzer/src/cli/analysis_stats.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ impl flags::AnalysisStats {
479479
.or_insert(1);
480480
} else {
481481
acc.syntax_errors += 1;
482-
bar.println(format!("Syntax error: \n{}", err));
482+
bar.println(format!("Syntax error: \n{err}"));
483483
}
484484
}
485485
}

‎src/tools/rust-analyzer/crates/rust-analyzer/src/cli/run_tests.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ impl flags::RunTests {
4949
let mut sw_all = StopWatch::start();
5050
for test in tests {
5151
let full_name = full_name_of_item(db, test.module(db), test.name(db));
52-
println!("test {}", full_name);
52+
println!("test {full_name}");
5353
if test.is_ignore(db) {
5454
println!("ignored");
5555
ignore_count += 1;
@@ -62,7 +62,7 @@ impl flags::RunTests {
6262
} else {
6363
fail_count += 1;
6464
}
65-
println!("{}", result);
65+
println!("{result}");
6666
eprintln!("{:<20} {}", format!("test {}", full_name), sw_one.elapsed());
6767
}
6868
println!("{pass_count} passed, {fail_count} failed, {ignore_count} ignored");

‎src/tools/rust-analyzer/crates/rust-analyzer/src/cli/rustc_tests.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,8 @@ impl Tester {
220220
self.pass_count += 1;
221221
} else {
222222
println!("{p:?} FAIL");
223-
println!("actual (r-a) = {:?}", actual);
224-
println!("expected (rustc) = {:?}", expected);
223+
println!("actual (r-a) = {actual:?}");
224+
println!("expected (rustc) = {expected:?}");
225225
self.fail_count += 1;
226226
}
227227
}

0 commit comments

Comments
 (0)