From cb3ef552e873a86e94a3792160fadb5d937a6f5f Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 30 Apr 2021 11:52:31 +0300 Subject: internal: normalize name All def types in hir are unsubstituted --- crates/ide_assists/src/handlers/generate_from_impl_for_enum.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crates/ide_assists/src/handlers') diff --git a/crates/ide_assists/src/handlers/generate_from_impl_for_enum.rs b/crates/ide_assists/src/handlers/generate_from_impl_for_enum.rs index c13c6eebe..ce6998d82 100644 --- a/crates/ide_assists/src/handlers/generate_from_impl_for_enum.rs +++ b/crates/ide_assists/src/handlers/generate_from_impl_for_enum.rs @@ -91,7 +91,7 @@ fn existing_from_impl( let enum_type = enum_.ty(sema.db); - let wrapped_type = variant.fields(sema.db).get(0)?.signature_ty(sema.db); + let wrapped_type = variant.fields(sema.db).get(0)?.ty(sema.db); if enum_type.impls_trait(sema.db, from_trait, &[wrapped_type]) { Some(()) -- cgit v1.2.3 From 1a01a5ae190ad02e44c3550ac0336b1f0983be51 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 30 Apr 2021 11:55:59 +0300 Subject: internal: fix naming polarity Type Constructors have *parameters*, when they are substituted with type *arguments*, we have a type. --- crates/ide_assists/src/handlers/extract_function.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crates/ide_assists/src/handlers') diff --git a/crates/ide_assists/src/handlers/extract_function.rs b/crates/ide_assists/src/handlers/extract_function.rs index 5f80a40c8..b30652a9d 100644 --- a/crates/ide_assists/src/handlers/extract_function.rs +++ b/crates/ide_assists/src/handlers/extract_function.rs @@ -1183,7 +1183,7 @@ fn make_ret_ty(ctx: &AssistContext, module: hir::Module, fun: &Function) -> Opti } FlowHandler::Try { kind: TryKind::Result { ty: parent_ret_ty } } => { let handler_ty = parent_ret_ty - .type_parameters() + .type_arguments() .nth(1) .map(|ty| make_ty(&ty, ctx, module)) .unwrap_or_else(make::ty_unit); -- cgit v1.2.3