Merge pull request #1176 from Lorak-mmk/migrate-higiene-test

Hygiene fixes for ser / deser macros

Author: wprzytula

Cargo.lock.msrv

@@ -6,7 +6,7 @@ use scylla_cql::frame::request::query::PagingState;
 use scylla_cql::frame::request::SerializableRequest;
 use scylla_cql::frame::response::result::ColumnType;
 use scylla_cql::frame::{request::query, Compression, SerializedRequest};
-use scylla_cql::types::serialize::row::SerializedValues;
+use scylla_cql::serialize::row::SerializedValues;
 
 fn make_query(contents: &str, values: SerializedValues) -> query::Query<'_> {
     query::Query {

scylla-cql/benches/benchmark.rs

@@ -139,7 +139,7 @@ impl<'frame> FrameSlice<'frame> {
     ///
     /// If the operation fails then the slice remains unchanged.
     #[inline]
-    pub(super) fn read_cql_bytes(
+    pub fn read_cql_bytes(
         &mut self,
     ) -> Result<Option<FrameSlice<'frame>>, LowLevelDeserializationError> {
         // We copy the slice reference, not to mutate the FrameSlice in case of an error.

scylla-cql/src/types/deserialize/frame_slice.rs renamed to scylla-cql/src/deserialize/frame_slice.rs

@@ -88,8 +88,8 @@
 //!
 //! ```rust
 //! # use scylla_cql::frame::response::result::ColumnType;
-//! # use scylla_cql::types::deserialize::{DeserializationError, FrameSlice, TypeCheckError};
-//! # use scylla_cql::types::deserialize::value::DeserializeValue;
+//! # use scylla_cql::deserialize::{DeserializationError, FrameSlice, TypeCheckError};
+//! # use scylla_cql::deserialize::value::DeserializeValue;
 //! use thiserror::Error;
 //! struct MyVec(Vec<u8>);
 //! #[derive(Debug, Error)]
@@ -129,8 +129,8 @@
 //!
 //! ```rust
 //! # use scylla_cql::frame::response::result::ColumnType;
-//! # use scylla_cql::types::deserialize::{DeserializationError, FrameSlice, TypeCheckError};
-//! # use scylla_cql::types::deserialize::value::DeserializeValue;
+//! # use scylla_cql::deserialize::{DeserializationError, FrameSlice, TypeCheckError};
+//! # use scylla_cql::deserialize::value::DeserializeValue;
 //! use thiserror::Error;
 //! struct MySlice<'a>(&'a [u8]);
 //! #[derive(Debug, Error)]
@@ -180,8 +180,8 @@
 //!
 //! ```rust
 //! # use scylla_cql::frame::response::result::ColumnType;
-//! # use scylla_cql::types::deserialize::{DeserializationError, FrameSlice, TypeCheckError};
-//! # use scylla_cql::types::deserialize::value::DeserializeValue;
+//! # use scylla_cql::deserialize::{DeserializationError, FrameSlice, TypeCheckError};
+//! # use scylla_cql::deserialize::value::DeserializeValue;
 //! # use bytes::Bytes;
 //! use thiserror::Error;
 //! struct MyBytes(Bytes);

scylla-cql/src/types/deserialize/mod.rs renamed to scylla-cql/src/deserialize/mod.rs

@@ -29,10 +29,7 @@ impl<'frame, 'metadata> ColumnIterator<'frame, 'metadata> {
     /// - `specs` - information about columns of the serialized response,
     /// - `slice` - a [FrameSlice] which points to the serialized row.
     #[inline]
-    pub(crate) fn new(
-        specs: &'metadata [ColumnSpec<'metadata>],
-        slice: FrameSlice<'frame>,
-    ) -> Self {
+    pub fn new(specs: &'metadata [ColumnSpec<'metadata>], slice: FrameSlice<'frame>) -> Self {
         Self {
             specs: specs.iter().enumerate(),
             slice,

scylla-cql/src/types/deserialize/result.rs renamed to scylla-cql/src/deserialize/result.rs

@@ -2,9 +2,9 @@ use assert_matches::assert_matches;
 use bytes::Bytes;
 use scylla_macros::DeserializeRow;
 
+use crate::deserialize::row::BuiltinDeserializationErrorKind;
+use crate::deserialize::{value, DeserializationError, FrameSlice};
 use crate::frame::response::result::{ColumnSpec, ColumnType, TableSpec};
-use crate::types::deserialize::row::BuiltinDeserializationErrorKind;
-use crate::types::deserialize::{value, DeserializationError, FrameSlice};
 
 use super::super::tests::{serialize_cells, spec};
 use super::{BuiltinDeserializationError, ColumnIterator, CqlValue, DeserializeRow, Row};

scylla-cql/src/types/deserialize/row.rs renamed to scylla-cql/src/deserialize/row.rs

@@ -8,15 +8,15 @@ use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
 use std::fmt::Debug;
 use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
 
+use crate::deserialize::value::{TupleDeserializationErrorKind, TupleTypeCheckErrorKind};
+use crate::deserialize::{DeserializationError, FrameSlice, TypeCheckError};
 use crate::frame::response::result::{ColumnType, CqlValue};
 use crate::frame::value::{
     Counter, CqlDate, CqlDecimal, CqlDecimalBorrowed, CqlDuration, CqlTime, CqlTimestamp,
     CqlTimeuuid, CqlVarint, CqlVarintBorrowed,
 };
-use crate::types::deserialize::value::{TupleDeserializationErrorKind, TupleTypeCheckErrorKind};
-use crate::types::deserialize::{DeserializationError, FrameSlice, TypeCheckError};
-use crate::types::serialize::value::SerializeValue;
-use crate::types::serialize::CellWriter;
+use crate::serialize::value::SerializeValue;
+use crate::serialize::CellWriter;
 
 use super::{
     mk_deser_err, BuiltinDeserializationError, BuiltinDeserializationErrorKind,

scylla-cql/src/types/deserialize/row_tests.rs renamed to scylla-cql/src/deserialize/row_tests.rs

@@ -2,17 +2,15 @@ use bytes::{Buf, BufMut};
 use std::{borrow::Cow, convert::TryInto, num::TryFromIntError};
 use thiserror::Error;
 
-use crate::{
-    frame::{
-        frame_errors::CqlRequestSerializationError,
-        request::{RequestOpcode, SerializableRequest},
-        types::{self, SerialConsistency},
-    },
-    types::serialize::{
-        raw_batch::{RawBatchValues, RawBatchValuesIterator},
-        row::SerializedValues,
-        RowWriter, SerializationError,
-    },
+use crate::frame::{
+    frame_errors::CqlRequestSerializationError,
+    request::{RequestOpcode, SerializableRequest},
+    types::{self, SerialConsistency},
+};
+use crate::serialize::{
+    raw_batch::{RawBatchValues, RawBatchValuesIterator},
+    row::SerializedValues,
+    RowWriter, SerializationError,
 };
 
 use super::{DeserializableRequest, RequestDeserializationError};