From 9a1a6019c519e9cd76add2494190d21fc5f574f9 Mon Sep 17 00:00:00 2001 From: Dzejkop Date: Tue, 15 Oct 2024 12:30:05 +0200 Subject: [PATCH] Bump sqlx 0.7 -> 0.8.2 --- Cargo.toml | 2 +- src/support/sqlx.rs | 22 ++++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 75e0b8c5..961b1d89 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -72,7 +72,7 @@ bytes = { version = "1.4", optional = true } postgres-types = { version = "0.2", optional = true } # sqlx -sqlx-core = { version = "0.7", optional = true } +sqlx-core = { version = "0.8.2", optional = true } [dev-dependencies] ruint = { path = ".", features = ["arbitrary", "proptest"] } diff --git a/src/support/sqlx.rs b/src/support/sqlx.rs index c113f87a..01adb717 100644 --- a/src/support/sqlx.rs +++ b/src/support/sqlx.rs @@ -5,16 +5,15 @@ #![cfg(feature = "sqlx")] #![cfg_attr(docsrs, doc(cfg(feature = "sqlx")))] -use crate::Uint; -use sqlx_core::{ - database::{Database, HasArguments, HasValueRef}, - decode::Decode, - encode::{Encode, IsNull}, - error::BoxDynError, - types::Type, -}; +use sqlx_core::database::Database; +use sqlx_core::decode::Decode; +use sqlx_core::encode::{Encode, IsNull}; +use sqlx_core::error::BoxDynError; +use sqlx_core::types::Type; use thiserror::Error; +use crate::Uint; + #[derive(Error, Debug)] pub enum DecodeError { #[error("Value too large for target type")] @@ -38,7 +37,10 @@ impl<'a, const BITS: usize, const LIMBS: usize, DB: Database> Encode<'a, DB> for where Vec: Encode<'a, DB>, { - fn encode_by_ref(&self, buf: &mut >::ArgumentBuffer) -> IsNull { + fn encode_by_ref( + &self, + buf: &mut ::ArgumentBuffer<'a>, + ) -> Result { self.to_be_bytes_vec().encode_by_ref(buf) } } @@ -47,7 +49,7 @@ impl<'a, const BITS: usize, const LIMBS: usize, DB: Database> Decode<'a, DB> for where Vec: Decode<'a, DB>, { - fn decode(value: >::ValueRef) -> Result { + fn decode(value: ::ValueRef<'a>) -> Result { let bytes = Vec::::decode(value)?; Self::try_from_be_slice(bytes.as_slice()).ok_or_else(|| DecodeError::Overflow.into()) }