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-pack/src/data/input | |
| 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-pack/src/data/input')
| -rw-r--r-- | vendor/gix-pack/src/data/input/mod.rs | 2 | ||||
| -rw-r--r-- | vendor/gix-pack/src/data/input/types.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vendor/gix-pack/src/data/input/mod.rs b/vendor/gix-pack/src/data/input/mod.rs index df191de67..d3a36416e 100644 --- a/vendor/gix-pack/src/data/input/mod.rs +++ b/vendor/gix-pack/src/data/input/mod.rs @@ -1,6 +1,6 @@ /// An item of the iteration produced by [`BytesToEntriesIter`] #[derive(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 Entry { /// The header of a pack entry pub header: crate::data::entry::Header, diff --git a/vendor/gix-pack/src/data/input/types.rs b/vendor/gix-pack/src/data/input/types.rs index 6fcd459e2..86852479f 100644 --- a/vendor/gix-pack/src/data/input/types.rs +++ b/vendor/gix-pack/src/data/input/types.rs @@ -22,7 +22,7 @@ pub enum Error { /// Iteration Mode #[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone, Copy)] -#[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub enum Mode { /// Provide the trailer as read from the pack AsIs, @@ -43,7 +43,7 @@ pub enum Mode { /// Define what to do with the compressed bytes portion of a pack [`Entry`][super::Entry] #[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone, Copy)] -#[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub enum EntryDataMode { /// Do nothing with the compressed bytes we read Ignore, |