language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 14:21:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add fix to wrap return expression in Some

Browse source
This commit is contained in:
Phil Ellison 2020-12-30 17:23:00 +00:00
parent 981a0d708e
commit b2dbe6e43a
7 changed files with 90 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/hir_ty/src/diagnostics.rs
View file

@ -186,9 +186,10 @@ impl Diagnostic for MissingMatchArms {
}
}
// Diagnostic: missing-ok-in-tail-expr
// Diagnostic: missing-ok-or-some-in-tail-expr
//
// This diagnostic is triggered if block that should return `Result` returns a value not wrapped in `Ok`.
// This diagnostic is triggered if a block that should return `Result` returns a value not wrapped in `Ok`,
// or if a block that should return `Option` returns a value not wrapped in `Some`.
//
// Example:
//
@ -198,17 +199,19 @@ impl Diagnostic for MissingMatchArms {
// }
// ```
#[derive(Debug)]
pub struct MissingOkInTailExpr {
pub struct MissingOkOrSomeInTailExpr {
pub file: HirFileId,
pub expr: AstPtr<ast::Expr>,
// `Some` or `Ok` depending on whether the return type is Result or Option
pub required: String,
}
impl Diagnostic for MissingOkInTailExpr {
impl Diagnostic for MissingOkOrSomeInTailExpr {
fn code(&self) -> DiagnosticCode {
DiagnosticCode("missing-ok-in-tail-expr")
DiagnosticCode("missing-ok-or-some-in-tail-expr")
}
fn message(&self) -> String {
"wrap return expression in Ok".to_string()
format!("wrap return expression in {}", self.required)
}
fn display_source(&self) -> InFile<SyntaxNodePtr> {
InFile { file_id: self.file, value: self.expr.clone().into() }