about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2024-01-07 01:20:20 +0100
committerMatthias Krüger <matthias.krueger@famsik.de>2024-01-07 01:20:20 +0100
commit3fb2cd200202bd3a7dfec892d85f96e359990874 (patch)
treec19c3fc8f59e7adad53fbc2fd613c8e6dbb8cc33
parent196650dfafd6be76c63100e03e53256ad62c15fe (diff)
downloadrust-3fb2cd200202bd3a7dfec892d85f96e359990874.tar.gz
rust-3fb2cd200202bd3a7dfec892d85f96e359990874.zip
autofix remaining perf findings
-rw-r--r--crates/hir-ty/src/mir/lower.rs4
-rw-r--r--crates/hir/src/lib.rs4
-rw-r--r--crates/ide-assists/src/handlers/convert_nested_function_to_closure.rs4
-rw-r--r--crates/ide-assists/src/handlers/extract_variable.rs2
-rw-r--r--crates/ide-assists/src/handlers/remove_parentheses.rs2
-rw-r--r--crates/ide-diagnostics/src/tests.rs5
-rw-r--r--crates/project-model/src/workspace.rs2
7 files changed, 12 insertions, 11 deletions
diff --git a/crates/hir-ty/src/mir/lower.rs b/crates/hir-ty/src/mir/lower.rs
index 817239ae761..c02c5ef8767 100644
--- a/crates/hir-ty/src/mir/lower.rs
+++ b/crates/hir-ty/src/mir/lower.rs
@@ -2070,8 +2070,8 @@ pub fn mir_body_for_closure_query(
                         prev_projs
                             .lookup(&store)
                             .iter()
-                            .cloned()
-                            .skip(it.0.place.projections.len()),
+                            .skip(it.0.place.projections.len())
+                            .cloned(),
                     );
                     p.projection = store.intern(next_projs.into());
                 }
diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
index fd843945dfa..0266915c39b 100644
--- a/crates/hir/src/lib.rs
+++ b/crates/hir/src/lib.rs
@@ -1854,7 +1854,7 @@ impl DefWithBody {
                     let local = Local { parent: self.into(), binding_id };
                     match (need_mut, local.is_mut(db)) {
                         (mir::MutabilityReason::Unused, _) => {
-                            let should_ignore = matches!(body[binding_id].name.as_str(), Some(it) if it.starts_with("_"));
+                            let should_ignore = matches!(body[binding_id].name.as_str(), Some(it) if it.starts_with('_'));
                             if !should_ignore {
                                 acc.push(UnusedVariable { local }.into())
                             }
@@ -1879,7 +1879,7 @@ impl DefWithBody {
                         }
                         (mir::MutabilityReason::Not, true) => {
                             if !infer.mutated_bindings_in_closure.contains(&binding_id) {
-                                let should_ignore = matches!(body[binding_id].name.as_str(), Some(it) if it.starts_with("_"));
+                                let should_ignore = matches!(body[binding_id].name.as_str(), Some(it) if it.starts_with('_'));
                                 if !should_ignore {
                                     acc.push(UnusedMut { local }.into())
                                 }
diff --git a/crates/ide-assists/src/handlers/convert_nested_function_to_closure.rs b/crates/ide-assists/src/handlers/convert_nested_function_to_closure.rs
index 399f87c8f50..c30f3e1c3b2 100644
--- a/crates/ide-assists/src/handlers/convert_nested_function_to_closure.rs
+++ b/crates/ide-assists/src/handlers/convert_nested_function_to_closure.rs
@@ -49,8 +49,8 @@ pub(crate) fn convert_nested_function_to_closure(
         target,
         |edit| {
             let params = &param_list.syntax().text().to_string();
-            let params = params.strip_prefix("(").unwrap_or(params);
-            let params = params.strip_suffix(")").unwrap_or(params);
+            let params = params.strip_prefix('(').unwrap_or(params);
+            let params = params.strip_suffix(')').unwrap_or(params);
 
             let mut body = body.to_string();
             if !has_semicolon(&function) {
diff --git a/crates/ide-assists/src/handlers/extract_variable.rs b/crates/ide-assists/src/handlers/extract_variable.rs
index 874b81d3b63..0b3bd0bed6e 100644
--- a/crates/ide-assists/src/handlers/extract_variable.rs
+++ b/crates/ide-assists/src/handlers/extract_variable.rs
@@ -112,7 +112,7 @@ pub(crate) fn extract_variable(acc: &mut Assists, ctx: &AssistContext<'_>) -> Op
                     let insert_place = edit.make_syntax_mut(place);
 
                     // Adjust ws to insert depending on if this is all inline or on separate lines
-                    let trailing_ws = if prev_ws.is_some_and(|it| it.text().starts_with("\n")) {
+                    let trailing_ws = if prev_ws.is_some_and(|it| it.text().starts_with('\n')) {
                         format!("\n{indent_to}")
                     } else {
                         format!(" ")
diff --git a/crates/ide-assists/src/handlers/remove_parentheses.rs b/crates/ide-assists/src/handlers/remove_parentheses.rs
index 0281b29cd42..99c55e9ff7c 100644
--- a/crates/ide-assists/src/handlers/remove_parentheses.rs
+++ b/crates/ide-assists/src/handlers/remove_parentheses.rs
@@ -43,7 +43,7 @@ pub(crate) fn remove_parentheses(acc: &mut Assists, ctx: &AssistContext<'_>) ->
             let prev_token = parens.syntax().first_token().and_then(|it| it.prev_token());
             let need_to_add_ws = match prev_token {
                 Some(it) => {
-                    let tokens = vec![T![&], T![!], T!['('], T!['['], T!['{']];
+                    let tokens = [T![&], T![!], T!['('], T!['['], T!['{']];
                     it.kind() != SyntaxKind::WHITESPACE && !tokens.contains(&it.kind())
                 }
                 None => false,
diff --git a/crates/ide-diagnostics/src/tests.rs b/crates/ide-diagnostics/src/tests.rs
index 9dc5ebbd6a6..742db32564d 100644
--- a/crates/ide-diagnostics/src/tests.rs
+++ b/crates/ide-diagnostics/src/tests.rs
@@ -42,8 +42,9 @@ fn check_nth_fix(nth: usize, ra_fixture_before: &str, ra_fixture_after: &str) {
         super::diagnostics(&db, &conf, &AssistResolveStrategy::All, file_position.file_id)
             .pop()
             .expect("no diagnostics");
-    let fix =
-        &diagnostic.fixes.expect(&format!("{:?} diagnostic misses fixes", diagnostic.code))[nth];
+    let fix = &diagnostic
+        .fixes
+        .unwrap_or_else(|| panic!("{:?} diagnostic misses fixes", diagnostic.code))[nth];
     let actual = {
         let source_change = fix.source_change.as_ref().unwrap();
         let file_id = *source_change.source_file_edits.keys().next().unwrap();
diff --git a/crates/project-model/src/workspace.rs b/crates/project-model/src/workspace.rs
index 4057493fa3a..00cc7c30ee3 100644
--- a/crates/project-model/src/workspace.rs
+++ b/crates/project-model/src/workspace.rs
@@ -1277,7 +1277,7 @@ fn add_target_crate_root(
     inject_cargo_env(pkg, &mut env);
     if let Ok(cname) = String::from_str(cargo_name) {
         // CARGO_CRATE_NAME is the name of the Cargo target with - converted to _, such as the name of the library, binary, example, integration test, or benchmark.
-        env.set("CARGO_CRATE_NAME", cname.replace("-", "_"));
+        env.set("CARGO_CRATE_NAME", cname.replace('-', "_"));
     }
 
     if let Some(envs) = build_data.map(|it| &it.envs) {