diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 02:49:50 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 02:49:50 +0000 |
commit | 9835e2ae736235810b4ea1c162ca5e65c547e770 (patch) | |
tree | 3fcebf40ed70e581d776a8a4c65923e8ec20e026 /vendor/gix-actor | |
parent | Releasing progress-linux version 1.70.0+dfsg2-1~progress7.99u1. (diff) | |
download | rustc-9835e2ae736235810b4ea1c162ca5e65c547e770.tar.xz rustc-9835e2ae736235810b4ea1c162ca5e65c547e770.zip |
Merging upstream version 1.71.1+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'vendor/gix-actor')
-rw-r--r-- | vendor/gix-actor/.cargo-checksum.json | 2 | ||||
-rw-r--r-- | vendor/gix-actor/Cargo.toml | 12 | ||||
-rw-r--r-- | vendor/gix-actor/src/lib.rs | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/vendor/gix-actor/.cargo-checksum.json b/vendor/gix-actor/.cargo-checksum.json index 722a61e21..451d1fc32 100644 --- a/vendor/gix-actor/.cargo-checksum.json +++ b/vendor/gix-actor/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"Cargo.toml":"09f0d7585b773608c4209e13eb877201036010f9d005789fc35e49f7655ac940","src/lib.rs":"b5de3d3c223fa9423386353b077ac179d6a27358d14b04b0be625f46b1f16794","src/signature/decode.rs":"68d44b6c899dc19da3d7a327b26fc50bfe612a7c34216fb51ae52e8e72247e67","src/signature/mod.rs":"861191a680568abeaa79d9989f01eb249cad1e360a8824464cf8974502d929a8"},"package":"dc22b0cdc52237667c301dd7cdc6ead8f8f73c9f824e9942c8ebd6b764f6c0bf"}
\ No newline at end of file +{"files":{"Cargo.toml":"cfef774cb0e652963ba032825e093eede7e99363b85529d00409082907e46231","src/lib.rs":"dfcb3c2acff455afa5db18f702045da610be0aa64fc916650c72f8451f9cf0a8","src/signature/decode.rs":"68d44b6c899dc19da3d7a327b26fc50bfe612a7c34216fb51ae52e8e72247e67","src/signature/mod.rs":"861191a680568abeaa79d9989f01eb249cad1e360a8824464cf8974502d929a8"},"package":"848efa0f1210cea8638f95691c82a46f98a74b9e3524f01d4955ebc25a8f84f3"}
\ No newline at end of file diff --git a/vendor/gix-actor/Cargo.toml b/vendor/gix-actor/Cargo.toml index b4585ce58..d7b501cdd 100644 --- a/vendor/gix-actor/Cargo.toml +++ b/vendor/gix-actor/Cargo.toml @@ -13,7 +13,7 @@ edition = "2021" rust-version = "1.64" name = "gix-actor" -version = "0.19.0" +version = "0.20.0" authors = ["Sebastian Thiel <sebastian.thiel@icloud.com>"] include = ["src/**/*"] description = "A way to identify git actors" @@ -47,10 +47,10 @@ version = "0.2.0" optional = true [dependencies.gix-date] -version = "^0.4.3" +version = "^0.5.0" [dependencies.gix-features] -version = "^0.28.0" +version = "^0.29.0" optional = true [dependencies.itoa] @@ -74,8 +74,8 @@ version = "1.0.38" version = "1.0.0" [features] -serde1 = [ - "serde", +serde = [ + "dep:serde", "bstr/serde", - "gix-date/serde1", + "gix-date/serde", ] diff --git a/vendor/gix-actor/src/lib.rs b/vendor/gix-actor/src/lib.rs index 182f0beee..336d4f79f 100644 --- a/vendor/gix-actor/src/lib.rs +++ b/vendor/gix-actor/src/lib.rs @@ -19,7 +19,7 @@ pub mod signature; /// /// Note that this is not a cryptographical signature. #[derive(Default, PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone)] -#[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct Signature { /// The actors name. pub name: BString, @@ -33,10 +33,10 @@ pub struct Signature { /// /// Note that this is not a cryptographical signature. #[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone, Copy, Default)] -#[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct SignatureRef<'a> { /// The actor's name. - #[cfg_attr(feature = "serde1", serde(borrow))] + #[cfg_attr(feature = "serde", serde(borrow))] pub name: &'a BStr, /// The actor's email. pub email: &'a BStr, |