diff options
| author | bors <bors@rust-lang.org> | 2024-07-20 05:32:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-07-20 05:32:14 +0000 |
| commit | 91b9739d124e75d410971e94b628bf6b4f359b0c (patch) | |
| tree | b311f4b670a5fbf0999e67014f84022072b43a62 | |
| parent | 449517d52e884b4f42db065810bb732498fd75db (diff) | |
| parent | a7074e2ebc97a57a98b047d343d3ee954f0ac003 (diff) | |
| download | rust-91b9739d124e75d410971e94b628bf6b4f359b0c.tar.gz rust-91b9739d124e75d410971e94b628bf6b4f359b0c.zip | |
Auto merge of #17642 - lnicola:typos, r=lnicola
minor: Fix some typos
3 files changed, 2 insertions, 3 deletions
diff --git a/src/tools/rust-analyzer/crates/hir-def/src/nameres/tests/macros.rs b/src/tools/rust-analyzer/crates/hir-def/src/nameres/tests/macros.rs index 14d497b3a11..d278b75e815 100644 --- a/src/tools/rust-analyzer/crates/hir-def/src/nameres/tests/macros.rs +++ b/src/tools/rust-analyzer/crates/hir-def/src/nameres/tests/macros.rs @@ -1348,7 +1348,6 @@ fn proc_attr(a: TokenStream, b: TokenStream) -> TokenStream { a } .keys() .map(|name| name.display(&db).to_string()) .sorted() - .sorted() .join("\n"); expect![[r#" diff --git a/src/tools/rust-analyzer/crates/ide/src/inlay_hints/closing_brace.rs b/src/tools/rust-analyzer/crates/ide/src/inlay_hints/closing_brace.rs index 3e255adbe61..ea96c9504e5 100644 --- a/src/tools/rust-analyzer/crates/ide/src/inlay_hints/closing_brace.rs +++ b/src/tools/rust-analyzer/crates/ide/src/inlay_hints/closing_brace.rs @@ -54,7 +54,8 @@ pub(super) fn hints( (format!("mod {}", module.name()?), module.name().map(name)) } else if let Some(label) = ast::Label::cast(node.clone()) { // in this case, `ast::Label` could be seen as a part of `ast::BlockExpr` - // the actual number of lines in this case should be the line count of the parent BlockExpr, which the `min_lines` config care about + // the actual number of lines in this case should be the line count of the parent BlockExpr, + // which the `min_lines` config cares about node = node.parent()?; let block = label.syntax().parent().and_then(ast::BlockExpr::cast)?; closing_token = block.stmt_list()?.r_curly_token()?; diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/src/handlers/notification.rs b/src/tools/rust-analyzer/crates/rust-analyzer/src/handlers/notification.rs index 4d9cbae7d1f..06e893f0f47 100644 --- a/src/tools/rust-analyzer/crates/rust-analyzer/src/handlers/notification.rs +++ b/src/tools/rust-analyzer/crates/rust-analyzer/src/handlers/notification.rs @@ -292,7 +292,6 @@ fn run_flycheck(state: &mut GlobalState, vfs_path: VfsPath) -> bool { .into_iter() .flat_map(|id| world.analysis.transitive_rev_deps(id)) .flatten() - .sorted() .unique() .collect(); |