Skip to content

Commit ab9a80e

Browse files
authored
Merge pull request #970 from wprzytula/value_tests
Deserialization refactor: introduce new deserialization traits
2 parents 3d3c353 + 30d5149 commit ab9a80e

File tree

10 files changed

+4460
-225
lines changed

10 files changed

+4460
-225
lines changed

scylla-cql/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ assert_matches = "1.5.0"
3333
criterion = "0.4" # Note: v0.5 needs at least rust 1.70.0
3434
# Use large-dates feature to test potential edge cases
3535
time = { version = "0.3.21", features = ["large-dates"] }
36+
uuid = { version = "1.0", features = ["v4"] }
3637

3738
[[bench]]
3839
name = "benchmark"

scylla-cql/src/frame/frame_errors.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use super::TryFromPrimitiveError;
22
use crate::cql_to_rust::CqlTypeError;
33
use crate::frame::value::SerializeValuesError;
4+
use crate::types::deserialize::DeserializationError;
45
use crate::types::serialize::SerializationError;
56
use thiserror::Error;
67

@@ -39,6 +40,8 @@ pub enum ParseError {
3940
#[error("Could not deserialize frame: {0}")]
4041
BadIncomingData(String),
4142
#[error(transparent)]
43+
DeserializationError(#[from] DeserializationError),
44+
#[error(transparent)]
4245
IoError(#[from] std::io::Error),
4346
#[error("type not yet implemented, id: {0}")]
4447
TypeNotImplemented(u16),

0 commit comments

Comments
 (0)