Merge #2433

2433: Use Name::missing consistently r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

2 files changed, 3 insertions, 9 deletions

diff --git a/crates/ra_ide/src/completion/presentation.rs b/crates/ra_ide/src/completion/presentation.rs
index 5f056730a..97475fc0b 100644
--- a/crates/ra_ide/src/completion/presentation.rs
+++ b/crates/ra_ide/src/completion/presentation.rs
@@ -267,10 +267,7 @@ impl Completions {
 
     pub(crate) fn add_enum_variant(&mut self, ctx: &CompletionContext, variant: hir::EnumVariant) {
         let is_deprecated = is_deprecated(variant, ctx.db);
-        let name = match variant.name(ctx.db) {
-            Some(it) => it,
-            None => return,
-        };
+        let name = variant.name(ctx.db);
         let detail_types = variant.fields(ctx.db).into_iter().map(|field| field.ty(ctx.db));
         let detail = join(detail_types.map(|t| t.display(ctx.db).to_string()))
             .separator(", ")
diff --git a/crates/ra_ide/src/display/function_signature.rs b/crates/ra_ide/src/display/function_signature.rs
index d96de4e4c..324ad9552 100644
--- a/crates/ra_ide/src/display/function_signature.rs
+++ b/crates/ra_ide/src/display/function_signature.rs
@@ -93,12 +93,9 @@ impl FunctionSignature {
             _ => (),
         };
 
-        let parent_name = match variant.parent_enum(db).name(db) {
-            Some(name) => name.to_string(),
-            None => "missing".into(),
-        };
+        let parent_name = variant.parent_enum(db).name(db).to_string();
 
-        let name = format!("{}::{}", parent_name, variant.name(db).unwrap());
+        let name = format!("{}::{}", parent_name, variant.name(db));
 
         let params = variant
             .fields(db)