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

Use Name::missing consistently

Browse source
This commit is contained in:
Aleksey Kladov 2019-11-27 23:22:20 +03:00
parent c0bb667a7d
commit 1d14fd1737
7 changed files with 33 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/ra_ide/src/completion/presentation.rs
View file

@ -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(", ")

7
crates/ra_ide/src/display/function_signature.rs
View file

@ -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)