Skip to content

Commit 91b9739

Browse files
committed
Auto merge of rust-lang#17642 - lnicola:typos, r=lnicola
minor: Fix some typos
2 parents 449517d + a7074e2 commit 91b9739

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

src/tools/rust-analyzer/crates/hir-def/src/nameres/tests/macros.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1348,7 +1348,6 @@ fn proc_attr(a: TokenStream, b: TokenStream) -> TokenStream { a }
13481348
.keys()
13491349
.map(|name| name.display(&db).to_string())
13501350
.sorted()
1351-
.sorted()
13521351
.join("\n");
13531352

13541353
expect![[r#"

src/tools/rust-analyzer/crates/ide/src/inlay_hints/closing_brace.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ pub(super) fn hints(
5454
(format!("mod {}", module.name()?), module.name().map(name))
5555
} else if let Some(label) = ast::Label::cast(node.clone()) {
5656
// in this case, `ast::Label` could be seen as a part of `ast::BlockExpr`
57-
// the actual number of lines in this case should be the line count of the parent BlockExpr, which the `min_lines` config care about
57+
// the actual number of lines in this case should be the line count of the parent BlockExpr,
58+
// which the `min_lines` config cares about
5859
node = node.parent()?;
5960
let block = label.syntax().parent().and_then(ast::BlockExpr::cast)?;
6061
closing_token = block.stmt_list()?.r_curly_token()?;

src/tools/rust-analyzer/crates/rust-analyzer/src/handlers/notification.rs

-1
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,6 @@ fn run_flycheck(state: &mut GlobalState, vfs_path: VfsPath) -> bool {
292292
.into_iter()
293293
.flat_map(|id| world.analysis.transitive_rev_deps(id))
294294
.flatten()
295-
.sorted()
296295
.unique()
297296
.collect();
298297

0 commit comments

Comments
 (0)