rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat(diagnostics): use default expression instead of todo! when missing fields

Browse Source 
Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
This commit is contained in:
Benjamin Coenen
2022-01-07 14:13:34 +01:00
parent 0a4239a815
commit b60a29ca94
6 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
crates/rust-analyzer/src/config.rs
View File

@@ -698,7 +698,7 @@ impl Config {
disabled: self.data.diagnostics_disabled.clone(),
expr_fill_default: match self.data.assist_exprFillDefault {
ExprFillDefaultDef::Todo => ExprFillDefaultMode::Todo,
ExprFillDefaultDef::DefaultImpl => ExprFillDefaultMode::DefaultImpl,
ExprFillDefaultDef::Default => ExprFillDefaultMode::Default,
},
}
}
@@ -1070,8 +1070,8 @@ enum ManifestOrProjectJson {
pub enum ExprFillDefaultDef {
#[serde(alias = "todo")]
Todo,
#[serde(alias = "defaultImpl")]
DefaultImpl,
#[serde(alias = "default")]
Default,
}
#[derive(Deserialize, Debug, Clone)]
@@ -1270,9 +1270,9 @@ fn field_props(field: &str, ty: &str, doc: &[&str], default: &str) -> serde_json
},
"ExprFillDefaultDef" => set! {
"type": "string",
"enum": ["todo", "defaultImpl"],
"enum": ["todo", "default"],
"enumDescriptions": [
"Fill missing elements with 'todo' macro",
"Fill missing expressions with the 'todo' macro",
"Fill missing expressions with reasonable defaults, `new` or `default` constructors."
],
},