Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"rust-analyzer.cargo.features": [
"bincode","build","cargo","color","emit_and_set","git","header","repo","rustc","serde","si","trace","unstable","allow_remote"
"build","cargo","color","emit_and_set","git","header","repo","rustc","serde","si","trace","unstable","allow_remote"
]
}
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ members = [

[workspace.dependencies]
anyhow = "1.0.100"
bon = "3.8.1"
gix = { version = "0.77.0", default-features = false, features = [
bon = "3.8.2"
gix = { version = "0.78.0", default-features = false, features = [
"revision",
"worktree-mutation",
"blocking-network-client",
Expand All @@ -24,7 +24,7 @@ regex = { version = "1.12.2" }
rustversion = "1.0.22"
serial_test = "3.3.1"
temp-env = "0.3.6"
time = { version = "0.3.44", features = [
time = { version = "0.3.46", features = [
"formatting",
"local-offset",
"parsing",
Expand Down
9 changes: 4 additions & 5 deletions vergen-pretty/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@ version = "10.0.0-beta.5"
name = "default"
always_deny = ["unstable"]
always_include = ["__vergen_test"]
include_optional = ["bincode", "serde"]
include_optional = ["serde"]

[[package.metadata.cargo-matrix.channel]]
name = "nightly"
always_deny = []
always_include = ["__vergen_test", "unstable"]
include_optional = ["bincode", "serde"]
include_optional = ["serde"]

[[package.metadata.cargo-matrix.channel]]
name = "nightly-empty"
always_deny = []
always_include = ["__vergen_empty_test", "unstable"]
include_optional = ["bincode", "serde"]
include_optional = ["serde"]

[features]
default = []
Expand All @@ -43,7 +43,6 @@ __vergen_empty_test = ["vergen-gix", "vergen-gix/unstable"]

[dependencies]
anyhow = { workspace = true }
bincode = { version = "=2.0.1", optional = true }
bon = { workspace = true }
console = { version = "0.16.2", optional = true }
convert_case = "0.10.0"
Expand All @@ -70,7 +69,7 @@ serde_json = "1.0.149"
tracing-subscriber = { version = "=0.3.19", features = ["fmt"] }

[package.metadata.docs.rs]
features = ["bincode", "color", "header", "serde", "trace"]
features = ["color", "header", "serde", "trace"]
rustdoc-args = ["--cfg", "docsrs"]

[lints.rust]
Expand Down
2 changes: 1 addition & 1 deletion vergen-pretty/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ pub use self::header::Env;
#[cfg(feature = "header")]
pub use self::header::header;
pub use self::pretty::Pretty;
#[cfg(any(feature = "bincode", feature = "serde"))]
#[cfg(feature = "serde")]
pub use self::pretty::feature::PrettyExt;
pub use self::pretty::prefix::Prefix;
pub use self::pretty::suffix::Suffix;
Expand Down
66 changes: 0 additions & 66 deletions vergen-pretty/src/pretty/feature/bincode.rs

This file was deleted.

60 changes: 5 additions & 55 deletions vergen-pretty/src/pretty/feature/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,25 @@
// option. All files in the project carrying such notice may not be copied,
// modified, or distributed except according to those terms.

#[cfg(feature = "bincode")]
use ::bincode::{Decode, Encode};
#[cfg(feature = "serde")]
use ::serde::{Deserialize, Serialize};
#[cfg(any(feature = "bincode", feature = "serde"))]
#[cfg(feature = "serde")]
use {
crate::{Prefix, Pretty, Suffix},
bon::Builder,
};

#[cfg(feature = "bincode")]
pub(crate) mod bincode;
#[cfg(feature = "color")]
pub(crate) mod color;
#[cfg(feature = "serde")]
pub(crate) mod serde;
#[cfg(feature = "trace")]
pub(crate) mod trace;

#[cfg(any(feature = "bincode", feature = "serde"))]
/// Extension of `Pretty` to support `bincode` serialization
#[cfg(feature = "serde")]
/// Extension of `Pretty` to support `serde` serialization
#[derive(Builder, Clone, Debug, PartialEq)]
#[cfg_attr(feature = "serde", derive(Deserialize, Serialize))]
#[cfg_attr(feature = "bincode", derive(Decode, Encode))]
pub struct PrettyExt {
/// Environment variables from `vergen`
vars: Vec<(String, String, String)>,
Expand All @@ -39,7 +34,7 @@ pub struct PrettyExt {
suffix: Option<Suffix>,
}

#[cfg(any(feature = "bincode", feature = "serde"))]
#[cfg(feature = "serde")]
impl PrettyExt {
/// Get the environment variables
#[must_use]
Expand All @@ -60,7 +55,7 @@ impl PrettyExt {
}
}

#[cfg(any(feature = "bincode", feature = "serde"))]
#[cfg(feature = "serde")]
impl From<Pretty> for PrettyExt {
fn from(pretty: Pretty) -> Self {
let mut pretty_c = pretty.clone();
Expand All @@ -79,51 +74,6 @@ impl From<Pretty> for PrettyExt {
}
}

#[cfg(all(test, feature = "bincode"))]
mod test_bincode {
use crate::{
Prefix, Pretty, PrettyExt, Suffix, utils::test_utils::TEST_PREFIX_SUFFIX, vergen_pretty_env,
};
use anyhow::Result;
use bincode::{config::standard, decode_from_slice, encode_to_vec};

#[test]
fn pretty_encode_decode_works() -> Result<()> {
let pretty = Pretty::builder().env(vergen_pretty_env!()).build();
let pretty_ext = PrettyExt::from(pretty);
let encoded = encode_to_vec(&pretty_ext, standard())?;
let decoded: PrettyExt = decode_from_slice(&encoded, standard())?.0;
assert_eq!(pretty_ext, decoded);
assert!(!decoded.vars().is_empty());
assert!(decoded.prefix().is_none());
assert!(decoded.suffix().is_none());
Ok(())
}

#[test]
fn pretty_encode_decode_with_prefix_suffix_works() -> Result<()> {
let prefix = Prefix::builder()
.lines(TEST_PREFIX_SUFFIX.lines().map(str::to_string).collect())
.build();
let suffix = Suffix::builder()
.lines(TEST_PREFIX_SUFFIX.lines().map(str::to_string).collect())
.build();
let pretty = Pretty::builder()
.env(vergen_pretty_env!())
.prefix(prefix)
.suffix(suffix)
.build();
let pretty_ext = PrettyExt::from(pretty);
let encoded = encode_to_vec(&pretty_ext, standard())?;
let decoded: PrettyExt = decode_from_slice(&encoded, standard())?.0;
assert_eq!(pretty_ext, decoded);
assert!(!decoded.vars().is_empty());
assert!(decoded.prefix().is_some());
assert!(decoded.suffix().is_some());
Ok(())
}
}

#[cfg(all(test, feature = "serde"))]
mod test_serde {
use crate::{
Expand Down
2 changes: 1 addition & 1 deletion vergen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ bon = { workspace = true }
cargo_metadata = { version = "0.23.1", optional = true }
regex = { workspace = true, optional = true }
rustc_version = { version = "0.4.1", optional = true }
sysinfo = { version = "0.37.2", optional = true }
sysinfo = { version = "0.38.0", optional = true }
time = { workspace = true, optional = true }
vergen-lib = { version = "10.0.0-beta.5", path = "../vergen-lib" }

Expand Down