Skip to content

Commit 34db1b8

Browse files
authored
Bump Rust dependencies (#1319)
1 parent ca88d90 commit 34db1b8

11 files changed

+277
-346
lines changed

Cargo.lock

+163-148
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nativelink-proto/genproto/build.bazel.remote.execution.v2.pb.rs

+55-99
Large diffs are not rendered by default.

nativelink-proto/genproto/build.bazel.semver.pb.rs

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
// This file is @generated by prost-build.
1616
/// The full version of a given tool.
17-
#[allow(clippy::derive_partial_eq_without_eq)]
1817
#[derive(Clone, PartialEq, ::prost::Message)]
1918
pub struct SemVer {
2019
/// The major version, e.g 10 for 10.2.3.

nativelink-proto/genproto/com.github.trace_machina.nativelink.remote_execution.pb.rs

+14-23
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,13 @@
1414

1515
// This file is @generated by prost-build.
1616
/// / Request object for keep alive requests.
17-
#[allow(clippy::derive_partial_eq_without_eq)]
1817
#[derive(Clone, PartialEq, ::prost::Message)]
1918
pub struct KeepAliveRequest {
2019
/// / ID of the worker making the request.
2120
#[prost(string, tag = "1")]
2221
pub worker_id: ::prost::alloc::string::String,
2322
}
2423
/// / Request object for going away requests.
25-
#[allow(clippy::derive_partial_eq_without_eq)]
2624
#[derive(Clone, PartialEq, ::prost::Message)]
2725
pub struct GoingAwayRequest {
2826
/// / ID of the worker making the request.
@@ -31,7 +29,6 @@ pub struct GoingAwayRequest {
3129
}
3230
/// / Represents the initial request sent to the scheduler informing the
3331
/// / scheduler about this worker's capabilities.
34-
#[allow(clippy::derive_partial_eq_without_eq)]
3532
#[derive(Clone, PartialEq, ::prost::Message)]
3633
pub struct SupportedProperties {
3734
/// / The list of properties this worker can support. The exact
@@ -50,7 +47,6 @@ pub struct SupportedProperties {
5047
>,
5148
}
5249
/// / The result of an ExecutionRequest.
53-
#[allow(clippy::derive_partial_eq_without_eq)]
5450
#[derive(Clone, PartialEq, ::prost::Message)]
5551
pub struct ExecuteResult {
5652
/// / ID of the worker making the request.
@@ -70,7 +66,6 @@ pub struct ExecuteResult {
7066
/// Nested message and enum types in `ExecuteResult`.
7167
pub mod execute_result {
7268
/// / The actual response data.
73-
#[allow(clippy::derive_partial_eq_without_eq)]
7469
#[derive(Clone, PartialEq, ::prost::Oneof)]
7570
pub enum Result {
7671
/// / Result of the execution. See `build.bazel.remote.execution.v2.ExecuteResponse`
@@ -87,31 +82,27 @@ pub mod execute_result {
8782
}
8883
}
8984
/// / Result sent back from the server when a node connects.
90-
#[allow(clippy::derive_partial_eq_without_eq)]
9185
#[derive(Clone, PartialEq, ::prost::Message)]
9286
pub struct ConnectionResult {
9387
/// / The internal ID given to the newly connected node.
9488
#[prost(string, tag = "1")]
9589
pub worker_id: ::prost::alloc::string::String,
9690
}
9791
/// / Request to kill a running operation sent from the scheduler to a worker.
98-
#[allow(clippy::derive_partial_eq_without_eq)]
9992
#[derive(Clone, PartialEq, ::prost::Message)]
10093
pub struct KillOperationRequest {
10194
/// / The the operation id for the operation to be killed.
10295
#[prost(string, tag = "1")]
10396
pub operation_id: ::prost::alloc::string::String,
10497
}
10598
/// / Communication from the scheduler to the worker.
106-
#[allow(clippy::derive_partial_eq_without_eq)]
10799
#[derive(Clone, PartialEq, ::prost::Message)]
108100
pub struct UpdateForWorker {
109101
#[prost(oneof = "update_for_worker::Update", tags = "1, 2, 3, 4, 5")]
110102
pub update: ::core::option::Option<update_for_worker::Update>,
111103
}
112104
/// Nested message and enum types in `UpdateForWorker`.
113105
pub mod update_for_worker {
114-
#[allow(clippy::derive_partial_eq_without_eq)]
115106
#[derive(Clone, PartialEq, ::prost::Oneof)]
116107
pub enum Update {
117108
/// / This will be sent only as the first item in the stream after the node
@@ -138,7 +129,6 @@ pub mod update_for_worker {
138129
KillOperationRequest(super::KillOperationRequest),
139130
}
140131
}
141-
#[allow(clippy::derive_partial_eq_without_eq)]
142132
#[derive(Clone, PartialEq, ::prost::Message)]
143133
pub struct StartExecute {
144134
/// / The action information used to execute job.
@@ -158,7 +148,6 @@ pub struct StartExecute {
158148
/// / by programs like bb_browswer to inspect the history of a build.
159149
/// / Note: Ensure this is always compatible with:
160150
/// / <https://github.com/buildbarn/bb-remote-execution/blob/e95e066eb624dc9099682394ec18c12e218e8fc4/pkg/proto/cas/cas.proto#L23>
161-
#[allow(clippy::derive_partial_eq_without_eq)]
162151
#[derive(Clone, PartialEq, ::prost::Message)]
163152
pub struct HistoricalExecuteResponse {
164153
#[prost(message, optional, tag = "1")]
@@ -190,8 +179,8 @@ pub mod worker_api_client {
190179
where
191180
T: tonic::client::GrpcService<tonic::body::BoxBody>,
192181
T::Error: Into<StdError>,
193-
T::ResponseBody: Body<Data = Bytes> + Send + 'static,
194-
<T::ResponseBody as Body>::Error: Into<StdError> + Send,
182+
T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
183+
<T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
195184
{
196185
pub fn new(inner: T) -> Self {
197186
let inner = tonic::client::Grpc::new(inner);
@@ -216,7 +205,7 @@ pub mod worker_api_client {
216205
>,
217206
<T as tonic::codegen::Service<
218207
http::Request<tonic::body::BoxBody>,
219-
>>::Error: Into<StdError> + Send + Sync,
208+
>>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
220209
{
221210
WorkerApiClient::new(InterceptedService::new(inner, interceptor))
222211
}
@@ -391,12 +380,12 @@ pub mod worker_api_server {
391380
use tonic::codegen::*;
392381
/// Generated trait containing gRPC methods that should be implemented for use with WorkerApiServer.
393382
#[async_trait]
394-
pub trait WorkerApi: Send + Sync + 'static {
383+
pub trait WorkerApi: std::marker::Send + std::marker::Sync + 'static {
395384
/// Server streaming response type for the ConnectWorker method.
396385
type ConnectWorkerStream: tonic::codegen::tokio_stream::Stream<
397386
Item = std::result::Result<super::UpdateForWorker, tonic::Status>,
398387
>
399-
+ Send
388+
+ std::marker::Send
400389
+ 'static;
401390
/// / Registers this worker and informs the scheduler what properties
402391
/// / this worker supports. The response must be listened on the client
@@ -447,14 +436,14 @@ pub mod worker_api_server {
447436
/// / command to the scheduler. The scheduler will then use this information
448437
/// / to determine which jobs the worker can process.
449438
#[derive(Debug)]
450-
pub struct WorkerApiServer<T: WorkerApi> {
439+
pub struct WorkerApiServer<T> {
451440
inner: Arc<T>,
452441
accept_compression_encodings: EnabledCompressionEncodings,
453442
send_compression_encodings: EnabledCompressionEncodings,
454443
max_decoding_message_size: Option<usize>,
455444
max_encoding_message_size: Option<usize>,
456445
}
457-
impl<T: WorkerApi> WorkerApiServer<T> {
446+
impl<T> WorkerApiServer<T> {
458447
pub fn new(inner: T) -> Self {
459448
Self::from_arc(Arc::new(inner))
460449
}
@@ -508,8 +497,8 @@ pub mod worker_api_server {
508497
impl<T, B> tonic::codegen::Service<http::Request<B>> for WorkerApiServer<T>
509498
where
510499
T: WorkerApi,
511-
B: Body + Send + 'static,
512-
B::Error: Into<StdError> + Send + 'static,
500+
B: Body + std::marker::Send + 'static,
501+
B::Error: Into<StdError> + std::marker::Send + 'static,
513502
{
514503
type Response = http::Response<tonic::body::BoxBody>;
515504
type Error = std::convert::Infallible;
@@ -719,7 +708,7 @@ pub mod worker_api_server {
719708
}
720709
}
721710
}
722-
impl<T: WorkerApi> Clone for WorkerApiServer<T> {
711+
impl<T> Clone for WorkerApiServer<T> {
723712
fn clone(&self) -> Self {
724713
let inner = self.inner.clone();
725714
Self {
@@ -731,7 +720,9 @@ pub mod worker_api_server {
731720
}
732721
}
733722
}
734-
impl<T: WorkerApi> tonic::server::NamedService for WorkerApiServer<T> {
735-
const NAME: &'static str = "com.github.trace_machina.nativelink.remote_execution.WorkerApi";
723+
/// Generated gRPC service name
724+
pub const SERVICE_NAME: &str = "com.github.trace_machina.nativelink.remote_execution.WorkerApi";
725+
impl<T> tonic::server::NamedService for WorkerApiServer<T> {
726+
const NAME: &'static str = SERVICE_NAME;
736727
}
737728
}

nativelink-proto/genproto/google.api.pb.rs

-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
/// Defines the HTTP configuration for an API service. It contains a list of
1717
/// [HttpRule][google.api.HttpRule], each specifying the mapping of an RPC method
1818
/// to one or more HTTP REST API methods.
19-
#[allow(clippy::derive_partial_eq_without_eq)]
2019
#[derive(Clone, PartialEq, ::prost::Message)]
2120
pub struct Http {
2221
/// A list of HTTP configuration rules that apply to individual API methods.
@@ -315,7 +314,6 @@ pub struct Http {
315314
/// If an API needs to use a JSON array for request or response body, it can map
316315
/// the request or response body to a repeated field. However, some gRPC
317316
/// Transcoding implementations may not support this feature.
318-
#[allow(clippy::derive_partial_eq_without_eq)]
319317
#[derive(Clone, PartialEq, ::prost::Message)]
320318
pub struct HttpRule {
321319
/// Selects a method to which this rule applies.
@@ -355,7 +353,6 @@ pub mod http_rule {
355353
/// Determines the URL pattern is matched by this rules. This pattern can be
356354
/// used with any of the {get|put|post|delete|patch} methods. A custom method
357355
/// can be defined using the 'custom' field.
358-
#[allow(clippy::derive_partial_eq_without_eq)]
359356
#[derive(Clone, PartialEq, ::prost::Oneof)]
360357
pub enum Pattern {
361358
/// Maps to HTTP GET. Used for listing and getting information about
@@ -383,7 +380,6 @@ pub mod http_rule {
383380
}
384381
}
385382
/// A custom pattern is used for defining custom HTTP verb.
386-
#[allow(clippy::derive_partial_eq_without_eq)]
387383
#[derive(Clone, PartialEq, ::prost::Message)]
388384
pub struct CustomHttpPattern {
389385
/// The name of this custom HTTP verb.

nativelink-proto/genproto/google.bytestream.pb.rs

+14-18
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
// This file is @generated by prost-build.
1616
/// Request object for ByteStream.Read.
17-
#[allow(clippy::derive_partial_eq_without_eq)]
1817
#[derive(Clone, PartialEq, ::prost::Message)]
1918
pub struct ReadRequest {
2019
/// The name of the resource to read.
@@ -38,7 +37,6 @@ pub struct ReadRequest {
3837
pub read_limit: i64,
3938
}
4039
/// Response object for ByteStream.Read.
41-
#[allow(clippy::derive_partial_eq_without_eq)]
4240
#[derive(Clone, PartialEq, ::prost::Message)]
4341
pub struct ReadResponse {
4442
/// A portion of the data for the resource. The service **may** leave `data`
@@ -49,7 +47,6 @@ pub struct ReadResponse {
4947
pub data: ::prost::bytes::Bytes,
5048
}
5149
/// Request object for ByteStream.Write.
52-
#[allow(clippy::derive_partial_eq_without_eq)]
5350
#[derive(Clone, PartialEq, ::prost::Message)]
5451
pub struct WriteRequest {
5552
/// The name of the resource to write. This **must** be set on the first
@@ -84,23 +81,20 @@ pub struct WriteRequest {
8481
pub data: ::prost::bytes::Bytes,
8582
}
8683
/// Response object for ByteStream.Write.
87-
#[allow(clippy::derive_partial_eq_without_eq)]
8884
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
8985
pub struct WriteResponse {
9086
/// The number of bytes that have been processed for the given resource.
9187
#[prost(int64, tag = "1")]
9288
pub committed_size: i64,
9389
}
9490
/// Request object for ByteStream.QueryWriteStatus.
95-
#[allow(clippy::derive_partial_eq_without_eq)]
9691
#[derive(Clone, PartialEq, ::prost::Message)]
9792
pub struct QueryWriteStatusRequest {
9893
/// The name of the resource whose write status is being requested.
9994
#[prost(string, tag = "1")]
10095
pub resource_name: ::prost::alloc::string::String,
10196
}
10297
/// Response object for ByteStream.QueryWriteStatus.
103-
#[allow(clippy::derive_partial_eq_without_eq)]
10498
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
10599
pub struct QueryWriteStatusResponse {
106100
/// The number of bytes that have been processed for the given resource.
@@ -147,8 +141,8 @@ pub mod byte_stream_client {
147141
where
148142
T: tonic::client::GrpcService<tonic::body::BoxBody>,
149143
T::Error: Into<StdError>,
150-
T::ResponseBody: Body<Data = Bytes> + Send + 'static,
151-
<T::ResponseBody as Body>::Error: Into<StdError> + Send,
144+
T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
145+
<T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
152146
{
153147
pub fn new(inner: T) -> Self {
154148
let inner = tonic::client::Grpc::new(inner);
@@ -173,7 +167,7 @@ pub mod byte_stream_client {
173167
>,
174168
<T as tonic::codegen::Service<
175169
http::Request<tonic::body::BoxBody>,
176-
>>::Error: Into<StdError> + Send + Sync,
170+
>>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
177171
{
178172
ByteStreamClient::new(InterceptedService::new(inner, interceptor))
179173
}
@@ -329,12 +323,12 @@ pub mod byte_stream_server {
329323
use tonic::codegen::*;
330324
/// Generated trait containing gRPC methods that should be implemented for use with ByteStreamServer.
331325
#[async_trait]
332-
pub trait ByteStream: Send + Sync + 'static {
326+
pub trait ByteStream: std::marker::Send + std::marker::Sync + 'static {
333327
/// Server streaming response type for the Read method.
334328
type ReadStream: tonic::codegen::tokio_stream::Stream<
335329
Item = std::result::Result<super::ReadResponse, tonic::Status>,
336330
>
337-
+ Send
331+
+ std::marker::Send
338332
+ 'static;
339333
/// `Read()` is used to retrieve the contents of a resource as a sequence
340334
/// of bytes. The bytes are returned in a sequence of responses, and the
@@ -415,14 +409,14 @@ pub mod byte_stream_server {
415409
///
416410
/// The errors returned by the service are in the Google canonical error space.
417411
#[derive(Debug)]
418-
pub struct ByteStreamServer<T: ByteStream> {
412+
pub struct ByteStreamServer<T> {
419413
inner: Arc<T>,
420414
accept_compression_encodings: EnabledCompressionEncodings,
421415
send_compression_encodings: EnabledCompressionEncodings,
422416
max_decoding_message_size: Option<usize>,
423417
max_encoding_message_size: Option<usize>,
424418
}
425-
impl<T: ByteStream> ByteStreamServer<T> {
419+
impl<T> ByteStreamServer<T> {
426420
pub fn new(inner: T) -> Self {
427421
Self::from_arc(Arc::new(inner))
428422
}
@@ -476,8 +470,8 @@ pub mod byte_stream_server {
476470
impl<T, B> tonic::codegen::Service<http::Request<B>> for ByteStreamServer<T>
477471
where
478472
T: ByteStream,
479-
B: Body + Send + 'static,
480-
B::Error: Into<StdError> + Send + 'static,
473+
B: Body + std::marker::Send + 'static,
474+
B::Error: Into<StdError> + std::marker::Send + 'static,
481475
{
482476
type Response = http::Response<tonic::body::BoxBody>;
483477
type Error = std::convert::Infallible;
@@ -646,7 +640,7 @@ pub mod byte_stream_server {
646640
}
647641
}
648642
}
649-
impl<T: ByteStream> Clone for ByteStreamServer<T> {
643+
impl<T> Clone for ByteStreamServer<T> {
650644
fn clone(&self) -> Self {
651645
let inner = self.inner.clone();
652646
Self {
@@ -658,7 +652,9 @@ pub mod byte_stream_server {
658652
}
659653
}
660654
}
661-
impl<T: ByteStream> tonic::server::NamedService for ByteStreamServer<T> {
662-
const NAME: &'static str = "google.bytestream.ByteStream";
655+
/// Generated gRPC service name
656+
pub const SERVICE_NAME: &str = "google.bytestream.ByteStream";
657+
impl<T> tonic::server::NamedService for ByteStreamServer<T> {
658+
const NAME: &'static str = SERVICE_NAME;
663659
}
664660
}

0 commit comments

Comments
 (0)