cargo: update prost to 0.13.5

We haven't updated `prost` in a while, and the reason for that is probably because the code generation output slightly changed, which would have caused dependabot to exclude that package from its updates as a failure. (At least, I suspect that's what happened.) This lets us drop a dependency on `itertools 0.12.x` because the prost 0.13.5 release weakened its constraints, allowing `itertools 0.13.x`. Now we only depend on two major versions of itertools (0.10 + 0.12) instead of three (previously four). Signed-off-by: Austin Seipp <aseipp@pobox.com>
2025-05-31 23:25:09 +00:00 · 2025-04-07 19:50:13 -05:00 · 2025-04-07 19:50:13 -05:00 · 907c62018b
commit 907c62018b
parent 5dc9da3c2b
6 changed files with 22 additions and 64 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -2225,15 +2225,6 @@ dependencies = [
 "either",
 ]

-[[package]]
-name = "itertools"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itertools"
 version = "0.13.0"
@ -3165,9 +3156,9 @@ dependencies = [

 [[package]]
 name = "prost"
-version = "0.12.6"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29"
+checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5"
 dependencies = [
 "bytes",
 "prost-derive",
@ -3175,13 +3166,12 @@ dependencies = [

 [[package]]
 name = "prost-build"
-version = "0.12.6"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4"
+checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf"
 dependencies = [
- "bytes",
 "heck",
- "itertools 0.12.1",
+ "itertools 0.13.0",
 "log",
 "multimap",
 "once_cell",
@ -3196,12 +3186,12 @@ dependencies = [

 [[package]]
 name = "prost-derive"
-version = "0.12.6"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"
+checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
 dependencies = [
 "anyhow",
- "itertools 0.12.1",
+ "itertools 0.13.0",
 "proc-macro2",
 "quote",
 "syn 2.0.100",
@ -3209,9 +3199,9 @@ dependencies = [

 [[package]]
 name = "prost-types"
-version = "0.12.6"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0"
+checksum = "52c2c1bf36ddb1a1c396b3601a3cec27c2462e45f07c386894ec3ccf5332bd16"
 dependencies = [
 "prost",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@ -79,8 +79,8 @@ pest_derive = "2.8.0"
 pollster = "0.4.0"
 pretty_assertions = "1.4.1"
 proc-macro2 = "1.0.94"
-prost = "0.12.6"
-prost-build = "0.12.6"
+prost = "0.13.5"
+prost-build = "0.13.5"
 quote = "1.0.40"
 rand = "0.8.5"
 rand_chacha = "0.3.1"
--- a/lib/src/protos/git_store.rs
+++ b/lib/src/protos/git_store.rs
@ -1,5 +1,4 @@
 // This file is @generated by prost-build.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Commit {
    #[prost(bytes = "vec", repeated, tag = "2")]
--- a/lib/src/protos/op_store.rs
+++ b/lib/src/protos/op_store.rs
@ -1,5 +1,4 @@
 // This file is @generated by prost-build.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct RefConflictLegacy {
    #[deprecated]
@ -9,7 +8,6 @@ pub struct RefConflictLegacy {
    #[prost(bytes = "vec", repeated, tag = "2")]
    pub adds: ::prost::alloc::vec::Vec<::prost::alloc::vec::Vec<u8>>,
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct RefConflict {
    #[prost(message, repeated, tag = "1")]
@ -19,14 +17,12 @@ pub struct RefConflict {
 }
 /// Nested message and enum types in `RefConflict`.
 pub mod ref_conflict {
-    #[allow(clippy::derive_partial_eq_without_eq)]
    #[derive(Clone, PartialEq, ::prost::Message)]
    pub struct Term {
        #[prost(bytes = "vec", optional, tag = "1")]
        pub value: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
    }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct RefTarget {
    /// New `RefConflict` type represents both `commit_id` and `conflict_legacy`.
@ -36,7 +32,6 @@ pub struct RefTarget {
 /// Nested message and enum types in `RefTarget`.
 pub mod ref_target {
    /// New `RefConflict` type represents both `commit_id` and `conflict_legacy`.
-    #[allow(clippy::derive_partial_eq_without_eq)]
    #[derive(Clone, PartialEq, ::prost::Oneof)]
    pub enum Value {
        #[prost(bytes, tag = "1")]
@ -47,7 +42,6 @@ pub mod ref_target {
        Conflict(super::RefConflict),
    }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct RemoteBookmark {
    #[prost(string, tag = "1")]
@ -58,7 +52,6 @@ pub struct RemoteBookmark {
    #[prost(enumeration = "RemoteRefState", optional, tag = "3")]
    pub state: ::core::option::Option<i32>,
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Bookmark {
    #[prost(string, tag = "1")]
@ -73,7 +66,6 @@ pub struct Bookmark {
    #[prost(message, repeated, tag = "3")]
    pub remote_bookmarks: ::prost::alloc::vec::Vec<RemoteBookmark>,
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GitRef {
    #[prost(string, tag = "1")]
@ -86,7 +78,6 @@ pub struct GitRef {
    #[prost(message, optional, tag = "3")]
    pub target: ::core::option::Option<RefTarget>,
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Tag {
    #[prost(string, tag = "1")]
@ -94,7 +85,6 @@ pub struct Tag {
    #[prost(message, optional, tag = "2")]
    pub target: ::core::option::Option<RefTarget>,
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct View {
    #[prost(bytes = "vec", repeated, tag = "1")]
@ -123,7 +113,6 @@ pub struct View {
    #[prost(message, optional, tag = "9")]
    pub git_head: ::core::option::Option<RefTarget>,
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Operation {
    #[prost(bytes = "vec", tag = "1")]
@ -134,15 +123,13 @@ pub struct Operation {
    pub metadata: ::core::option::Option<OperationMetadata>,
 }
 /// TODO: Share with store.proto? Do we even need the timezone here?
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct Timestamp {
    #[prost(int64, tag = "1")]
    pub millis_since_epoch: i64,
    #[prost(int32, tag = "2")]
    pub tz_offset: i32,
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct OperationMetadata {
    #[prost(message, optional, tag = "1")]
@ -176,8 +163,8 @@ impl RemoteRefState {
    /// (if the ProtoBuf definition does not change) and safe for programmatic use.
    pub fn as_str_name(&self) -> &'static str {
        match self {
-            RemoteRefState::New => "New",
-            RemoteRefState::Tracked => "Tracked",
+            Self::New => "New",
+            Self::Tracked => "Tracked",
        }
    }
    /// Creates an enum from field names used in the ProtoBuf definition.
--- a/lib/src/protos/simple_store.rs
+++ b/lib/src/protos/simple_store.rs
@ -1,5 +1,4 @@
 // This file is @generated by prost-build.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TreeValue {
    #[prost(oneof = "tree_value::Value", tags = "2, 3, 4, 5")]
@ -7,7 +6,6 @@ pub struct TreeValue {
 }
 /// Nested message and enum types in `TreeValue`.
 pub mod tree_value {
-    #[allow(clippy::derive_partial_eq_without_eq)]
    #[derive(Clone, PartialEq, ::prost::Message)]
    pub struct File {
        #[prost(bytes = "vec", tag = "1")]
@ -15,7 +13,6 @@ pub mod tree_value {
        #[prost(bool, tag = "2")]
        pub executable: bool,
    }
-    #[allow(clippy::derive_partial_eq_without_eq)]
    #[derive(Clone, PartialEq, ::prost::Oneof)]
    pub enum Value {
        #[prost(message, tag = "2")]
@ -28,7 +25,6 @@ pub mod tree_value {
        ConflictId(::prost::alloc::vec::Vec<u8>),
    }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Tree {
    #[prost(message, repeated, tag = "1")]
@ -36,7 +32,6 @@ pub struct Tree {
 }
 /// Nested message and enum types in `Tree`.
 pub mod tree {
-    #[allow(clippy::derive_partial_eq_without_eq)]
    #[derive(Clone, PartialEq, ::prost::Message)]
    pub struct Entry {
        #[prost(string, tag = "1")]
@ -45,7 +40,6 @@ pub mod tree {
        pub value: ::core::option::Option<super::TreeValue>,
    }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Commit {
    #[prost(bytes = "vec", repeated, tag = "1")]
@ -71,15 +65,13 @@ pub struct Commit {
 }
 /// Nested message and enum types in `Commit`.
 pub mod commit {
-    #[allow(clippy::derive_partial_eq_without_eq)]
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[derive(Clone, Copy, PartialEq, ::prost::Message)]
    pub struct Timestamp {
        #[prost(int64, tag = "1")]
        pub millis_since_epoch: i64,
        #[prost(int32, tag = "2")]
        pub tz_offset: i32,
    }
-    #[allow(clippy::derive_partial_eq_without_eq)]
    #[derive(Clone, PartialEq, ::prost::Message)]
    pub struct Signature {
        #[prost(string, tag = "1")]
@ -90,7 +82,6 @@ pub mod commit {
        pub timestamp: ::core::option::Option<Timestamp>,
    }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Conflict {
    #[prost(message, repeated, tag = "1")]
@ -100,7 +91,6 @@ pub struct Conflict {
 }
 /// Nested message and enum types in `Conflict`.
 pub mod conflict {
-    #[allow(clippy::derive_partial_eq_without_eq)]
    #[derive(Clone, PartialEq, ::prost::Message)]
    pub struct Term {
        #[prost(message, optional, tag = "1")]
--- a/lib/src/protos/working_copy.rs
+++ b/lib/src/protos/working_copy.rs
@ -1,12 +1,10 @@
 // This file is @generated by prost-build.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct MaterializedConflictData {
    /// TODO: maybe we should store num_sides here as well
    #[prost(uint32, tag = "1")]
    pub conflict_marker_len: u32,
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct FileState {
    #[prost(int64, tag = "1")]
@ -22,7 +20,6 @@ pub struct FileState {
    #[prost(message, optional, tag = "5")]
    pub materialized_conflict_data: ::core::option::Option<MaterializedConflictData>,
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct FileStateEntry {
    #[prost(string, tag = "1")]
@ -30,13 +27,11 @@ pub struct FileStateEntry {
    #[prost(message, optional, tag = "2")]
    pub state: ::core::option::Option<FileState>,
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SparsePatterns {
    #[prost(string, repeated, tag = "1")]
    pub prefixes: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TreeState {
    #[prost(bytes = "vec", tag = "1")]
@ -54,7 +49,6 @@ pub struct TreeState {
    #[prost(message, optional, tag = "4")]
    pub watchman_clock: ::core::option::Option<WatchmanClock>,
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct WatchmanClock {
    #[prost(oneof = "watchman_clock::WatchmanClock", tags = "1, 2")]
@ -62,7 +56,6 @@ pub struct WatchmanClock {
 }
 /// Nested message and enum types in `WatchmanClock`.
 pub mod watchman_clock {
-    #[allow(clippy::derive_partial_eq_without_eq)]
    #[derive(Clone, PartialEq, ::prost::Oneof)]
    pub enum WatchmanClock {
        #[prost(string, tag = "1")]
@ -71,7 +64,6 @@ pub mod watchman_clock {
        UnixTimestamp(i64),
    }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Checkout {
    /// The operation at which the working copy was updated.
@ -100,11 +92,11 @@ impl FileType {
    /// (if the ProtoBuf definition does not change) and safe for programmatic use.
    pub fn as_str_name(&self) -> &'static str {
        match self {
-            FileType::Normal => "Normal",
-            FileType::Symlink => "Symlink",
-            FileType::Executable => "Executable",
-            FileType::Conflict => "Conflict",
-            FileType::GitSubmodule => "GitSubmodule",
+            Self::Normal => "Normal",
+            Self::Symlink => "Symlink",
+            Self::Executable => "Executable",
+            Self::Conflict => "Conflict",
+            Self::GitSubmodule => "GitSubmodule",
        }
    }
    /// Creates an enum from field names used in the ProtoBuf definition.