Skip to content

Commit

Permalink
scylla lib: constrain pub deserialize reexports
Browse files Browse the repository at this point in the history
  • Loading branch information
wprzytula committed Jun 13, 2024
1 parent 736bd23 commit df416a1
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 4 deletions.
3 changes: 3 additions & 0 deletions scylla-cql/src/types/deserialize/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,9 @@ pub mod value;

pub use frame_slice::FrameSlice;

pub use row::DeserializeRow;
pub use value::DeserializeValue;

use std::error::Error;
use std::fmt::Display;
use std::sync::Arc;
Expand Down
39 changes: 35 additions & 4 deletions scylla/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,41 @@ pub mod frame {
}
}

// FIXME: finer-grained control over exports
// Some types are `pub` in scylla-cql just for scylla crate,
// and those shouldn't be exposed for users.
pub use scylla_cql::types::{deserialize, serialize};
/// Serializing bound values of a query to be sent to the DB.
pub mod serialize {
pub use scylla_cql::types::serialize::*;
}

/// Deserializing DB response containing CQL query results.
pub mod deserialize {
pub use scylla_cql::types::deserialize::{
DeserializationError, DeserializeRow, DeserializeValue, FrameSlice, TypeCheckError,
};

/// Deserializing the whole query result contents.
pub mod result {
pub use scylla_cql::types::deserialize::result::{RowIterator, TypedRowIterator};
}

/// Deserializing a row of the query result.
pub mod row {
pub use scylla_cql::types::deserialize::row::{
BuiltinDeserializationError, BuiltinDeserializationErrorKind, BuiltinTypeCheckError,
BuiltinTypeCheckErrorKind, ColumnIterator, RawColumn,
};
}

/// Deserializing a single CQL value from a column of the query result row.
pub mod value {
pub use scylla_cql::types::deserialize::value::{
BuiltinDeserializationError, BuiltinDeserializationErrorKind, BuiltinTypeCheckError,
BuiltinTypeCheckErrorKind, Emptiable, ListlikeIterator, MapDeserializationErrorKind,
MapIterator, MapTypeCheckErrorKind, MaybeEmpty, SetOrListDeserializationErrorKind,
SetOrListTypeCheckErrorKind, TupleDeserializationErrorKind, TupleTypeCheckErrorKind,
UdtIterator, UdtTypeCheckErrorKind,
};
}
}

pub mod authentication;
#[cfg(feature = "cloud")]
Expand Down

0 comments on commit df416a1

Please sign in to comment.