Remove DeserializeValue/Row re-exports in deserialize/mod.rs

There are two reasons to do that:
- Consistency with serialization, where there are no such re-exports
- Our general aim of having one place where each thing is to be imported
  from by the user.

Author: Lorak-mmk

docs/source/statements/result.md

@@ -98,7 +98,7 @@ Field names don't need to match column names.
 # use std::error::Error;
 # async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
 use scylla::macros::DeserializeRow;
-use scylla::deserialize::DeserializeRow;
+use scylla::deserialize::row::DeserializeRow;
 
 #[derive(DeserializeRow)]
 struct MyRow {

examples/custom_deserialization.rs

@@ -1,7 +1,7 @@
 use anyhow::Result;
 use scylla::client::session::Session;
 use scylla::client::session_builder::SessionBuilder;
-use scylla::deserialize::DeserializeValue;
+use scylla::deserialize::value::DeserializeValue;
 use scylla::frame::response::result::ColumnType;
 use std::env;
 

scylla-cql/src/deserialize/mod.rs

@@ -217,9 +217,6 @@ pub mod value;
 
 pub use frame_slice::FrameSlice;
 
-pub use row::DeserializeRow;
-pub use value::DeserializeValue;
-
 use std::error::Error;
 use std::sync::Arc;
 
@@ -238,8 +235,9 @@ use thiserror::Error;
 ///   one of types with an impl built into the driver fails. It is also returned
 ///   from impls generated by the `DeserializeRow` macro.
 /// - [`value::BuiltinTypeCheckError`] is analogous to the above but is
-///   returned from [`DeserializeValue::type_check`] instead both in the case of
-///   builtin impls and impls generated by the `DeserializeValue` macro.
+///   returned from [`DeserializeValue::type_check`](value::DeserializeValue::type_check)
+///   instead both in the case of builtin impls and impls generated by the
+///   `DeserializeValue` macro.
 ///   It won't be returned by the `Session` directly, but it might be nested
 ///   in the [`row::BuiltinTypeCheckError`].
 #[derive(Debug, Clone, Error)]
@@ -269,8 +267,9 @@ impl TypeCheckError {
 ///   one of types with an impl built into the driver fails. It is also returned
 ///   from impls generated by the `DeserializeRow` macro.
 /// - [`value::BuiltinDeserializationError`] is analogous to the above but is
-///   returned from [`DeserializeValue::deserialize`] instead both in the case of
-///   builtin impls and impls generated by the `DeserializeValue` macro.
+///   returned from [`DeserializeValue::deserialize`](value::DeserializeValue::deserialize)
+///   instead both in the case of builtin impls and impls generated by the
+///   `DeserializeValue` macro.
 ///   It won't be returned by the `Session` directly, but it might be nested
 ///   in the [`row::BuiltinDeserializationError`].
 #[derive(Debug, Clone, Error)]

scylla-cql/src/value.rs

@@ -4,11 +4,11 @@ use std::result::Result as StdResult;
 use thiserror::Error;
 use uuid::Uuid;
 
+use crate::deserialize::value::DeserializeValue;
 use crate::deserialize::value::{
     mk_deser_err, BuiltinDeserializationErrorKind, MapIterator, UdtIterator,
 };
 use crate::deserialize::DeserializationError;
-use crate::deserialize::DeserializeValue;
 use crate::deserialize::FrameSlice;
 use crate::frame::response::result::{CollectionType, ColumnType};
 use crate::frame::types;

scylla/src/lib.rs

@@ -190,9 +190,7 @@ pub mod serialize {
 
 /// Deserializing DB response containing CQL query results.
 pub mod deserialize {
-    pub use scylla_cql::deserialize::{
-        DeserializationError, DeserializeRow, DeserializeValue, FrameSlice, TypeCheckError,
-    };
+    pub use scylla_cql::deserialize::{DeserializationError, FrameSlice, TypeCheckError};
 
     /// Deserializing the whole query result contents.
     pub mod result {
@@ -203,36 +201,40 @@ pub mod deserialize {
     pub mod row {
         pub use scylla_cql::deserialize::row::{
             BuiltinDeserializationError, BuiltinDeserializationErrorKind, BuiltinTypeCheckError,
-            BuiltinTypeCheckErrorKind, ColumnIterator, RawColumn,
+            BuiltinTypeCheckErrorKind, ColumnIterator, DeserializeRow, RawColumn,
         };
     }
 
     /// Deserializing a single CQL value from a column of the query result row.
     pub mod value {
         pub use scylla_cql::deserialize::value::{
             BuiltinDeserializationError, BuiltinDeserializationErrorKind, BuiltinTypeCheckError,
-            BuiltinTypeCheckErrorKind, Emptiable, ListlikeIterator, MapDeserializationErrorKind,
-            MapIterator, MapTypeCheckErrorKind, MaybeEmpty, SetOrListDeserializationErrorKind,
-            SetOrListTypeCheckErrorKind, TupleDeserializationErrorKind, TupleTypeCheckErrorKind,
-            UdtIterator, UdtTypeCheckErrorKind,
+            BuiltinTypeCheckErrorKind, DeserializeValue, Emptiable, ListlikeIterator,
+            MapDeserializationErrorKind, MapIterator, MapTypeCheckErrorKind, MaybeEmpty,
+            SetOrListDeserializationErrorKind, SetOrListTypeCheckErrorKind,
+            TupleDeserializationErrorKind, TupleTypeCheckErrorKind, UdtIterator,
+            UdtTypeCheckErrorKind,
         };
     }
 
     // Shorthands for better readability.
     #[cfg_attr(not(test), allow(unused))]
     pub(crate) trait DeserializeOwnedValue:
-        for<'frame, 'metadata> DeserializeValue<'frame, 'metadata>
+        for<'frame, 'metadata> value::DeserializeValue<'frame, 'metadata>
     {
     }
     impl<T> DeserializeOwnedValue for T where
-        T: for<'frame, 'metadata> DeserializeValue<'frame, 'metadata>
+        T: for<'frame, 'metadata> value::DeserializeValue<'frame, 'metadata>
     {
     }
     pub(crate) trait DeserializeOwnedRow:
-        for<'frame, 'metadata> DeserializeRow<'frame, 'metadata>
+        for<'frame, 'metadata> row::DeserializeRow<'frame, 'metadata>
+    {
+    }
+    impl<T> DeserializeOwnedRow for T where
+        T: for<'frame, 'metadata> row::DeserializeRow<'frame, 'metadata>
     {
     }
-    impl<T> DeserializeOwnedRow for T where T: for<'frame, 'metadata> DeserializeRow<'frame, 'metadata> {}
 }
 
 pub mod authentication;

scylla/src/routing/locator/tablets.rs

@@ -1,8 +1,8 @@
 use bytes::Bytes;
 use itertools::Itertools;
 use lazy_static::lazy_static;
-use scylla_cql::deserialize::value::ListlikeIterator;
-use scylla_cql::deserialize::{DeserializationError, DeserializeValue, FrameSlice, TypeCheckError};
+use scylla_cql::deserialize::value::{DeserializeValue, ListlikeIterator};
+use scylla_cql::deserialize::{DeserializationError, FrameSlice, TypeCheckError};
 use scylla_cql::frame::response::result::{CollectionType, ColumnType, NativeType, TableSpec};
 use thiserror::Error;
 use tracing::warn;

scylla/tests/integration/hygiene.rs

@@ -19,8 +19,8 @@ macro_rules! test_crate {
         }
         #[test]
         fn test_impl_traits() {
-            use _scylla::deserialize::DeserializeRow;
-            use _scylla::deserialize::DeserializeValue;
+            use _scylla::deserialize::row::DeserializeRow;
+            use _scylla::deserialize::value::DeserializeValue;
             use _scylla::serialize::row::SerializeRow;
             use _scylla::serialize::value::SerializeValue;
 
@@ -42,7 +42,7 @@ macro_rules! test_crate {
             use ::std::assert_eq;
             use ::std::vec::Vec;
             use _scylla::deserialize::row::ColumnIterator;
-            use _scylla::deserialize::DeserializeRow;
+            use _scylla::deserialize::row::DeserializeRow;
             use _scylla::deserialize::FrameSlice;
             use _scylla::frame::response::result::ColumnSpec;
             use _scylla::frame::response::result::ColumnType;
@@ -113,7 +113,7 @@ macro_rules! test_crate {
             use ::std::vec;
             use ::std::vec::Vec;
             use ::tracing::info;
-            use _scylla::deserialize::DeserializeValue;
+            use _scylla::deserialize::value::DeserializeValue;
             use _scylla::deserialize::FrameSlice;
             use _scylla::frame::response::result::{ColumnType, NativeType, UserDefinedType};
             use _scylla::serialize::value::SerializeValue;

scylla/tests/integration/utils.rs

@@ -4,7 +4,7 @@ use scylla::client::session::Session;
 use scylla::client::session_builder::{GenericSessionBuilder, SessionBuilderKind};
 use scylla::cluster::ClusterState;
 use scylla::cluster::NodeRef;
-use scylla::deserialize::DeserializeValue;
+use scylla::deserialize::value::DeserializeValue;
 use scylla::errors::{DbError, ExecutionError, RequestAttemptError};
 use scylla::policies::load_balancing::{FallbackPlan, LoadBalancingPolicy, RoutingInfo};
 use scylla::policies::retry::{RequestInfo, RetryDecision, RetryPolicy, RetrySession};