Skip to content

rust: fix serde feature for standalone compilation #1191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 15, 2022
Merged

rust: fix serde feature for standalone compilation #1191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1188398
rust: fix serde feature for standalone compilation
Jul 15, 2022
241694b
fix float_roundtrip compile
Jul 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion generator/sbpg/targets/resources/rust/sbp_cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ default = []
async = ["futures", "dencode/async"]
serde = ["dep:serde", "serde-big-array"]
json = ["serde", "serde_json", "base64"]
float_roundtrip = ["serde_json/float_roundtrip"]
float_roundtrip = ["serde", "serde_json/float_roundtrip"]
link = ["slotmap"]

[lib]
Expand Down
2 changes: 1 addition & 1 deletion generator/sbpg/targets/resources/rust/sbp_messages_mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ pub enum Sbp {
Unknown( Unknown ),
}

#[cfg(feature = "serde")]
#[cfg(feature = "serde_json")]
impl<'de> serde::Deserialize<'de> for Sbp {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
Expand Down
2 changes: 1 addition & 1 deletion rust/sbp/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ default = []
async = ["futures", "dencode/async"]
serde = ["dep:serde", "serde-big-array"]
json = ["serde", "serde_json", "base64"]
float_roundtrip = ["serde_json/float_roundtrip"]
float_roundtrip = ["serde", "serde_json/float_roundtrip"]
link = ["slotmap"]

[lib]
Expand Down
2 changes: 1 addition & 1 deletion rust/sbp/src/messages/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,7 +795,7 @@ pub enum Sbp {
Unknown(Unknown),
}

#[cfg(feature = "serde")]
#[cfg(feature = "serde_json")]
impl<'de> serde::Deserialize<'de> for Sbp {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
Expand Down
9 changes: 5 additions & 4 deletions rust/sbp/src/sbp_string.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
use std::convert::TryInto;
use std::fmt;
use std::fmt::Formatter;
use std::marker::PhantomData;

use bytes::{Buf, BufMut};
#[cfg(feature = "serde")]
use serde::de::{Error, Visitor};

use crate::wire_format::WireFormat;
Expand Down Expand Up @@ -84,7 +83,7 @@ impl<'de, E> serde::Deserialize<'de> for SbpString<Vec<u8>, E> {
impl<'de, E> Visitor<'de> for SbpStringVisitor<E> {
type Value = SbpString<Vec<u8>, E>;

fn expecting(&self, formatter: &mut Formatter) -> fmt::Result {
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
formatter.write_str("string")
}

Expand Down Expand Up @@ -126,12 +125,14 @@ impl<'de, E, const LEN: usize> serde::Deserialize<'de> for SbpString<[u8; LEN],
where
D: serde::Deserializer<'de>,
{
use std::convert::TryInto;

struct SbpStringVisitor<E, const LEN: usize>(PhantomData<SbpString<[u8; LEN], E>>);

impl<'de, E, const LEN: usize> Visitor<'de> for SbpStringVisitor<E, LEN> {
type Value = SbpString<[u8; LEN], E>;

fn expecting(&self, formatter: &mut Formatter) -> fmt::Result {
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
formatter.write_str("string")
}

Expand Down
7 changes: 7 additions & 0 deletions scripts/ci_build_rust.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ else
exit 1
fi

cargo build --no-default-features -p sbp
cargo build --no-default-features -p sbp --features serde
cargo build --no-default-features -p sbp --features json
cargo build --no-default-features -p sbp --features async
cargo build --no-default-features -p sbp --features link
cargo build --no-default-features -p sbp --features float_roundtrip

if [ "$RUNNER_OS" == "Linux" ]; then
cargo build --all --release --target=x86_64-unknown-linux-musl
cd target/x86_64-unknown-linux-musl/release
Expand Down