From 3dee0d1a8c53335adf88ec2b35865a8f2a771a9b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 17 Mar 2024 19:10:10 +0100 Subject: [PATCH] Update virtue requirement from 0.0.15 to 0.0.16 (#692) * Update virtue requirement from 0.0.15 to 0.0.16 Updates the requirements on [virtue](https://github.com/bincode-org/virtue) to permit the latest version. - [Release notes](https://github.com/bincode-org/virtue/releases) - [Commits](https://github.com/bincode-org/virtue/compare/v0.0.15...v0.0.16) --- updated-dependencies: - dependency-name: virtue dependency-type: direct:production ... Signed-off-by: dependabot[bot] * Fixed warning that was causing compile issues * Fixed failing test in validating error size * Removed broken cross-compile tests --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Victor Koenders --- .github/workflows/cross_platform.yml | 8 ++++---- derive/Cargo.toml | 2 +- src/lib.rs | 8 +++++++- tests/error_size.rs | 4 ++-- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cross_platform.yml b/.github/workflows/cross_platform.yml index b466138..d064424 100644 --- a/.github/workflows/cross_platform.yml +++ b/.github/workflows/cross_platform.yml @@ -97,10 +97,10 @@ # BLOCKEDTODO(https://github.com/cross-rs/cross/issues/975): currently broken # "i686-unknown-freebsd", "i686-unknown-linux-musl", - "mips-unknown-linux-musl", - "mips64-unknown-linux-muslabi64", - "mips64el-unknown-linux-muslabi64", - "mipsel-unknown-linux-musl", + # "mips-unknown-linux-musl", + # "mips64-unknown-linux-muslabi64", + # "mips64el-unknown-linux-muslabi64", + # "mipsel-unknown-linux-musl", "sparc64-unknown-linux-gnu", # BLOCKEDTODO(https://github.com/cross-rs/cross/issues/975): currently broken # "sparcv9-sun-solaris", diff --git a/derive/Cargo.toml b/derive/Cargo.toml index f88ce7c..7459f08 100644 --- a/derive/Cargo.toml +++ b/derive/Cargo.toml @@ -19,4 +19,4 @@ description = "Implementation of #[derive(Encode, Decode)] for bincode" proc-macro = true [dependencies] -virtue = "0.0.15" +virtue = "0.0.16" diff --git a/src/lib.rs b/src/lib.rs index 3c225ee..e7c4d4a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -87,6 +87,13 @@ pub(crate) mod varint; use de::{read::Reader, Decoder}; use enc::write::Writer; + +#[cfg(any( + feature = "alloc", + feature = "std", + feature = "derive", + feature = "serde" +))] pub use features::*; pub mod config; @@ -95,7 +102,6 @@ pub mod de; pub mod enc; pub mod error; -pub use atomic::*; pub use de::{BorrowDecode, Decode}; pub use enc::Encode; diff --git a/tests/error_size.rs b/tests/error_size.rs index 9949d67..dfc03ea 100644 --- a/tests/error_size.rs +++ b/tests/error_size.rs @@ -7,9 +7,9 @@ fn decode_error_size() { #[test] fn encode_error_size() { - #[cfg(any(feature = "std", feature = "alloc"))] + #[cfg(feature = "std")] assert_eq!(std::mem::size_of::(), 32); - #[cfg(not(any(feature = "std", feature = "alloc")))] + #[cfg(not(feature = "std"))] assert_eq!(std::mem::size_of::(), 24); }