Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-10 15:14:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #17315 - hamirmahal:style/simplify-string-interpolation, r=Veykril

Browse source 
style: simplify string interpolation
This commit is contained in:
bors 2024-06-03 12:29:27 +00:00
commit cb6b808185
43 changed files with 71 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
crates/flycheck/src/lib.rs
View file

@ -304,7 +304,7 @@ impl FlycheckActor {
Some(c) => c,
None => continue,
};
let formatted_command = format!("{:?}", command);
let formatted_command = format!("{command:?}");
tracing::debug!(?command, "will restart flycheck");
let (sender, receiver) = unbounded();
@ -318,8 +318,7 @@ impl FlycheckActor {
}
Err(error) => {
self.report_progress(Progress::DidFailToRestart(format!(
"Failed to run the following command: {} error={}",
formatted_command, error
"Failed to run the following command: {formatted_command} error={error}"
)));
self.status = FlycheckStatus::Finished;
}
@ -331,7 +330,7 @@ impl FlycheckActor {
// Watcher finished
let command_handle = self.command_handle.take().unwrap();
self.command_receiver.take();
let formatted_handle = format!("{:?}", command_handle);
let formatted_handle = format!("{command_handle:?}");
let res = command_handle.join();
if let Err(error) = &res {

6
crates/hir-ty/src/consteval/tests.rs
View file

@ -73,7 +73,7 @@ fn check_answer(ra_fixture: &str, check: impl FnOnce(&[u8], &MemoryMap)) {
Ok(t) => t,
Err(e) => {
let err = pretty_print_err(e, db);
panic!("Error in evaluating goal: {}", err);
panic!("Error in evaluating goal: {err}");
}
};
match &r.data(Interner).value {
@ -81,7 +81,7 @@ fn check_answer(ra_fixture: &str, check: impl FnOnce(&[u8], &MemoryMap)) {
ConstScalar::Bytes(b, mm) => {
check(b, mm);
}
x => panic!("Expected number but found {:?}", x),
x => panic!("Expected number but found {x:?}"),
},
_ => panic!("result of const eval wasn't a concrete const"),
}
@ -89,7 +89,7 @@ fn check_answer(ra_fixture: &str, check: impl FnOnce(&[u8], &MemoryMap)) {
fn pretty_print_err(e: ConstEvalError, db: TestDB) -> String {
let mut err = String::new();
let span_formatter = |file, range| format!("{:?} {:?}", file, range);
let span_formatter = |file, range| format!("{file:?} {range:?}");
match e {
ConstEvalError::MirLowerError(e) => e.pretty_print(&mut err, &db, span_formatter),
ConstEvalError::MirEvalError(e) => e.pretty_print(&mut err, &db, span_formatter),

2
crates/hir-ty/src/display.rs
View file

@ -670,7 +670,7 @@ fn render_const_scalar(
TyKind::FnDef(..) => ty.hir_fmt(f),
TyKind::Function(_) | TyKind::Raw(_, _) => {
let it = u128::from_le_bytes(pad16(b, false));
write!(f, "{:#X} as ", it)?;
write!(f, "{it:#X} as ")?;
ty.hir_fmt(f)
}
TyKind::Array(ty, len) => {

4
crates/hir-ty/src/mir/eval.rs
View file

@ -363,7 +363,7 @@ impl MirEvalError {
)?;
}
Either::Right(closure) => {
writeln!(f, "In {:?}", closure)?;
writeln!(f, "In {closure:?}")?;
}
}
let source_map = db.body_with_source_map(*def).1;
@ -424,7 +424,7 @@ impl MirEvalError {
| MirEvalError::StackOverflow
| MirEvalError::CoerceUnsizedError(_)
| MirEvalError::InternalError(_)
| MirEvalError::InvalidVTableId(_) => writeln!(f, "{:?}", err)?,
| MirEvalError::InvalidVTableId(_) => writeln!(f, "{err:?}")?,
}
Ok(())
}

2
crates/hir-ty/src/mir/eval/tests.rs
View file

@ -77,7 +77,7 @@ fn check_panic(ra_fixture: &str, expected_panic: &str) {
let (db, file_ids) = TestDB::with_many_files(ra_fixture);
let file_id = *file_ids.last().unwrap();
let e = eval_main(&db, file_id).unwrap_err();
assert_eq!(e.is_panic().unwrap_or_else(|| panic!("unexpected error: {:?}", e)), expected_panic);
assert_eq!(e.is_panic().unwrap_or_else(|| panic!("unexpected error: {e:?}")), expected_panic);
}
#[test]

2
crates/hir-ty/src/mir/lower.rs
View file

@ -213,7 +213,7 @@ impl MirLowerError {
| MirLowerError::LangItemNotFound(_)
| MirLowerError::MutatingRvalue
| MirLowerError::UnresolvedLabel
| MirLowerError::UnresolvedUpvar(_) => writeln!(f, "{:?}", self)?,
| MirLowerError::UnresolvedUpvar(_) => writeln!(f, "{self:?}")?,
}
Ok(())
}

4
crates/hir/src/lib.rs
View file

@ -2422,9 +2422,9 @@ impl Const {
let value_signed =
i128::from_le_bytes(mir::pad16(b, matches!(s, Scalar::Int(_))));
if value >= 10 {
return Ok(format!("{} ({:#X})", value_signed, value));
return Ok(format!("{value_signed} ({value:#X})"));
} else {
return Ok(format!("{}", value_signed));
return Ok(format!("{value_signed}"));
}
}
}

4
crates/ide-assists/src/handlers/auto_import.rs
View file

@ -140,7 +140,7 @@ pub(crate) fn auto_import(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<
acc.add_group(
&group_label,
assist_id,
format!("Import `{}`", import_name),
format!("Import `{import_name}`"),
range,
|builder| {
let scope = match scope.clone() {
@ -165,7 +165,7 @@ pub(crate) fn auto_import(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<
acc.add_group(
&group_label,
assist_id,
format!("Import `{} as _`", import_name),
format!("Import `{import_name} as _`"),
range,
|builder| {
let scope = match scope.clone() {

4
crates/ide-assists/src/handlers/bool_to_enum.rs
View file

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

2
crates/ide-assists/src/handlers/destructure_struct_binding.rs
View file

@ -242,7 +242,7 @@ fn generate_field_names(ctx: &AssistContext<'_>, data: &StructEditData) -> Vec<(
.iter()
.enumerate()
.map(|(index, _)| {
let new_name = new_field_name((format!("_{}", index)).into(), &data.names_in_scope);
let new_name = new_field_name((format!("_{index}")).into(), &data.names_in_scope);
(index.to_string().into(), new_name)
})
.collect(),

2
crates/ide-assists/src/handlers/generate_delegate_trait.rs
View file

@ -758,7 +758,7 @@ fn ty_assoc_item(item: syntax::ast::TypeAlias, qual_path_ty: Path) -> Option<Ass
}
fn qualified_path(qual_path_ty: ast::Path, path_expr_seg: ast::Path) -> ast::Path {
make::path_from_text(&format!("{}::{}", qual_path_ty, path_expr_seg))
make::path_from_text(&format!("{qual_path_ty}::{path_expr_seg}"))
}
#[cfg(test)]

2
crates/ide-assists/src/handlers/generate_getter_or_setter.rs
View file

@ -47,7 +47,7 @@ pub(crate) fn generate_setter(acc: &mut Assists, ctx: &AssistContext<'_>) -> Opt
}
// Prepend set_ to fn names.
fn_names.iter_mut().for_each(|name| *name = format!("set_{}", name));
fn_names.iter_mut().for_each(|name| *name = format!("set_{name}"));
// Return early if we've found an existing fn
let impl_def = find_struct_impl(ctx, &ast::Adt::Struct(strukt.clone()), &fn_names)?;

2
crates/ide-assists/src/handlers/generate_mut_trait_impl.rs
View file

@ -105,7 +105,7 @@ pub(crate) fn generate_mut_trait_impl(acc: &mut Assists, ctx: &AssistContext<'_>
"Generate `IndexMut` impl from this `Index` trait",
target,
|edit| {
edit.insert(target.start(), format!("$0{}\n\n", impl_def));
edit.insert(target.start(), format!("$0{impl_def}\n\n"));
},
)
}

4
crates/ide-assists/src/handlers/into_to_qualified_from.rs
View file

@ -67,9 +67,9 @@ pub(crate) fn into_to_qualified_from(acc: &mut Assists, ctx: &AssistContext<'_>)
edit.replace(
method_call.syntax().text_range(),
if sc.chars().all(|c| c.is_alphanumeric() || c == ':') {
format!("{}::from({})", sc, receiver)
format!("{sc}::from({receiver})")
} else {
format!("<{}>::from({})", sc, receiver)
format!("<{sc}>::from({receiver})")
},
);
},

2
crates/ide-assists/src/handlers/merge_nested_if.rs
View file

@ -86,7 +86,7 @@ pub(crate) fn merge_nested_if(acc: &mut Assists, ctx: &AssistContext<'_>) -> Opt
nested_if_cond.syntax().text().to_string()
};
let replace_cond = format!("{} && {}", cond_text, nested_if_cond_text);
let replace_cond = format!("{cond_text} && {nested_if_cond_text}");
edit.replace(cond_range, replace_cond);
edit.replace(then_branch_range, nested_if_then_branch.syntax().text());

2
crates/ide-assists/src/handlers/remove_parentheses.rs
View file

@ -48,7 +48,7 @@ pub(crate) fn remove_parentheses(acc: &mut Assists, ctx: &AssistContext<'_>) ->
}
None => false,
};
let expr = if need_to_add_ws { format!(" {}", expr) } else { expr.to_string() };
let expr = if need_to_add_ws { format!(" {expr}") } else { expr.to_string() };
builder.replace(parens.syntax().text_range(), expr)
},

4
crates/ide-completion/src/completions/postfix/format_like.rs
View file

@ -65,7 +65,7 @@ pub(crate) fn add_format_like_completions(
let exprs = with_placeholders(exprs);
for (label, macro_name) in KINDS {
let snippet = if exprs.is_empty() {
format!(r#"{}({})"#, macro_name, out)
format!(r#"{macro_name}({out})"#)
} else {
format!(r#"{}({}, {})"#, macro_name, out, exprs.join(", "))
};
@ -108,7 +108,7 @@ mod tests {
for (kind, input, output) in test_vector {
let (parsed_string, _exprs) = parse_format_exprs(input).unwrap();
let snippet = format!(r#"{}("{}")"#, kind, parsed_string);
let snippet = format!(r#"{kind}("{parsed_string}")"#);
assert_eq!(&snippet, output);
}
}

2
crates/ide-diagnostics/src/handlers/json_is_not_rust.rs
View file

@ -37,7 +37,7 @@ impl State {
self.names.insert(name.clone(), 1);
1
};
make::name(&format!("{}{}", name, count))
make::name(&format!("{name}{count}"))
}
fn serde_derive(&self) -> String {

6
crates/ide-diagnostics/src/handlers/trait_impl_redundant_assoc_item.rs
View file

@ -27,7 +27,7 @@ pub(crate) fn trait_impl_redundant_assoc_item(
hir::AssocItem::Function(id) => {
let function = id;
(
format!("`fn {}`", redundant_assoc_item_name),
format!("`fn {redundant_assoc_item_name}`"),
function
.source(db)
.map(|it| it.syntax().value.text_range())
@ -38,7 +38,7 @@ pub(crate) fn trait_impl_redundant_assoc_item(
hir::AssocItem::Const(id) => {
let constant = id;
(
format!("`const {}`", redundant_assoc_item_name),
format!("`const {redundant_assoc_item_name}`"),
constant
.source(db)
.map(|it| it.syntax().value.text_range())
@ -49,7 +49,7 @@ pub(crate) fn trait_impl_redundant_assoc_item(
hir::AssocItem::TypeAlias(id) => {
let type_alias = id;
(
format!("`type {}`", redundant_assoc_item_name),
format!("`type {redundant_assoc_item_name}`"),
type_alias
.source(db)
.map(|it| it.syntax().value.text_range())

8
crates/ide-diagnostics/src/handlers/unresolved_method.rs
View file

@ -161,12 +161,11 @@ fn assoc_func_fix(ctx: &DiagnosticsContext<'_>, d: &hir::UnresolvedMethodCall) -
// we could omit generic parameters cause compiler can deduce it automatically
if !need_to_take_receiver_as_first_arg && !generic_parameters.is_empty() {
let generic_parameters = generic_parameters.join(", ");
receiver_type_adt_name =
format!("{}::<{}>", receiver_type_adt_name, generic_parameters);
receiver_type_adt_name = format!("{receiver_type_adt_name}::<{generic_parameters}>");
}
let method_name = call.name_ref()?;
let assoc_func_call = format!("{}::{}()", receiver_type_adt_name, method_name);
let assoc_func_call = format!("{receiver_type_adt_name}::{method_name}()");
let assoc_func_call = make::expr_path(make::path_from_text(&assoc_func_call));
@ -184,8 +183,7 @@ fn assoc_func_fix(ctx: &DiagnosticsContext<'_>, d: &hir::UnresolvedMethodCall) -
Some(Assist {
id: AssistId("method_call_to_assoc_func_call_fix", AssistKind::QuickFix),
label: Label::new(format!(
"Use associated func call instead: `{}`",
assoc_func_call_expr_string
"Use associated func call instead: `{assoc_func_call_expr_string}`"
)),
group: None,
target: range,

2
crates/ide/src/interpret_function.rs
View file

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

2
crates/ide/src/view_memory_layout.rs
View file

@ -40,7 +40,7 @@ impl fmt::Display for RecursiveMemoryLayout {
"{}: {} (size: {}, align: {}, field offset: {})\n",
node.item_name, node.typename, node.size, node.alignment, node.offset
);
write!(fmt, "{}", out)?;
write!(fmt, "{out}")?;
if node.children_start != -1 {
for j in nodes[idx].children_start
..(nodes[idx].children_start + nodes[idx].children_len as i64)

2
crates/parser/src/grammar.rs
View file

@ -418,7 +418,7 @@ fn delimited(
}
if !p.eat(delim) {
if p.at_ts(first_set) {
p.error(format!("expected {:?}", delim));
p.error(format!("expected {delim:?}"));
} else {
break;
}

2
crates/paths/src/lib.rs
View file

@ -106,7 +106,7 @@ impl AbsPathBuf {
/// Panics if `path` is not absolute.
pub fn assert(path: Utf8PathBuf) -> AbsPathBuf {
AbsPathBuf::try_from(path)
.unwrap_or_else(|path| panic!("expected absolute path, got {}", path))
.unwrap_or_else(|path| panic!("expected absolute path, got {path}"))
}
/// Wrap the given absolute path in `AbsPathBuf`

3
crates/proc-macro-api/src/process.rs
View file

@ -50,8 +50,7 @@ impl ProcMacroProcessSrv {
Ok(v) if v > CURRENT_API_VERSION => Err(io::Error::new(
io::ErrorKind::Other,
format!(
"proc-macro server's api version ({}) is newer than rust-analyzer's ({})",
v, CURRENT_API_VERSION
"proc-macro server's api version ({v}) is newer than rust-analyzer's ({CURRENT_API_VERSION})"
),
)),
Ok(v) => {

3
crates/project-model/src/sysroot.rs
View file

@ -219,8 +219,7 @@ impl Sysroot {
", try running `rustup component add rust-src` to possibly fix this"
};
sysroot.error = Some(format!(
"sysroot at `{}` is missing a `core` library{var_note}",
src_root,
"sysroot at `{src_root}` is missing a `core` library{var_note}",
));
}
}

2
crates/project-model/src/tests.rs
View file

@ -126,7 +126,7 @@ fn replace_fake_sys_root(s: &mut String) {
let fake_sysroot_path = get_test_path("fake-sysroot");
let fake_sysroot_path = if cfg!(windows) {
let normalized_path = fake_sysroot_path.as_str().replace('\\', r#"\\"#);
format!(r#"{}\\"#, normalized_path)
format!(r#"{normalized_path}\\"#)
} else {
format!("{}/", fake_sysroot_path.as_str())
};

2
crates/rust-analyzer/src/cli/analysis_stats.rs
View file

@ -479,7 +479,7 @@ impl flags::AnalysisStats {
.or_insert(1);
} else {
acc.syntax_errors += 1;
bar.println(format!("Syntax error: \n{}", err));
bar.println(format!("Syntax error: \n{err}"));
}
}
}

4
crates/rust-analyzer/src/cli/run_tests.rs
View file

@ -49,7 +49,7 @@ impl flags::RunTests {
let mut sw_all = StopWatch::start();
for test in tests {
let full_name = full_name_of_item(db, test.module(db), test.name(db));
println!("test {}", full_name);
println!("test {full_name}");
if test.is_ignore(db) {
println!("ignored");
ignore_count += 1;
@ -62,7 +62,7 @@ impl flags::RunTests {
} else {
fail_count += 1;
}
println!("{}", result);
println!("{result}");
eprintln!("{:<20} {}", format!("test {}", full_name), sw_one.elapsed());
}
println!("{pass_count} passed, {fail_count} failed, {ignore_count} ignored");

4
crates/rust-analyzer/src/cli/rustc_tests.rs
View file

@ -220,8 +220,8 @@ impl Tester {
self.pass_count += 1;
} else {
println!("{p:?} FAIL");
println!("actual (r-a) = {:?}", actual);
println!("expected (rustc) = {:?}", expected);
println!("actual (r-a) = {actual:?}");
println!("expected (rustc) = {expected:?}");
self.fail_count += 1;
}
}

2
crates/rust-analyzer/src/tracing/hprof.rs
View file

@ -199,7 +199,7 @@ impl Node {
let _ = write!(out, " ({} calls)", self.count);
}
eprintln!("{}", out);
eprintln!("{out}");
for child in &self.children {
child.go(level + 1, filter)

18
crates/salsa/salsa-macros/src/query_group.rs
View file

@ -20,7 +20,7 @@ pub(crate) fn query_group(args: TokenStream, input: TokenStream) -> TokenStream
let input_span = input.span();
let (trait_attrs, salsa_attrs) = filter_attrs(input.attrs);
if !salsa_attrs.is_empty() {
return Error::new(input_span, format!("unsupported attributes: {:?}", salsa_attrs))
return Error::new(input_span, format!("unsupported attributes: {salsa_attrs:?}"))
.to_compile_error()
.into();
}
@ -78,7 +78,7 @@ pub(crate) fn query_group(args: TokenStream, input: TokenStream) -> TokenStream
num_storages += 1;
}
_ => {
return Error::new(span, format!("unknown salsa attribute `{}`", name))
return Error::new(span, format!("unknown salsa attribute `{name}`"))
.to_compile_error()
.into();
}
@ -111,7 +111,7 @@ pub(crate) fn query_group(args: TokenStream, input: TokenStream) -> TokenStream
_ => {
return Error::new(
sig_span,
format!("first argument of query `{}` must be `&self`", query_name),
format!("first argument of query `{query_name}` must be `&self`"),
)
.to_compile_error()
.into();
@ -130,7 +130,7 @@ pub(crate) fn query_group(args: TokenStream, input: TokenStream) -> TokenStream
arg => {
return Error::new(
arg.span(),
format!("unsupported argument `{:?}` of `{}`", arg, query_name,),
format!("unsupported argument `{arg:?}` of `{query_name}`",),
)
.to_compile_error()
.into();
@ -144,7 +144,7 @@ pub(crate) fn query_group(args: TokenStream, input: TokenStream) -> TokenStream
ref ret => {
return Error::new(
ret.span(),
format!("unsupported return type `{:?}` of `{}`", ret, query_name),
format!("unsupported return type `{ret:?}` of `{query_name}`"),
)
.to_compile_error()
.into();
@ -169,7 +169,7 @@ pub(crate) fn query_group(args: TokenStream, input: TokenStream) -> TokenStream
let lookup_keys = vec![(parse_quote! { key }, value.clone())];
Some(Query {
query_type: lookup_query_type,
query_name: format!("{}", lookup_fn_name),
query_name: format!("{lookup_fn_name}"),
fn_name: lookup_fn_name,
receiver: self_receiver.clone(),
attrs: vec![], // FIXME -- some automatically generated docs on this method?
@ -274,8 +274,7 @@ pub(crate) fn query_group(args: TokenStream, input: TokenStream) -> TokenStream
*Note:* Setting values will trigger cancellation
of any ongoing queries; this method blocks until
those queries have been cancelled.
",
fn_name = fn_name
"
);
let set_constant_fn_docs = format!(
@ -290,8 +289,7 @@ pub(crate) fn query_group(args: TokenStream, input: TokenStream) -> TokenStream
*Note:* Setting values will trigger cancellation
of any ongoing queries; this method blocks until
those queries have been cancelled.
",
fn_name = fn_name
"
);
query_fn_declarations.extend(quote! {

2
crates/salsa/tests/cycles.rs
View file

@ -162,7 +162,7 @@ fn extract_cycle(f: impl FnOnce() + UnwindSafe) -> salsa::Cycle {
return cycle.clone();
}
}
panic!("unexpected value: {:?}", v)
panic!("unexpected value: {v:?}")
}
#[test]

4
crates/salsa/tests/incremental/constants.rs
View file

@ -13,12 +13,12 @@ pub(crate) trait ConstantsDatabase: TestContext {
}
fn add(db: &dyn ConstantsDatabase, key1: char, key2: char) -> usize {
db.log().add(format!("add({}, {})", key1, key2));
db.log().add(format!("add({key1}, {key2})"));
db.input(key1) + db.input(key2)
}
fn add3(db: &dyn ConstantsDatabase, key1: char, key2: char, key3: char) -> usize {
db.log().add(format!("add3({}, {}, {})", key1, key2, key3));
db.log().add(format!("add3({key1}, {key2}, {key3})"));
db.add(key1, key2) + db.input(key3)
}

8
crates/salsa/tests/incremental/implementation.rs
View file

@ -26,7 +26,7 @@ pub(crate) struct TestContextImpl {
impl TestContextImpl {
#[track_caller]
pub(crate) fn assert_log(&self, expected_log: &[&str]) {
let expected_text = &format!("{:#?}", expected_log);
let expected_text = &format!("{expected_log:#?}");
let actual_text = &format!("{:#?}", self.log().take());
if expected_text == actual_text {
@ -36,9 +36,9 @@ impl TestContextImpl {
#[allow(clippy::print_stdout)]
for diff in dissimilar::diff(expected_text, actual_text) {
match diff {
dissimilar::Chunk::Delete(l) => println!("-{}", l),
dissimilar::Chunk::Equal(l) => println!(" {}", l),
dissimilar::Chunk::Insert(r) => println!("+{}", r),
dissimilar::Chunk::Delete(l) => println!("-{l}"),
dissimilar::Chunk::Equal(l) => println!(" {l}"),
dissimilar::Chunk::Insert(r) => println!("+{r}"),
}
}

2
crates/salsa/tests/parallel/parallel_cycle_none_recover.rs
View file

@ -33,7 +33,7 @@ fn parallel_cycle_none_recover() {
"#]]
.assert_debug_eq(&c.unexpected_participants(&db));
} else {
panic!("b failed in an unexpected way: {:?}", err_b);
panic!("b failed in an unexpected way: {err_b:?}");
}
// We expect A to propagate a panic, which causes us to use the sentinel

2
crates/salsa/tests/parallel/race.rs
View file

@ -28,7 +28,7 @@ fn in_par_get_set_race() {
// cancellation, it'll unwind.
let result1 = thread1.join().unwrap();
if let Ok(value1) = result1 {
assert!(value1 == 111 || value1 == 1011, "illegal result {}", value1);
assert!(value1 == 111 || value1 == 1011, "illegal result {value1}");
}
// thread2 can not observe a cancellation because it performs a

2
crates/span/src/lib.rs
View file

@ -218,7 +218,7 @@ impl From<MacroFileId> for HirFileId {
fn from(MacroFileId { macro_call_id: MacroCallId(id) }: MacroFileId) -> Self {
_ = Self::ASSERT_MAX_FILE_ID_IS_SAME;
let id = id.as_u32();
assert!(id <= Self::MAX_HIR_FILE_ID, "MacroCallId index {} is too large", id);
assert!(id <= Self::MAX_HIR_FILE_ID, "MacroCallId index {id} is too large");
HirFileId(id | Self::MACRO_FILE_TAG_MASK)
}
}

4
crates/syntax/src/ast/make.rs
View file

@ -172,7 +172,7 @@ pub fn ty_alias(
assignment: Option<(ast::Type, Option<ast::WhereClause>)>,
) -> ast::TypeAlias {
let mut s = String::new();
s.push_str(&format!("type {}", ident));
s.push_str(&format!("type {ident}"));
if let Some(list) = generic_param_list {
s.push_str(&list.to_string());
@ -297,7 +297,7 @@ pub fn impl_trait(
};
let where_clause = merge_where_clause(ty_where_clause, trait_where_clause)
.map_or_else(|| " ".to_owned(), |wc| format!("\n{}\n", wc));
.map_or_else(|| " ".to_owned(), |wc| format!("\n{wc}\n"));
let body = match body {
Some(bd) => bd.iter().map(|elem| elem.to_string()).join(""),

2
crates/test-fixture/src/lib.rs
View file

@ -196,7 +196,7 @@ impl ChangeFixture {
origin,
);
let prev = crates.insert(crate_name.clone(), crate_id);
assert!(prev.is_none(), "multiple crates with same name: {}", crate_name);
assert!(prev.is_none(), "multiple crates with same name: {crate_name}");
for dep in meta.deps {
let prelude = match &meta.extern_prelude {
Some(v) => v.contains(&dep),

2
crates/test-utils/src/fixture.rs
View file

@ -450,7 +450,7 @@ impl MiniCore {
}
if !active_regions.is_empty() {
panic!("unclosed regions: {:?} Add an `endregion` comment", active_regions);
panic!("unclosed regions: {active_regions:?} Add an `endregion` comment");
}
for flag in &self.valid_flags {

3
lib/lsp-server/src/lib.rs
View file

@ -433,8 +433,7 @@ mod tests {
initialize_start_test(TestCase {
test_messages: vec![notification_msg.clone()],
expected_resp: Err(ProtocolError::new(format!(
"expected initialize request, got {:?}",
notification_msg
"expected initialize request, got {notification_msg:?}"
))),
});
}

2
xtask/src/metrics.rs
View file

@ -64,7 +64,7 @@ impl flags::Metrics {
};
let mut file =
fs::File::options().write(true).create(true).open(format!("target/{}.json", name))?;
fs::File::options().write(true).create(true).open(format!("target/{name}.json"))?;
writeln!(file, "{}", metrics.json())?;
eprintln!("{metrics:#?}");
Ok(())