From 477b9871791d19dfdf64f6f9d98301d29c810bf1 Mon Sep 17 00:00:00 2001 From: Ali Bektas Date: Sat, 8 Mar 2025 14:13:51 +0100 Subject: [PATCH 1/3] Observe unsafeness when generating manual impls of former derives --- .../src/handlers/add_missing_impl_members.rs | 29 +++++++++++++++++++ crates/ide-assists/src/utils.rs | 6 +++- crates/syntax/src/ast/make.rs | 2 +- 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/crates/ide-assists/src/handlers/add_missing_impl_members.rs b/crates/ide-assists/src/handlers/add_missing_impl_members.rs index 6b8a877756..ef538c17ce 100644 --- a/crates/ide-assists/src/handlers/add_missing_impl_members.rs +++ b/crates/ide-assists/src/handlers/add_missing_impl_members.rs @@ -2363,4 +2363,33 @@ impl other_file_2::Trait for MyStruct { }"#, ); } + + #[test] + fn unsafeness_observed() { + check_assist( + add_missing_impl_members, + r#" +unsafe trait UnsafeTrait { + unsafe fn unsafe_fn(); +} + +struct A {} + +impl Uns$0afeTrait for A {} + "#, + r#" +unsafe trait UnsafeTrait { + unsafe fn unsafe_fn(); +} + +struct A {} + +unsafe impl UnsafeTrait for A { + unsafe fn unsafe_fn() { + ${0:todo!()} + } +} + "#, + ); + } } diff --git a/crates/ide-assists/src/utils.rs b/crates/ide-assists/src/utils.rs index 0806d5feb1..31924773b4 100644 --- a/crates/ide-assists/src/utils.rs +++ b/crates/ide-assists/src/utils.rs @@ -24,7 +24,7 @@ use syntax::{ make, syntax_factory::SyntaxFactory, }, - ted, + ted::{self, Position}, }; use crate::assist_context::{AssistContext, SourceChangeBuilder}; @@ -212,6 +212,10 @@ pub fn add_trait_assoc_items_to_impl( }); let assoc_item_list = impl_.get_or_create_assoc_item_list(); + if trait_.is_unsafe(sema.db) { + ted::insert(Position::first_child_of(impl_.syntax()), make::token(T![unsafe])); + } + let mut first_item = None; for item in items { first_item.get_or_insert_with(|| item.clone()); diff --git a/crates/syntax/src/ast/make.rs b/crates/syntax/src/ast/make.rs index 7147311f63..d5a5119ff6 100644 --- a/crates/syntax/src/ast/make.rs +++ b/crates/syntax/src/ast/make.rs @@ -1276,7 +1276,7 @@ pub mod tokens { pub(super) static SOURCE_FILE: LazyLock> = LazyLock::new(|| { SourceFile::parse( - "use crate::foo; const C: <()>::Item = ( true && true , true || true , 1 != 1, 2 == 2, 3 < 3, 4 <= 4, 5 > 5, 6 >= 6, !true, *p, &p , &mut p, async { let _ @ [] })\n;\n\nimpl A for B where: {}", + "use crate::foo; const C: <()>::Item = ( true && true , true || true , 1 != 1, 2 == 2, 3 < 3, 4 <= 4, 5 > 5, 6 >= 6, !true, *p, &p , &mut p, async { let _ @ [] })\n;\n\nunsafe impl A for B where: {}", Edition::CURRENT, ) }); From 824df43d2d66f038354160450b38bbcc822e0b4a Mon Sep 17 00:00:00 2001 From: Ali Bektas Date: Sun, 9 Mar 2025 18:47:40 +0100 Subject: [PATCH 2/3] Observe unsafeness only for replace_derive_with_manual_impl --- .../src/handlers/add_missing_impl_members.rs | 29 ------------------- .../replace_derive_with_manual_impl.rs | 6 +++- crates/ide-assists/src/utils.rs | 5 +--- 3 files changed, 6 insertions(+), 34 deletions(-) diff --git a/crates/ide-assists/src/handlers/add_missing_impl_members.rs b/crates/ide-assists/src/handlers/add_missing_impl_members.rs index ef538c17ce..6b8a877756 100644 --- a/crates/ide-assists/src/handlers/add_missing_impl_members.rs +++ b/crates/ide-assists/src/handlers/add_missing_impl_members.rs @@ -2363,33 +2363,4 @@ impl other_file_2::Trait for MyStruct { }"#, ); } - - #[test] - fn unsafeness_observed() { - check_assist( - add_missing_impl_members, - r#" -unsafe trait UnsafeTrait { - unsafe fn unsafe_fn(); -} - -struct A {} - -impl Uns$0afeTrait for A {} - "#, - r#" -unsafe trait UnsafeTrait { - unsafe fn unsafe_fn(); -} - -struct A {} - -unsafe impl UnsafeTrait for A { - unsafe fn unsafe_fn() { - ${0:todo!()} - } -} - "#, - ); - } } diff --git a/crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs b/crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs index 7696a14a4f..8ff9fe09b5 100644 --- a/crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs +++ b/crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs @@ -5,7 +5,7 @@ use syntax::{ SyntaxKind::WHITESPACE, T, ast::{self, AstNode, HasName, make}, - ted, + ted::{self, Position}, }; use crate::{ @@ -223,6 +223,10 @@ fn impl_def_from_trait( let first_assoc_item = add_trait_assoc_items_to_impl(sema, &trait_items, trait_, &impl_def, &target_scope); + if trait_.is_unsafe(sema.db) { + ted::insert(Position::first_child_of(impl_def.syntax()), make::token(T![unsafe])); + } + // Generate a default `impl` function body for the derived trait. if let ast::AssocItem::Fn(ref func) = first_assoc_item { let _ = gen_trait_fn_body(func, trait_path, adt, None); diff --git a/crates/ide-assists/src/utils.rs b/crates/ide-assists/src/utils.rs index 31924773b4..8b81c920ec 100644 --- a/crates/ide-assists/src/utils.rs +++ b/crates/ide-assists/src/utils.rs @@ -24,7 +24,7 @@ use syntax::{ make, syntax_factory::SyntaxFactory, }, - ted::{self, Position}, + ted, }; use crate::assist_context::{AssistContext, SourceChangeBuilder}; @@ -212,9 +212,6 @@ pub fn add_trait_assoc_items_to_impl( }); let assoc_item_list = impl_.get_or_create_assoc_item_list(); - if trait_.is_unsafe(sema.db) { - ted::insert(Position::first_child_of(impl_.syntax()), make::token(T![unsafe])); - } let mut first_item = None; for item in items { From 1afbcc06f36d872ea5d1d8dbb20286c59fd92a60 Mon Sep 17 00:00:00 2001 From: Ali Bektas Date: Mon, 17 Mar 2025 22:37:21 +0100 Subject: [PATCH 3/3] Test unsafeness is respected when manual impling derives --- .../replace_derive_with_manual_impl.rs | 50 +++++++++++++++++-- 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs b/crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs index 8ff9fe09b5..e0693a7d5b 100644 --- a/crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs +++ b/crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs @@ -131,7 +131,7 @@ fn add_assist( target, |builder| { let insert_after = ted::Position::after(builder.make_mut(adt.clone()).syntax()); - + let impl_is_unsafe = trait_.map(|s| s.is_unsafe(ctx.db())).unwrap_or(false); let impl_def_with_items = impl_def_from_trait(&ctx.sema, adt, &annotated_name, trait_, replace_trait_path); update_attribute(builder, old_derives, old_tree, old_trait_path, attr); @@ -141,6 +141,12 @@ fn add_assist( match (ctx.config.snippet_cap, impl_def_with_items) { (None, None) => { let impl_def = generate_trait_impl(adt, trait_path); + if impl_is_unsafe { + ted::insert( + Position::first_child_of(impl_def.syntax()), + make::token(T![unsafe]), + ); + } ted::insert_all( insert_after, @@ -148,6 +154,12 @@ fn add_assist( ); } (None, Some((impl_def, _))) => { + if impl_is_unsafe { + ted::insert( + Position::first_child_of(impl_def.syntax()), + make::token(T![unsafe]), + ); + } ted::insert_all( insert_after, vec![make::tokens::blank_line().into(), impl_def.syntax().clone().into()], @@ -156,6 +168,13 @@ fn add_assist( (Some(cap), None) => { let impl_def = generate_trait_impl(adt, trait_path); + if impl_is_unsafe { + ted::insert( + Position::first_child_of(impl_def.syntax()), + make::token(T![unsafe]), + ); + } + if let Some(l_curly) = impl_def.assoc_item_list().and_then(|it| it.l_curly_token()) { @@ -169,6 +188,14 @@ fn add_assist( } (Some(cap), Some((impl_def, first_assoc_item))) => { let mut added_snippet = false; + + if impl_is_unsafe { + ted::insert( + Position::first_child_of(impl_def.syntax()), + make::token(T![unsafe]), + ); + } + if let ast::AssocItem::Fn(ref func) = first_assoc_item { if let Some(m) = func.syntax().descendants().find_map(ast::MacroCall::cast) { @@ -223,10 +250,6 @@ fn impl_def_from_trait( let first_assoc_item = add_trait_assoc_items_to_impl(sema, &trait_items, trait_, &impl_def, &target_scope); - if trait_.is_unsafe(sema.db) { - ted::insert(Position::first_child_of(impl_def.syntax()), make::token(T![unsafe])); - } - // Generate a default `impl` function body for the derived trait. if let ast::AssocItem::Fn(ref func) = first_assoc_item { let _ = gen_trait_fn_body(func, trait_path, adt, None); @@ -1406,6 +1429,23 @@ impl core::fmt::Debug for Foo { f.debug_struct("Foo").finish() } } +"#, + ) + } + + #[test] + fn unsafeness_of_a_trait_observed() { + check_assist( + replace_derive_with_manual_impl, + r#" +//- minicore: send, derive +#[derive(Sen$0d)] +pub struct Foo; +"#, + r#" +pub struct Foo; + +unsafe impl Send for Foo {$0} "#, ) }