rust-analyzer

Unnamed repository; edit this file 'description' to name the repository.

Clone

HTTPS

SSH

Diffstat (limited to 'crates/ide-assists/src/handlers/extract_struct_from_enum_variant.rs')

-rw-r--r--

1 files changed, 4 insertions, 4 deletions

diff --git a/crates/ide-assists/src/handlers/extract_struct_from_enum_variant.rs b/crates/ide-assists/src/handlers/extract_struct_from_enum_variant.rs
index cbf4e0ec28..4c46a51bef 100644
--- a/crates/ide-assists/src/handlers/extract_struct_from_enum_variant.rs
+++ b/crates/ide-assists/src/handlers/extract_struct_from_enum_variant.rs

@@ -1,7 +1,7 @@

use std::iter;

use either::Either;

-use hir::{HasCrate, Module, ModuleDef, Name, Variant};

+use hir::{EnumVariant, HasCrate, Module, ModuleDef, Name};

use ide_db::{

FxHashSet, RootDatabase,

defs::Definition,

@@ -61,7 +61,7 @@ pub(crate) fn extract_struct_from_enum_variant(

let edition = enum_hir.krate(ctx.db()).edition(ctx.db());

let variant_hir_name = variant_hir.name(ctx.db());

let enum_module_def = ModuleDef::from(enum_hir);

- let usages = Definition::Variant(variant_hir).usages(&ctx.sema).all();

+ let usages = Definition::EnumVariant(variant_hir).usages(&ctx.sema).all();

let mut visited_modules_set = FxHashSet::default();

let current_module = enum_hir.module(ctx.db());

@@ -161,7 +161,7 @@ fn extract_field_list_if_applicable(

}

-fn existing_definition(db: &RootDatabase, variant_name: &ast::Name, variant: &Variant) -> bool {

+fn existing_definition(db: &RootDatabase, variant_name: &ast::Name, variant: &EnumVariant) -> bool {

variant

.parent_enum(db)

.module(db)

@@ -173,7 +173,7 @@ fn existing_definition(db: &RootDatabase, variant_name: &ast::Name, variant: &Va

def,

ModuleDef::Module(_)

| ModuleDef::Adt(_)

- | ModuleDef::Variant(_)

+ | ModuleDef::EnumVariant(_)

| ModuleDef::Trait(_)

| ModuleDef::TypeAlias(_)

| ModuleDef::BuiltinType(_)