Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 05:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

refactor: remove repetitive string interpolation and doc changes

Browse source
This commit is contained in:
feniljain 2022-10-24 21:06:32 +05:30
parent c4bdb8e516
commit 4bf9b9b003
4 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
crates/ide-assists/src/handlers/generate_enum_projection_method.rs
View file

@ -161,27 +161,21 @@ fn generate_enum_projection_method(
let field_type_syntax = field_type.syntax(); let field_type_syntax = field_type.syntax();
let method = if ctx.config.assist_emit_must_use let must_use = if ctx.config.assist_emit_must_use {
{ "#[must_use]\n"
format!(
" #[must_use]
{vis}fn {fn_name}({self_param}) -> {return_prefix}{field_type_syntax}{return_suffix} {{
if let Self::{variant_name}{pattern_suffix} = self {{
{happy_case}({bound_name})
}} else {{
{sad_case}
}}
}}")
} else { } else {
format!( ""
" {vis}fn {fn_name}({self_param}) -> {return_prefix}{field_type_syntax}{return_suffix} {{ };
let method = format!(
" {must_use}{vis}fn {fn_name}({self_param}) -> {return_prefix}{field_type_syntax}{return_suffix} {{
if let Self::{variant_name}{pattern_suffix} = self {{ if let Self::{variant_name}{pattern_suffix} = self {{
{happy_case}({bound_name}) {happy_case}({bound_name})
}} else {{ }} else {{
{sad_case} {sad_case}
}} }}
}}") }}"
}; );
add_method_to_adt(builder, &parent_enum, impl_def, &method); add_method_to_adt(builder, &parent_enum, impl_def, &method);
}, },

2
crates/rust-analyzer/src/config.rs
View file

@ -56,7 +56,7 @@ mod patch_old_style;
// parsing the old name. // parsing the old name.
config_data! { config_data! {
struct ConfigData { struct ConfigData {
/// Whether to insert must_use derive macro while generating `as_` methods /// Whether to insert #[must_use] when generating `as_` methods
/// for enum variants. /// for enum variants.
assist_emitMustUse: bool = "false", assist_emitMustUse: bool = "false",
/// Placeholder expression to use for missing expressions in assists. /// Placeholder expression to use for missing expressions in assists.

2
docs/user/generated_config.adoc
View file

@ -1,7 +1,7 @@
[[rust-analyzer.assist.emitMustUse]]rust-analyzer.assist.emitMustUse (default: `false`):: [[rust-analyzer.assist.emitMustUse]]rust-analyzer.assist.emitMustUse (default: `false`)::
+ +
-- --
Whether to insert must_use derive macro while generating `as_` methods Whether to insert #[must_use] when generating `as_` methods
for enum variants. for enum variants.
-- --
[[rust-analyzer.assist.expressionFillDefault]]rust-analyzer.assist.expressionFillDefault (default: `"todo"`):: [[rust-analyzer.assist.expressionFillDefault]]rust-analyzer.assist.expressionFillDefault (default: `"todo"`)::

2
editors/code/package.json
View file

@ -398,7 +398,7 @@
}, },
"$generated-start": {}, "$generated-start": {},
"rust-analyzer.assist.emitMustUse": { "rust-analyzer.assist.emitMustUse": {
"markdownDescription": "Whether to insert must_use derive macro while generating `as_` methods\nfor enum variants.", "markdownDescription": "Whether to insert #[must_use] when generating `as_` methods\nfor enum variants.",
"default": false, "default": false,
"type": "boolean" "type": "boolean"
}, },