Unnamed repository; edit this file 'description' to name the repository.
| -rw-r--r-- | crates/ide-assists/src/handlers/generate_new.rs | 11 | ||||
| -rw-r--r-- | crates/ide-diagnostics/src/handlers/missing_fields.rs | 11 |
2 files changed, 4 insertions, 18 deletions
diff --git a/crates/ide-assists/src/handlers/generate_new.rs b/crates/ide-assists/src/handlers/generate_new.rs index fc17c5626e..31e36a51e8 100644 --- a/crates/ide-assists/src/handlers/generate_new.rs +++ b/crates/ide-assists/src/handlers/generate_new.rs @@ -29,12 +29,7 @@ pub fn use_trivial_constructor( )), ); - use hir::StructKind::*; - let is_record = match variant.kind(db) { - Record => true, - Tuple => false, - Unit => false, - }; + let is_record = variant.kind(db) == hir::StructKind::Record; return Some(if is_record { ast::Expr::RecordExpr(syntax::ast::make::record_expr( @@ -48,9 +43,7 @@ pub fn use_trivial_constructor( } } Some(hir::Adt::Struct(x)) => { - let fields = x.fields(db); - - if fields.is_empty() { + if x.fields(db).is_empty() { return Some(syntax::ast::make::expr_path(path)); } } diff --git a/crates/ide-diagnostics/src/handlers/missing_fields.rs b/crates/ide-diagnostics/src/handlers/missing_fields.rs index ff7d8de8fd..5739a87853 100644 --- a/crates/ide-diagnostics/src/handlers/missing_fields.rs +++ b/crates/ide-diagnostics/src/handlers/missing_fields.rs @@ -38,12 +38,7 @@ pub fn use_trivial_constructor( )), ); - use hir::StructKind::*; - let is_record = match variant.kind(db) { - Record => true, - Tuple => false, - Unit => false, - }; + let is_record = variant.kind(db) == hir::StructKind::Record; return Some(if is_record { ast::Expr::RecordExpr(syntax::ast::make::record_expr( @@ -57,9 +52,7 @@ pub fn use_trivial_constructor( } } Some(hir::Adt::Struct(x)) => { - let fields = x.fields(db); - - if fields.is_empty() { + if x.fields(db).is_empty() { return Some(syntax::ast::make::expr_path(path)); } } |