Skip to content

Commit 868d86f

Browse files
authored
Merge pull request #1141 from wprzytula/deprecate-legacy-items
Deprecate legacy items
2 parents affcf82 + c136255 commit 868d86f

File tree

20 files changed

+1085
-892
lines changed

20 files changed

+1085
-892
lines changed

Cargo.lock.msrv

Lines changed: 47 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

scylla-cql/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ tokio = { version = "1.34", features = ["io-util", "time"] }
1818
secrecy-08 = { package = "secrecy", version = "0.8", optional = true }
1919
snap = "1.0"
2020
uuid = "1.0"
21-
thiserror = "1.0"
21+
thiserror = "2.0.6"
2222
num-bigint-03 = { package = "num-bigint", version = "0.3", optional = true }
2323
num-bigint-04 = { package = "num-bigint", version = "0.4", optional = true }
2424
bigdecimal-04 = { package = "bigdecimal", version = "0.4", optional = true }

scylla-cql/src/frame/response/cql_to_rust.rs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ use std::net::IpAddr;
1010
use thiserror::Error;
1111
use uuid::Uuid;
1212

13+
#[deprecated(
14+
since = "0.15.1",
15+
note = "Legacy deserialization API is inefficient and is going to be removed soon"
16+
)]
17+
#[allow(deprecated)]
1318
#[derive(Error, Debug, Clone, PartialEq, Eq)]
1419
pub enum FromRowError {
1520
#[error("{err} in the column with index {column}")]
@@ -29,6 +34,10 @@ pub trait FromCqlVal<T>: Sized {
2934
fn from_cql(cql_val: T) -> Result<Self, FromCqlValError>;
3035
}
3136

37+
#[deprecated(
38+
since = "0.15.1",
39+
note = "Legacy deserialization API is inefficient and is going to be removed soon"
40+
)]
3241
#[derive(Error, Debug, Clone, PartialEq, Eq)]
3342
pub enum FromCqlValError {
3443
#[error("Bad CQL type")]
@@ -99,6 +108,10 @@ impl<T: FromCqlVal<CqlValue>> FromCqlVal<Option<CqlValue>> for Option<T> {
99108
///
100109
/// impl_from_cql_value_from_method!(MyBytes, into_my_bytes);
101110
/// ```
111+
#[deprecated(
112+
since = "0.15.1",
113+
note = "Legacy deserialization API is inefficient and is going to be removed soon"
114+
)]
102115
#[macro_export]
103116
macro_rules! impl_from_cql_value_from_method {
104117
($T:ty, $convert_func:ident) => {

scylla-cql/src/frame/response/result.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2410,6 +2410,7 @@ mod tests {
24102410
);
24112411
}
24122412

2413+
#[allow(deprecated)]
24132414
#[test]
24142415
fn test_serialize_empty() {
24152416
use crate::frame::value::Value;

0 commit comments

Comments
 (0)