diff --git a/crates/fluvio-protocol/Cargo.toml b/crates/fluvio-protocol/Cargo.toml index 426c6afd78f..ac14736cd4b 100644 --- a/crates/fluvio-protocol/Cargo.toml +++ b/crates/fluvio-protocol/Cargo.toml @@ -39,6 +39,7 @@ record = [ "once_cell", "fluvio-types" ] +types = ["fluvio-types"] link = ["api","record","thiserror","flv-util","semver","eyre"] fixture = ["record","derive_builder"] compress = ["fluvio-compression/compress"] diff --git a/crates/fluvio-protocol/src/core/mod.rs b/crates/fluvio-protocol/src/core/mod.rs index 3838ac5517d..d29fd201a38 100644 --- a/crates/fluvio-protocol/src/core/mod.rs +++ b/crates/fluvio-protocol/src/core/mod.rs @@ -4,8 +4,6 @@ mod encoder; mod varint; mod zerocopy; -pub use fluvio_types::Timestamp; - pub use self::bytebuf::ByteBuf; pub use self::decoder::Decoder; pub use self::decoder::DecoderVarInt; diff --git a/crates/fluvio-protocol/src/lib.rs b/crates/fluvio-protocol/src/lib.rs index 0551a05e40b..27c5ba2f9b3 100644 --- a/crates/fluvio-protocol/src/lib.rs +++ b/crates/fluvio-protocol/src/lib.rs @@ -19,6 +19,11 @@ pub mod codec; #[cfg(feature = "record")] pub mod record; +#[cfg(feature = "types")] +pub mod types { + pub use fluvio_types::*; +} + #[cfg(feature = "link")] pub mod link; diff --git a/crates/fluvio-smartmodule/Cargo.toml b/crates/fluvio-smartmodule/Cargo.toml index c0e708633d6..cc8e69af34e 100644 --- a/crates/fluvio-smartmodule/Cargo.toml +++ b/crates/fluvio-smartmodule/Cargo.toml @@ -29,7 +29,7 @@ eyre = { version = ">=0.6.8", default-features = false, features = [ "auto-install", ] } fluvio-smartmodule-derive = { version = "0.6.1", path = "../fluvio-smartmodule-derive" } -fluvio-protocol = { workspace = true, features = [ "link"] } +fluvio-protocol = { workspace = true, features = ["link", "types"] } [dev-dependencies] criterion = { workspace = true } diff --git a/crates/fluvio-smartmodule/src/input.rs b/crates/fluvio-smartmodule/src/input.rs index c60299d2c5a..64d512a91ee 100644 --- a/crates/fluvio-smartmodule/src/input.rs +++ b/crates/fluvio-smartmodule/src/input.rs @@ -2,10 +2,11 @@ use std::io::Cursor; use std::time::Duration; use std::{collections::BTreeMap, fmt::Display}; use std::fmt; -use fluvio_protocol::record::{Offset, Record}; use fluvio_protocol::{Decoder, Encoder, Version}; +use fluvio_protocol::record::{Offset, Record}; +use fluvio_protocol::types::Timestamp; -use crate::{SmartModuleRecord, Timestamp}; +use crate::SmartModuleRecord; /// SmartModule Version with support for Lookback with Age and Timestamps, /// LTA is the acronym for Lookback, Timestamps, and Age. diff --git a/crates/fluvio-smartmodule/src/lib.rs b/crates/fluvio-smartmodule/src/lib.rs index 110d1077d33..d23984fd18f 100644 --- a/crates/fluvio-smartmodule/src/lib.rs +++ b/crates/fluvio-smartmodule/src/lib.rs @@ -6,7 +6,7 @@ mod error; use std::ops::{Deref, DerefMut}; -use fluvio_protocol::core::Timestamp; +use fluvio_protocol::types::Timestamp; pub use fluvio_smartmodule_derive::{smartmodule, SmartOpt};