diff --git a/Cargo.lock b/Cargo.lock index 60e1e08b32..a2ade3bdd1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1731,7 +1731,6 @@ name = "epoxy-protocol" version = "2.3.7" dependencies = [ "anyhow", - "rivet-util", "rivet-vbare-compiler", "serde", "serde_bare", @@ -5340,7 +5339,6 @@ dependencies = [ "anyhow", "gasoline", "rivet-runner-protocol", - "rivet-util", "rivet-vbare-compiler", "serde", "serde_bare", @@ -5385,7 +5383,6 @@ name = "rivet-depot-protocol" version = "2.3.7" dependencies = [ "anyhow", - "rivet-util", "rivet-vbare-compiler", "serde", "serde_bare", @@ -5520,7 +5517,6 @@ dependencies = [ "anyhow", "hex", "rand 0.8.5", - "rivet-util", "rivet-vbare-compiler", "serde", "serde_bare", @@ -5983,7 +5979,6 @@ version = "2.3.7" dependencies = [ "anyhow", "base64 0.22.1", - "rivet-util", "rivet-vbare-compiler", "serde", "serde_bare", diff --git a/engine/sdks/rust/data/Cargo.toml b/engine/sdks/rust/data/Cargo.toml index f7c8c28c8c..0779ad14e5 100644 --- a/engine/sdks/rust/data/Cargo.toml +++ b/engine/sdks/rust/data/Cargo.toml @@ -10,7 +10,6 @@ edition.workspace = true anyhow.workspace = true gas.workspace = true rivet-runner-protocol.workspace = true -rivet-util.workspace = true serde_bare.workspace = true serde.workspace = true vbare.workspace = true diff --git a/engine/sdks/rust/data/src/versioned/namespace_runner_config.rs b/engine/sdks/rust/data/src/versioned/namespace_runner_config.rs index f887175e90..26097a4bd2 100644 --- a/engine/sdks/rust/data/src/versioned/namespace_runner_config.rs +++ b/engine/sdks/rust/data/src/versioned/namespace_runner_config.rs @@ -31,22 +31,22 @@ impl OwnedVersionedData for NamespaceRunnerConfig { fn deserialize_version(payload: &[u8], version: u16) -> Result { match version { 1 => Ok(NamespaceRunnerConfig::V1( - rivet_util::serde::bare_from_slice!(payload)?, + serde_bare::from_slice(payload)?, )), 2 => Ok(NamespaceRunnerConfig::V2( - rivet_util::serde::bare_from_slice!(payload)?, + serde_bare::from_slice(payload)?, )), 3 => Ok(NamespaceRunnerConfig::V3( - rivet_util::serde::bare_from_slice!(payload)?, + serde_bare::from_slice(payload)?, )), 4 => Ok(NamespaceRunnerConfig::V4( - rivet_util::serde::bare_from_slice!(payload)?, + serde_bare::from_slice(payload)?, )), 5 => Ok(NamespaceRunnerConfig::V5( - rivet_util::serde::bare_from_slice!(payload)?, + serde_bare::from_slice(payload)?, )), 6 => Ok(NamespaceRunnerConfig::V6( - rivet_util::serde::bare_from_slice!(payload)?, + serde_bare::from_slice(payload)?, )), _ => bail!("invalid version: {version}"), } @@ -55,22 +55,22 @@ impl OwnedVersionedData for NamespaceRunnerConfig { fn serialize_version(self, _version: u16) -> Result> { match self { NamespaceRunnerConfig::V1(data) => { - rivet_util::serde::bare_to_vec!(&data).map_err(Into::into) + serde_bare::to_vec(&data).map_err(Into::into) } NamespaceRunnerConfig::V2(data) => { - rivet_util::serde::bare_to_vec!(&data).map_err(Into::into) + serde_bare::to_vec(&data).map_err(Into::into) } NamespaceRunnerConfig::V3(data) => { - rivet_util::serde::bare_to_vec!(&data).map_err(Into::into) + serde_bare::to_vec(&data).map_err(Into::into) } NamespaceRunnerConfig::V4(data) => { - rivet_util::serde::bare_to_vec!(&data).map_err(Into::into) + serde_bare::to_vec(&data).map_err(Into::into) } NamespaceRunnerConfig::V5(data) => { - rivet_util::serde::bare_to_vec!(&data).map_err(Into::into) + serde_bare::to_vec(&data).map_err(Into::into) } NamespaceRunnerConfig::V6(data) => { - rivet_util::serde::bare_to_vec!(&data).map_err(Into::into) + serde_bare::to_vec(&data).map_err(Into::into) } } } diff --git a/engine/sdks/rust/depot-protocol/Cargo.toml b/engine/sdks/rust/depot-protocol/Cargo.toml index 99d8117349..274836220a 100644 --- a/engine/sdks/rust/depot-protocol/Cargo.toml +++ b/engine/sdks/rust/depot-protocol/Cargo.toml @@ -8,7 +8,6 @@ edition.workspace = true [dependencies] anyhow.workspace = true -rivet-util.workspace = true serde_bare.workspace = true serde.workspace = true vbare.workspace = true diff --git a/engine/sdks/rust/depot-protocol/src/versioned.rs b/engine/sdks/rust/depot-protocol/src/versioned.rs index d90a617eec..c8432da5ae 100644 --- a/engine/sdks/rust/depot-protocol/src/versioned.rs +++ b/engine/sdks/rust/depot-protocol/src/versioned.rs @@ -22,14 +22,14 @@ impl OwnedVersionedData for DBHead { fn deserialize_version(payload: &[u8], version: u16) -> Result { match version { - 1 => Ok(Self::V1(rivet_util::serde::bare_from_slice!(payload)?)), + 1 => Ok(Self::V1(serde_bare::from_slice(payload)?)), _ => bail!("invalid depot db head version: {version}"), } } fn serialize_version(self, _version: u16) -> Result> { match self { - Self::V1(data) => rivet_util::serde::bare_to_vec!(&data).map_err(Into::into), + Self::V1(data) => serde_bare::to_vec(&data).map_err(Into::into), } } } diff --git a/engine/sdks/rust/envoy-protocol/Cargo.toml b/engine/sdks/rust/envoy-protocol/Cargo.toml index 907353804d..d0da835e5e 100644 --- a/engine/sdks/rust/envoy-protocol/Cargo.toml +++ b/engine/sdks/rust/envoy-protocol/Cargo.toml @@ -12,7 +12,6 @@ description = "Versioned Envoy protocol types for Rivet actor hosts" anyhow.workspace = true hex.workspace = true rand.workspace = true -rivet-util.workspace = true serde_bare.workspace = true serde.workspace = true utoipa.workspace = true diff --git a/engine/sdks/rust/envoy-protocol/src/versioned/mod.rs b/engine/sdks/rust/envoy-protocol/src/versioned/mod.rs index 5357809472..fb5b57ed98 100644 --- a/engine/sdks/rust/envoy-protocol/src/versioned/mod.rs +++ b/engine/sdks/rust/envoy-protocol/src/versioned/mod.rs @@ -129,24 +129,24 @@ impl OwnedVersionedData for ToEnvoy { fn deserialize_version(payload: &[u8], version: u16) -> Result { match version { - 1 => Ok(Self::V1(rivet_util::serde::bare_from_slice!(payload)?)), - 2 => Ok(Self::V2(rivet_util::serde::bare_from_slice!(payload)?)), - 3 => Ok(Self::V3(rivet_util::serde::bare_from_slice!(payload)?)), - 4 => Ok(Self::V4(rivet_util::serde::bare_from_slice!(payload)?)), - 5 => Ok(Self::V5(rivet_util::serde::bare_from_slice!(payload)?)), - 6 => Ok(Self::V6(rivet_util::serde::bare_from_slice!(payload)?)), + 1 => Ok(Self::V1(serde_bare::from_slice(payload)?)), + 2 => Ok(Self::V2(serde_bare::from_slice(payload)?)), + 3 => Ok(Self::V3(serde_bare::from_slice(payload)?)), + 4 => Ok(Self::V4(serde_bare::from_slice(payload)?)), + 5 => Ok(Self::V5(serde_bare::from_slice(payload)?)), + 6 => Ok(Self::V6(serde_bare::from_slice(payload)?)), _ => bail!("invalid version: {version}"), } } fn serialize_version(self, _version: u16) -> Result> { match self { - Self::V1(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), - Self::V2(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), - Self::V3(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), - Self::V4(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), - Self::V5(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), - Self::V6(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), + Self::V1(x) => serde_bare::to_vec(&x).map_err(Into::into), + Self::V2(x) => serde_bare::to_vec(&x).map_err(Into::into), + Self::V3(x) => serde_bare::to_vec(&x).map_err(Into::into), + Self::V4(x) => serde_bare::to_vec(&x).map_err(Into::into), + Self::V5(x) => serde_bare::to_vec(&x).map_err(Into::into), + Self::V6(x) => serde_bare::to_vec(&x).map_err(Into::into), } } @@ -261,24 +261,24 @@ impl OwnedVersionedData for ToRivet { fn deserialize_version(payload: &[u8], version: u16) -> Result { match version { - 1 => Ok(Self::V1(rivet_util::serde::bare_from_slice!(payload)?)), - 2 => Ok(Self::V2(rivet_util::serde::bare_from_slice!(payload)?)), - 3 => Ok(Self::V3(rivet_util::serde::bare_from_slice!(payload)?)), - 4 => Ok(Self::V4(rivet_util::serde::bare_from_slice!(payload)?)), - 5 => Ok(Self::V5(rivet_util::serde::bare_from_slice!(payload)?)), - 6 => Ok(Self::V6(rivet_util::serde::bare_from_slice!(payload)?)), + 1 => Ok(Self::V1(serde_bare::from_slice(payload)?)), + 2 => Ok(Self::V2(serde_bare::from_slice(payload)?)), + 3 => Ok(Self::V3(serde_bare::from_slice(payload)?)), + 4 => Ok(Self::V4(serde_bare::from_slice(payload)?)), + 5 => Ok(Self::V5(serde_bare::from_slice(payload)?)), + 6 => Ok(Self::V6(serde_bare::from_slice(payload)?)), _ => bail!("invalid version: {version}"), } } fn serialize_version(self, _version: u16) -> Result> { match self { - Self::V1(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), - Self::V2(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), - Self::V3(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), - Self::V4(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), - Self::V5(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), - Self::V6(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), + Self::V1(x) => serde_bare::to_vec(&x).map_err(Into::into), + Self::V2(x) => serde_bare::to_vec(&x).map_err(Into::into), + Self::V3(x) => serde_bare::to_vec(&x).map_err(Into::into), + Self::V4(x) => serde_bare::to_vec(&x).map_err(Into::into), + Self::V5(x) => serde_bare::to_vec(&x).map_err(Into::into), + Self::V6(x) => serde_bare::to_vec(&x).map_err(Into::into), } } @@ -393,24 +393,24 @@ impl OwnedVersionedData for ToEnvoyConn { fn deserialize_version(payload: &[u8], version: u16) -> Result { match version { - 1 => Ok(Self::V1(rivet_util::serde::bare_from_slice!(payload)?)), - 2 => Ok(Self::V2(rivet_util::serde::bare_from_slice!(payload)?)), - 3 => Ok(Self::V3(rivet_util::serde::bare_from_slice!(payload)?)), - 4 => Ok(Self::V4(rivet_util::serde::bare_from_slice!(payload)?)), - 5 => Ok(Self::V5(rivet_util::serde::bare_from_slice!(payload)?)), - 6 => Ok(Self::V6(rivet_util::serde::bare_from_slice!(payload)?)), + 1 => Ok(Self::V1(serde_bare::from_slice(payload)?)), + 2 => Ok(Self::V2(serde_bare::from_slice(payload)?)), + 3 => Ok(Self::V3(serde_bare::from_slice(payload)?)), + 4 => Ok(Self::V4(serde_bare::from_slice(payload)?)), + 5 => Ok(Self::V5(serde_bare::from_slice(payload)?)), + 6 => Ok(Self::V6(serde_bare::from_slice(payload)?)), _ => bail!("invalid version: {version}"), } } fn serialize_version(self, _version: u16) -> Result> { match self { - Self::V1(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), - Self::V2(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), - Self::V3(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), - Self::V4(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), - Self::V5(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), - Self::V6(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), + Self::V1(x) => serde_bare::to_vec(&x).map_err(Into::into), + Self::V2(x) => serde_bare::to_vec(&x).map_err(Into::into), + Self::V3(x) => serde_bare::to_vec(&x).map_err(Into::into), + Self::V4(x) => serde_bare::to_vec(&x).map_err(Into::into), + Self::V5(x) => serde_bare::to_vec(&x).map_err(Into::into), + Self::V6(x) => serde_bare::to_vec(&x).map_err(Into::into), } } @@ -525,24 +525,24 @@ impl OwnedVersionedData for ToGateway { fn deserialize_version(payload: &[u8], version: u16) -> Result { match version { - 1 => Ok(Self::V1(rivet_util::serde::bare_from_slice!(payload)?)), - 2 => Ok(Self::V2(rivet_util::serde::bare_from_slice!(payload)?)), - 3 => Ok(Self::V3(rivet_util::serde::bare_from_slice!(payload)?)), - 4 => Ok(Self::V4(rivet_util::serde::bare_from_slice!(payload)?)), - 5 => Ok(Self::V5(rivet_util::serde::bare_from_slice!(payload)?)), - 6 => Ok(Self::V6(rivet_util::serde::bare_from_slice!(payload)?)), + 1 => Ok(Self::V1(serde_bare::from_slice(payload)?)), + 2 => Ok(Self::V2(serde_bare::from_slice(payload)?)), + 3 => Ok(Self::V3(serde_bare::from_slice(payload)?)), + 4 => Ok(Self::V4(serde_bare::from_slice(payload)?)), + 5 => Ok(Self::V5(serde_bare::from_slice(payload)?)), + 6 => Ok(Self::V6(serde_bare::from_slice(payload)?)), _ => bail!("invalid version: {version}"), } } fn serialize_version(self, _version: u16) -> Result> { match self { - Self::V1(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), - Self::V2(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), - Self::V3(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), - Self::V4(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), - Self::V5(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), - Self::V6(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), + Self::V1(x) => serde_bare::to_vec(&x).map_err(Into::into), + Self::V2(x) => serde_bare::to_vec(&x).map_err(Into::into), + Self::V3(x) => serde_bare::to_vec(&x).map_err(Into::into), + Self::V4(x) => serde_bare::to_vec(&x).map_err(Into::into), + Self::V5(x) => serde_bare::to_vec(&x).map_err(Into::into), + Self::V6(x) => serde_bare::to_vec(&x).map_err(Into::into), } } @@ -657,24 +657,24 @@ impl OwnedVersionedData for ToOutbound { fn deserialize_version(payload: &[u8], version: u16) -> Result { match version { - 1 => Ok(Self::V1(rivet_util::serde::bare_from_slice!(payload)?)), - 2 => Ok(Self::V2(rivet_util::serde::bare_from_slice!(payload)?)), - 3 => Ok(Self::V3(rivet_util::serde::bare_from_slice!(payload)?)), - 4 => Ok(Self::V4(rivet_util::serde::bare_from_slice!(payload)?)), - 5 => Ok(Self::V5(rivet_util::serde::bare_from_slice!(payload)?)), - 6 => Ok(Self::V6(rivet_util::serde::bare_from_slice!(payload)?)), + 1 => Ok(Self::V1(serde_bare::from_slice(payload)?)), + 2 => Ok(Self::V2(serde_bare::from_slice(payload)?)), + 3 => Ok(Self::V3(serde_bare::from_slice(payload)?)), + 4 => Ok(Self::V4(serde_bare::from_slice(payload)?)), + 5 => Ok(Self::V5(serde_bare::from_slice(payload)?)), + 6 => Ok(Self::V6(serde_bare::from_slice(payload)?)), _ => bail!("invalid version: {version}"), } } fn serialize_version(self, _version: u16) -> Result> { match self { - Self::V1(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), - Self::V2(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), - Self::V3(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), - Self::V4(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), - Self::V5(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), - Self::V6(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), + Self::V1(x) => serde_bare::to_vec(&x).map_err(Into::into), + Self::V2(x) => serde_bare::to_vec(&x).map_err(Into::into), + Self::V3(x) => serde_bare::to_vec(&x).map_err(Into::into), + Self::V4(x) => serde_bare::to_vec(&x).map_err(Into::into), + Self::V5(x) => serde_bare::to_vec(&x).map_err(Into::into), + Self::V6(x) => serde_bare::to_vec(&x).map_err(Into::into), } } @@ -789,24 +789,24 @@ impl OwnedVersionedData for ActorCommandKeyData { fn deserialize_version(payload: &[u8], version: u16) -> Result { match version { - 1 => Ok(Self::V1(rivet_util::serde::bare_from_slice!(payload)?)), - 2 => Ok(Self::V2(rivet_util::serde::bare_from_slice!(payload)?)), - 3 => Ok(Self::V3(rivet_util::serde::bare_from_slice!(payload)?)), - 4 => Ok(Self::V4(rivet_util::serde::bare_from_slice!(payload)?)), - 5 => Ok(Self::V5(rivet_util::serde::bare_from_slice!(payload)?)), - 6 => Ok(Self::V6(rivet_util::serde::bare_from_slice!(payload)?)), + 1 => Ok(Self::V1(serde_bare::from_slice(payload)?)), + 2 => Ok(Self::V2(serde_bare::from_slice(payload)?)), + 3 => Ok(Self::V3(serde_bare::from_slice(payload)?)), + 4 => Ok(Self::V4(serde_bare::from_slice(payload)?)), + 5 => Ok(Self::V5(serde_bare::from_slice(payload)?)), + 6 => Ok(Self::V6(serde_bare::from_slice(payload)?)), _ => bail!("invalid version: {version}"), } } fn serialize_version(self, _version: u16) -> Result> { match self { - Self::V1(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), - Self::V2(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), - Self::V3(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), - Self::V4(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), - Self::V5(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), - Self::V6(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into), + Self::V1(x) => serde_bare::to_vec(&x).map_err(Into::into), + Self::V2(x) => serde_bare::to_vec(&x).map_err(Into::into), + Self::V3(x) => serde_bare::to_vec(&x).map_err(Into::into), + Self::V4(x) => serde_bare::to_vec(&x).map_err(Into::into), + Self::V5(x) => serde_bare::to_vec(&x).map_err(Into::into), + Self::V6(x) => serde_bare::to_vec(&x).map_err(Into::into), } } @@ -934,7 +934,7 @@ mod tests { #[test] fn v1_start_command_deserializes_into_latest_without_sqlite_startup_data() -> Result<()> { - let payload = rivet_util::serde::bare_to_vec!(&v1::ToEnvoy::ToEnvoyCommands(vec![ + let payload = serde_bare::to_vec(&v1::ToEnvoy::ToEnvoyCommands(vec![ v1::CommandWrapper { checkpoint: v1::ActorCheckpoint { actor_id: "actor".into(), @@ -970,7 +970,7 @@ mod tests { #[test] fn v2_sqlite_response_does_not_deserialize_to_stateless_protocol() -> Result<()> { - let payload = rivet_util::serde::bare_to_vec!(&v2::ToEnvoy::ToEnvoySqliteCommitResponse( + let payload = serde_bare::to_vec(&v2::ToEnvoy::ToEnvoySqliteCommitResponse( v2::ToEnvoySqliteCommitResponse { request_id: 1, data: v2::SqliteCommitResponse::SqliteErrorResponse(v2::SqliteErrorResponse { diff --git a/engine/sdks/rust/epoxy-protocol/Cargo.toml b/engine/sdks/rust/epoxy-protocol/Cargo.toml index 5903387849..0197f4926d 100644 --- a/engine/sdks/rust/epoxy-protocol/Cargo.toml +++ b/engine/sdks/rust/epoxy-protocol/Cargo.toml @@ -8,7 +8,6 @@ edition.workspace = true [dependencies] anyhow.workspace = true -rivet-util.workspace = true serde_bare.workspace = true serde.workspace = true vbare.workspace = true diff --git a/engine/sdks/rust/epoxy-protocol/src/versioned.rs b/engine/sdks/rust/epoxy-protocol/src/versioned.rs index 2dd501bbb8..63d8f736a2 100644 --- a/engine/sdks/rust/epoxy-protocol/src/versioned.rs +++ b/engine/sdks/rust/epoxy-protocol/src/versioned.rs @@ -26,10 +26,10 @@ impl OwnedVersionedData for CommittedValue { fn deserialize_version(payload: &[u8], version: u16) -> Result { match version { - 2 => Ok(CommittedValue::V2(rivet_util::serde::bare_from_slice!( + 2 => Ok(CommittedValue::V2(serde_bare::from_slice( payload )?)), - 3 => Ok(CommittedValue::V3(rivet_util::serde::bare_from_slice!( + 3 => Ok(CommittedValue::V3(serde_bare::from_slice( payload )?)), _ => bail!("invalid version: {version}"), @@ -38,8 +38,8 @@ impl OwnedVersionedData for CommittedValue { fn serialize_version(self, _version: u16) -> Result> { match self { - CommittedValue::V2(data) => rivet_util::serde::bare_to_vec!(&data).map_err(Into::into), - CommittedValue::V3(data) => rivet_util::serde::bare_to_vec!(&data).map_err(Into::into), + CommittedValue::V2(data) => serde_bare::to_vec(&data).map_err(Into::into), + CommittedValue::V3(data) => serde_bare::to_vec(&data).map_err(Into::into), } } @@ -93,10 +93,10 @@ impl OwnedVersionedData for CachedValue { fn deserialize_version(payload: &[u8], version: u16) -> Result { match version { - 2 => Ok(CachedValue::V2(rivet_util::serde::bare_from_slice!( + 2 => Ok(CachedValue::V2(serde_bare::from_slice( payload )?)), - 3 => Ok(CachedValue::V3(rivet_util::serde::bare_from_slice!( + 3 => Ok(CachedValue::V3(serde_bare::from_slice( payload )?)), _ => bail!("invalid version: {version}"), @@ -105,8 +105,8 @@ impl OwnedVersionedData for CachedValue { fn serialize_version(self, _version: u16) -> Result> { match self { - CachedValue::V2(data) => rivet_util::serde::bare_to_vec!(&data).map_err(Into::into), - CachedValue::V3(data) => rivet_util::serde::bare_to_vec!(&data).map_err(Into::into), + CachedValue::V2(data) => serde_bare::to_vec(&data).map_err(Into::into), + CachedValue::V3(data) => serde_bare::to_vec(&data).map_err(Into::into), } } @@ -161,10 +161,10 @@ impl OwnedVersionedData for AcceptedValue { fn deserialize_version(payload: &[u8], version: u16) -> Result { match version { - 2 => Ok(AcceptedValue::V2(rivet_util::serde::bare_from_slice!( + 2 => Ok(AcceptedValue::V2(serde_bare::from_slice( payload )?)), - 3 => Ok(AcceptedValue::V3(rivet_util::serde::bare_from_slice!( + 3 => Ok(AcceptedValue::V3(serde_bare::from_slice( payload )?)), _ => bail!("invalid version: {version}"), @@ -173,8 +173,8 @@ impl OwnedVersionedData for AcceptedValue { fn serialize_version(self, _version: u16) -> Result> { match self { - AcceptedValue::V2(data) => rivet_util::serde::bare_to_vec!(&data).map_err(Into::into), - AcceptedValue::V3(data) => rivet_util::serde::bare_to_vec!(&data).map_err(Into::into), + AcceptedValue::V2(data) => serde_bare::to_vec(&data).map_err(Into::into), + AcceptedValue::V3(data) => serde_bare::to_vec(&data).map_err(Into::into), } } @@ -228,16 +228,16 @@ impl OwnedVersionedData for Request { fn deserialize_version(payload: &[u8], version: u16) -> Result { match version { - 2 => Ok(Request::V2(rivet_util::serde::bare_from_slice!(payload)?)), - 3 => Ok(Request::V3(rivet_util::serde::bare_from_slice!(payload)?)), + 2 => Ok(Request::V2(serde_bare::from_slice(payload)?)), + 3 => Ok(Request::V3(serde_bare::from_slice(payload)?)), _ => bail!("invalid version: {version}"), } } fn serialize_version(self, _version: u16) -> Result> { match self { - Request::V2(data) => rivet_util::serde::bare_to_vec!(&data).map_err(Into::into), - Request::V3(data) => rivet_util::serde::bare_to_vec!(&data).map_err(Into::into), + Request::V2(data) => serde_bare::to_vec(&data).map_err(Into::into), + Request::V3(data) => serde_bare::to_vec(&data).map_err(Into::into), } } diff --git a/engine/sdks/rust/ups-protocol/Cargo.toml b/engine/sdks/rust/ups-protocol/Cargo.toml index 9105a5ea23..f6af0850c4 100644 --- a/engine/sdks/rust/ups-protocol/Cargo.toml +++ b/engine/sdks/rust/ups-protocol/Cargo.toml @@ -9,7 +9,6 @@ edition.workspace = true [dependencies] anyhow.workspace = true base64.workspace = true -rivet-util.workspace = true serde_bare.workspace = true serde.workspace = true vbare.workspace = true diff --git a/engine/sdks/rust/ups-protocol/src/versioned.rs b/engine/sdks/rust/ups-protocol/src/versioned.rs index ee756e64bc..a49b575209 100644 --- a/engine/sdks/rust/ups-protocol/src/versioned.rs +++ b/engine/sdks/rust/ups-protocol/src/versioned.rs @@ -26,13 +26,13 @@ impl OwnedVersionedData for UpsMessage { fn deserialize_version(payload: &[u8], version: u16) -> Result { match version { - 1 => Ok(UpsMessage::V1(rivet_util::serde::bare_from_slice!( + 1 => Ok(UpsMessage::V1(serde_bare::from_slice( payload )?)), - 2 => Ok(UpsMessage::V2(rivet_util::serde::bare_from_slice!( + 2 => Ok(UpsMessage::V2(serde_bare::from_slice( payload )?)), - 3 => Ok(UpsMessage::V3(rivet_util::serde::bare_from_slice!( + 3 => Ok(UpsMessage::V3(serde_bare::from_slice( payload )?)), _ => bail!("invalid version: {version}"), @@ -41,9 +41,9 @@ impl OwnedVersionedData for UpsMessage { fn serialize_version(self, _version: u16) -> Result> { match self { - UpsMessage::V1(data) => rivet_util::serde::bare_to_vec!(&data).map_err(Into::into), - UpsMessage::V2(data) => rivet_util::serde::bare_to_vec!(&data).map_err(Into::into), - UpsMessage::V3(data) => rivet_util::serde::bare_to_vec!(&data).map_err(Into::into), + UpsMessage::V1(data) => serde_bare::to_vec(&data).map_err(Into::into), + UpsMessage::V2(data) => serde_bare::to_vec(&data).map_err(Into::into), + UpsMessage::V3(data) => serde_bare::to_vec(&data).map_err(Into::into), } }