diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 02:49:42 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 02:49:42 +0000 |
| commit | 837b550238aa671a591ccf282dddeab29cadb206 (patch) | |
| tree | 914b6b8862bace72bd3245ca184d374b08d8a672 /vendor/gix-mailmap/src | |
| parent | Adding debian version 1.70.0+dfsg2-1. (diff) | |
| download | rustc-837b550238aa671a591ccf282dddeab29cadb206.tar.xz rustc-837b550238aa671a591ccf282dddeab29cadb206.zip | |
Merging upstream version 1.71.1+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'vendor/gix-mailmap/src')
| -rw-r--r-- | vendor/gix-mailmap/src/lib.rs | 4 | ||||
| -rw-r--r-- | vendor/gix-mailmap/src/snapshot/signature.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vendor/gix-mailmap/src/lib.rs b/vendor/gix-mailmap/src/lib.rs index ce7a6472e..e67521314 100644 --- a/vendor/gix-mailmap/src/lib.rs +++ b/vendor/gix-mailmap/src/lib.rs @@ -49,9 +49,9 @@ pub struct Snapshot { /// /// Typically created by [parse()]. #[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 Entry<'a> { - #[cfg_attr(feature = "serde1", serde(borrow))] + #[cfg_attr(feature = "serde", serde(borrow))] /// The name to map to. pub(crate) new_name: Option<&'a BStr>, /// The email map to. diff --git a/vendor/gix-mailmap/src/snapshot/signature.rs b/vendor/gix-mailmap/src/snapshot/signature.rs index 20488db58..d4c5955f5 100644 --- a/vendor/gix-mailmap/src/snapshot/signature.rs +++ b/vendor/gix-mailmap/src/snapshot/signature.rs @@ -4,7 +4,7 @@ use bstr::{BStr, BString, ByteSlice}; /// A signature like [`gix_actor::Signature`], but with all string fields being a `Cow`. #[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<'a> { /// The possibly mapped name. pub name: Cow<'a, BStr>, |