bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Auto merge of #16487 - ShoyuVanilla:deref-generate-getter, r=Veykril
Remove unnecessary `.as_ref()` in generate getter assist Resolves #12389
Browse Source
bors 2024-02-08
parent 5812b69 · parent 26715a8 · commit e071834
Diffstat
-rw-r--r--crates/ide-assists/src/handlers/generate_getter_or_setter.rs18
-rw-r--r--crates/ide-assists/src/tests/generated.rs18
-rw-r--r--crates/ide-assists/src/utils.rs51
3 files changed, 66 insertions, 21 deletions
diff --git a/crates/ide-assists/src/handlers/generate_getter_or_setter.rs b/crates/ide-assists/src/handlers/generate_getter_or_setter.rs
index 79307fcec5..4610b7af38 100644
--- a/crates/ide-assists/src/handlers/generate_getter_or_setter.rs
+++ b/crates/ide-assists/src/handlers/generate_getter_or_setter.rs
@@ -75,7 +75,7 @@ pub(crate) fn generate_setter(acc: &mut Assists, ctx: &AssistContext<'_>) -> Opt
// Generate a getter method.
//
// ```
-// # //- minicore: as_ref
+// # //- minicore: as_ref, deref
// # pub struct String;
// # impl AsRef<str> for String {
// # fn as_ref(&self) -> &str {
@@ -83,6 +83,13 @@ pub(crate) fn generate_setter(acc: &mut Assists, ctx: &AssistContext<'_>) -> Opt
// # }
// # }
// #
+// # impl core::ops::Deref for String {
+// # type Target = str;
+// # fn deref(&self) -> &Self::Target {
+// # ""
+// # }
+// # }
+// #
// struct Person {
// nam$0e: String,
// }
@@ -96,13 +103,20 @@ pub(crate) fn generate_setter(acc: &mut Assists, ctx: &AssistContext<'_>) -> Opt
// # }
// # }
// #
+// # impl core::ops::Deref for String {
+// # type Target = str;
+// # fn deref(&self) -> &Self::Target {
+// # ""
+// # }
+// # }
+// #
// struct Person {
// name: String,
// }
//
// impl Person {
// fn $0name(&self) -> &str {
-// self.name.as_ref()
+// &self.name
// }
// }
// ```
diff --git a/crates/ide-assists/src/tests/generated.rs b/crates/ide-assists/src/tests/generated.rs
index 8d7c49d52c..5967cd38aa 100644
--- a/crates/ide-assists/src/tests/generated.rs
+++ b/crates/ide-assists/src/tests/generated.rs
@@ -1429,7 +1429,7 @@ fn doctest_generate_getter() {
check_doc_test(
"generate_getter",
r#####"
-//- minicore: as_ref
+//- minicore: as_ref, deref
pub struct String;
impl AsRef<str> for String {
fn as_ref(&self) -> &str {
@@ -1437,6 +1437,13 @@ impl AsRef<str> for String {
}
}
+impl core::ops::Deref for String {
+ type Target = str;
+ fn deref(&self) -> &Self::Target {
+ ""
+ }
+}
+
struct Person {
nam$0e: String,
}
@@ -1449,13 +1456,20 @@ impl AsRef<str> for String {
}
}
+impl core::ops::Deref for String {
+ type Target = str;
+ fn deref(&self) -> &Self::Target {
+ ""
+ }
+}
+
struct Person {
name: String,
}
impl Person {
fn $0name(&self) -> &str {
- self.name.as_ref()
+ &self.name
}
}
"#####,
diff --git a/crates/ide-assists/src/utils.rs b/crates/ide-assists/src/utils.rs
index eeb3d80d07..3bc585d323 100644
--- a/crates/ide-assists/src/utils.rs
+++ b/crates/ide-assists/src/utils.rs
@@ -600,6 +600,7 @@ pub(crate) fn add_method_to_adt(
pub(crate) struct ReferenceConversion {
conversion: ReferenceConversionType,
ty: hir::Type,
+ impls_deref: bool,
}
#[derive(Debug)]
@@ -656,7 +657,13 @@ impl ReferenceConversion {
| ReferenceConversionType::AsRefSlice
| ReferenceConversionType::Dereferenced
| ReferenceConversionType::Option
- | ReferenceConversionType::Result => format!("self.{field_name}.as_ref()"),
+ | ReferenceConversionType::Result => {
+ if self.impls_deref {
+ format!("&self.{field_name}")
+ } else {
+ format!("self.{field_name}.as_ref()")
+ }
+ }
}
}
}
@@ -675,54 +682,64 @@ pub(crate) fn convert_reference_type(
.or_else(|| handle_dereferenced(&ty, db, famous_defs))
.or_else(|| handle_option_as_ref(&ty, db, famous_defs))
.or_else(|| handle_result_as_ref(&ty, db, famous_defs))
- .map(|conversion| ReferenceConversion { ty, conversion })
+ .map(|(conversion, impls_deref)| ReferenceConversion { ty, conversion, impls_deref })
+}
+
+fn could_deref_to_target(ty: &hir::Type, target: &hir::Type, db: &dyn HirDatabase) -> bool {
+ let ty_ref = hir::Type::reference(ty, hir::Mutability::Shared);
+ let target_ref = hir::Type::reference(target, hir::Mutability::Shared);
+ ty_ref.could_coerce_to(db, &target_ref)
}
-fn handle_copy(ty: &hir::Type, db: &dyn HirDatabase) -> Option<ReferenceConversionType> {
- ty.is_copy(db).then_some(ReferenceConversionType::Copy)
+fn handle_copy(ty: &hir::Type, db: &dyn HirDatabase) -> Option<(ReferenceConversionType, bool)> {
+ ty.is_copy(db).then_some((ReferenceConversionType::Copy, true))
}
fn handle_as_ref_str(
ty: &hir::Type,
db: &dyn HirDatabase,
famous_defs: &FamousDefs<'_, '_>,
-) -> Option<ReferenceConversionType> {
+) -> Option<(ReferenceConversionType, bool)> {
let str_type = hir::BuiltinType::str().ty(db);
- ty.impls_trait(db, famous_defs.core_convert_AsRef()?, &[str_type])
- .then_some(ReferenceConversionType::AsRefStr)
+ ty.impls_trait(db, famous_defs.core_convert_AsRef()?, &[str_type.clone()])
+ .then_some((ReferenceConversionType::AsRefStr, could_deref_to_target(ty, &str_type, db)))
}
fn handle_as_ref_slice(
ty: &hir::Type,
db: &dyn HirDatabase,
famous_defs: &FamousDefs<'_, '_>,
-) -> Option<ReferenceConversionType> {
+) -> Option<(ReferenceConversionType, bool)> {
let type_argument = ty.type_arguments().next()?;
let slice_type = hir::Type::new_slice(type_argument);
- ty.impls_trait(db, famous_defs.core_convert_AsRef()?, &[slice_type])
- .then_some(ReferenceConversionType::AsRefSlice)
+ ty.impls_trait(db, famous_defs.core_convert_AsRef()?, &[slice_type.clone()]).then_some((
+ ReferenceConversionType::AsRefSlice,
+ could_deref_to_target(ty, &slice_type, db),
+ ))
}
fn handle_dereferenced(
ty: &hir::Type,
db: &dyn HirDatabase,
famous_defs: &FamousDefs<'_, '_>,
-) -> Option<ReferenceConversionType> {
+) -> Option<(ReferenceConversionType, bool)> {
let type_argument = ty.type_arguments().next()?;
- ty.impls_trait(db, famous_defs.core_convert_AsRef()?, &[type_argument])
- .then_some(ReferenceConversionType::Dereferenced)
+ ty.impls_trait(db, famous_defs.core_convert_AsRef()?, &[type_argument.clone()]).then_some((
+ ReferenceConversionType::Dereferenced,
+ could_deref_to_target(ty, &type_argument, db),
+ ))
}
fn handle_option_as_ref(
ty: &hir::Type,
db: &dyn HirDatabase,
famous_defs: &FamousDefs<'_, '_>,
-) -> Option<ReferenceConversionType> {
+) -> Option<(ReferenceConversionType, bool)> {
if ty.as_adt() == famous_defs.core_option_Option()?.ty(db).as_adt() {
- Some(ReferenceConversionType::Option)
+ Some((ReferenceConversionType::Option, false))
} else {
None
}
@@ -732,9 +749,9 @@ fn handle_result_as_ref(
ty: &hir::Type,
db: &dyn HirDatabase,
famous_defs: &FamousDefs<'_, '_>,
-) -> Option<ReferenceConversionType> {
+) -> Option<(ReferenceConversionType, bool)> {
if ty.as_adt() == famous_defs.core_result_Result()?.ty(db).as_adt() {
- Some(ReferenceConversionType::Result)
+ Some((ReferenceConversionType::Result, false))
} else {
None
}