From 371cf4a0cc8e4e3183ce1a276274941c75957490 Mon Sep 17 00:00:00 2001 From: kdesjard Date: Mon, 26 Aug 2024 17:15:48 -0400 Subject: [PATCH] Pgsql cube type compile fail (#3459) * fails to compile as size_of is not found in scope * keep scoping consistent with other type modules * fmt fixes --------- Co-authored-by: kdesjard --- sqlx-postgres/src/types/cube.rs | 3 ++- sqlx-postgres/src/types/hstore.rs | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sqlx-postgres/src/types/cube.rs b/sqlx-postgres/src/types/cube.rs index 42477984..f39d8265 100644 --- a/sqlx-postgres/src/types/cube.rs +++ b/sqlx-postgres/src/types/cube.rs @@ -5,6 +5,7 @@ use crate::types::Type; use crate::{PgArgumentBuffer, PgHasArrayType, PgTypeInfo, PgValueFormat, PgValueRef, Postgres}; use sqlx_core::bytes::Buf; use sqlx_core::Error; +use std::mem; use std::str::FromStr; const BYTE_WIDTH: usize = 8; @@ -304,7 +305,7 @@ fn remove_parentheses(s: &str) -> String { } impl Header { - const PACKED_WIDTH: usize = size_of::(); + const PACKED_WIDTH: usize = mem::size_of::(); fn encoded_size(&self) -> usize { Self::PACKED_WIDTH + self.data_size() diff --git a/sqlx-postgres/src/types/hstore.rs b/sqlx-postgres/src/types/hstore.rs index bb61cc54..84172fcb 100644 --- a/sqlx-postgres/src/types/hstore.rs +++ b/sqlx-postgres/src/types/hstore.rs @@ -1,6 +1,6 @@ use std::{ collections::{btree_map, BTreeMap}, - mem::size_of, + mem, ops::{Deref, DerefMut}, str, }; @@ -214,10 +214,10 @@ impl Encode<'_, Postgres> for PgHstore { } fn read_length(buf: &mut &[u8]) -> Result { - if buf.len() < size_of::() { + if buf.len() < mem::size_of::() { return Err(format!( "expected {} bytes, got {}", - size_of::(), + mem::size_of::(), buf.len() )); }