Skip to content

Commit 8b9b5d0

Browse files
authored
Merge pull request sfackler#1018 from BastiDood/str-to-sql-refactor
refactor(types): improve readability of `impl ToSql for &str`
2 parents 7dd6813 + 98abdf9 commit 8b9b5d0

File tree

1 file changed

+8
-16
lines changed

1 file changed

+8
-16
lines changed

postgres-types/src/lib.rs

+8-16
Original file line numberDiff line numberDiff line change
@@ -1012,28 +1012,20 @@ impl ToSql for Vec<u8> {
10121012

10131013
impl<'a> ToSql for &'a str {
10141014
fn to_sql(&self, ty: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
1015-
match *ty {
1016-
ref ty if ty.name() == "ltree" => types::ltree_to_sql(self, w),
1017-
ref ty if ty.name() == "lquery" => types::lquery_to_sql(self, w),
1018-
ref ty if ty.name() == "ltxtquery" => types::ltxtquery_to_sql(self, w),
1015+
match ty.name() {
1016+
"ltree" => types::ltree_to_sql(self, w),
1017+
"lquery" => types::lquery_to_sql(self, w),
1018+
"ltxtquery" => types::ltxtquery_to_sql(self, w),
10191019
_ => types::text_to_sql(self, w),
10201020
}
10211021
Ok(IsNull::No)
10221022
}
10231023

10241024
fn accepts(ty: &Type) -> bool {
1025-
match *ty {
1026-
Type::VARCHAR | Type::TEXT | Type::BPCHAR | Type::NAME | Type::UNKNOWN => true,
1027-
ref ty
1028-
if (ty.name() == "citext"
1029-
|| ty.name() == "ltree"
1030-
|| ty.name() == "lquery"
1031-
|| ty.name() == "ltxtquery") =>
1032-
{
1033-
true
1034-
}
1035-
_ => false,
1036-
}
1025+
matches!(
1026+
*ty,
1027+
Type::VARCHAR | Type::TEXT | Type::BPCHAR | Type::NAME | Type::UNKNOWN
1028+
) || matches!(ty.name(), "citext" | "ltree" | "lquery" | "ltxtquery")
10371029
}
10381030

10391031
to_sql_checked!();

0 commit comments

Comments
 (0)