Skip to content

Commit b8e8f1c

Browse files
committed
Auto merge of rust-lang#18078 - cuishuang:master, r=Veykril
Remove unnecessary symbols and add missing symbols
2 parents e1f8bb6 + 06d1aa2 commit b8e8f1c

File tree

5 files changed

+5
-3
lines changed

5 files changed

+5
-3
lines changed

src/tools/rust-analyzer/crates/hir-expand/src/declarative.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//! Compiled declarative macro expanders (`macro_rules!`` and `macro`)
1+
//! Compiled declarative macro expanders (`macro_rules!` and `macro`)
22
33
use base_db::CrateId;
44
use intern::sym;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ use super::inline_call::split_refs_and_uses;
4343
// fn foo() {
4444
// let _: i32 = 3;
4545
// }
46+
// ```
4647
pub(crate) fn inline_type_alias_uses(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<()> {
4748
let name = ctx.find_node_at_offset::<ast::Name>()?;
4849
let ast_alias = name.syntax().parent().and_then(ast::TypeAlias::cast)?;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
2525
// struct S {
2626
// field: i32
2727
// }
28+
// ```
2829

2930
enum WrapUnwrapOption {
3031
WrapDerive { derive: TextRange, attr: ast::Attr },

src/tools/rust-analyzer/crates/rust-analyzer/src/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ mod patch_old_style;
6060
// However, editor specific config, which the server doesn't know about, should
6161
// be specified directly in `package.json`.
6262
//
63-
// To deprecate an option by replacing it with another name use `new_name | `old_name` so that we keep
63+
// To deprecate an option by replacing it with another name use `new_name` | `old_name` so that we keep
6464
// parsing the old name.
6565
config_data! {
6666
/// Configs that apply on a workspace-wide scope. There are 2 levels on which a global configuration can be configured

src/tools/rust-analyzer/crates/rust-analyzer/tests/slow-tests/ratoml.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,7 @@ fn ratoml_multiple_ratoml_in_single_source_root() {
844844

845845
// [dependencies]
846846
// p2 = { path = "../p2" }
847-
// #,
847+
// "#,
848848
// r#"
849849
// //- /p1/src/lib.rs
850850
// enum Value {

0 commit comments

Comments
 (0)