chore: fmt & clippy fixes for Rust 1.50 (#1004)

* chore: fmt & clippy fixes for Rust 1.50 * update rand-core * update googleapis (updated grpcio) Co-authored-by: Philip Jenvey <[email protected]>
mozilla-services · Feb 17, 2021 · 56cadcb · 56cadcb
1 parent ba6e5f4
commit 56cadcb
Show file tree

Hide file tree

Showing 24 changed files with 152 additions and 159 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.49-buster as builder
+FROM rust:1.50-buster as builder
 WORKDIR /app
 ADD . /app
 ENV PATH=$PATH:/root/.cargo/bin

diff --git a/src/bin/purge_ttl.rs b/src/bin/purge_ttl.rs
@@ -119,16 +119,13 @@ fn begin_transaction(
     Ok((req, id))
 }
 
-fn continue_transaction(
-    session: &Session,
-    transaction_id: Vec<u8>,
-) -> Result<ExecuteSqlRequest, Box<grpcio::Error>> {
+fn continue_transaction(session: &Session, transaction_id: Vec<u8>) -> ExecuteSqlRequest {
     let mut ts = TransactionSelector::new();
     ts.set_id(transaction_id);
     let mut req = ExecuteSqlRequest::new();
     req.set_session(session.get_name().to_string());
     req.set_transaction(ts);
-    Ok(req)
+    req
 }
 
 fn commit_transaction(
@@ -217,7 +214,7 @@ fn delete_incremental(
             delete_sql.trim_end_matches(&", ".to_string()).to_string()
         );
         trace!("Deleting chunk with: {}", delete_sql);
-        let mut delete_req = continue_transaction(&session, txn.clone())?;
+        let mut delete_req = continue_transaction(&session, txn.clone());
         delete_req.set_sql(delete_sql);
         client.execute_sql(&delete_req)?;
         info!("{}: removed {} rows", table, total);

diff --git a/src/web/error.rs b/src/web/error.rs
@@ -29,7 +29,10 @@ impl HawkError {
     }
 
     pub fn is_reportable(&self) -> bool {
-        matches!(&self.kind(), HawkErrorKind::TruncatedId | HawkErrorKind::Parse(_))
+        matches!(
+            &self.kind(),
+            HawkErrorKind::TruncatedId | HawkErrorKind::Parse(_)
+        )
     }
 
     pub fn metric_label(&self) -> Option<String> {

diff --git a/src/web/extractors.rs b/src/web/extractors.rs
@@ -1616,6 +1616,7 @@ where
 }
 
 /// Deserialize a value as True if it exists, False otherwise
+#[allow(clippy::unnecessary_wraps)] // serde::Deserialize requires Result<bool>
 fn deserialize_present_value<'de, D>(deserializer: D) -> Result<bool, D::Error>
 where
     D: Deserializer<'de>,

diff --git a/vendor/mozilla-rust-sdk/googleapis-raw/Cargo.toml b/vendor/mozilla-rust-sdk/googleapis-raw/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "googleapis-raw"
-version = "0.0.5"
+version = "0.0.6"
 authors = ["Ferrous Systems"]
 edition = "2018"
 
 [dependencies]
 futures = "0.3.8"
 grpcio = "0.7.1"
-protobuf = "2.20.0"
+protobuf = "2.22.0"
 
 [dev-dependencies]
 slog = "2.7"

diff --git a/vendor/mozilla-rust-sdk/googleapis-raw/src/empty.rs b/vendor/mozilla-rust-sdk/googleapis-raw/src/empty.rs
@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 2.20.0. Do not edit
+// This file is generated by rust-protobuf 2.22.0. Do not edit
 // @generated
 
 // https://github.com/rust-lang/rust-clippy/issues/702
@@ -21,7 +21,7 @@
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_20_0;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0;
 
 #[derive(PartialEq,Clone,Default)]
 pub struct Empty {

diff --git a/vendor/mozilla-rust-sdk/googleapis-raw/src/iam/v1/iam_policy.rs b/vendor/mozilla-rust-sdk/googleapis-raw/src/iam/v1/iam_policy.rs
@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 2.20.0. Do not edit
+// This file is generated by rust-protobuf 2.22.0. Do not edit
 // @generated
 
 // https://github.com/rust-lang/rust-clippy/issues/702
@@ -21,7 +21,7 @@
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_20_0;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0;
 
 #[derive(PartialEq,Clone,Default)]
 pub struct SetIamPolicyRequest {

diff --git a/vendor/mozilla-rust-sdk/googleapis-raw/src/iam/v1/policy.rs b/vendor/mozilla-rust-sdk/googleapis-raw/src/iam/v1/policy.rs
@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 2.20.0. Do not edit
+// This file is generated by rust-protobuf 2.22.0. Do not edit
 // @generated
 
 // https://github.com/rust-lang/rust-clippy/issues/702
@@ -21,7 +21,7 @@
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_20_0;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0;
 
 #[derive(PartialEq,Clone,Default)]
 pub struct Policy {

diff --git a/vendor/mozilla-rust-sdk/googleapis-raw/src/lib.rs b/vendor/mozilla-rust-sdk/googleapis-raw/src/lib.rs
@@ -3,7 +3,7 @@
 // This appears as a comment in each generated file. Add it once here
 // to save a bit of time and effort.
 
-const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_20_0;
+const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0;
 
 pub mod empty;
 pub(crate) mod iam;

diff --git a/vendor/mozilla-rust-sdk/googleapis-raw/src/longrunning/operations.rs b/vendor/mozilla-rust-sdk/googleapis-raw/src/longrunning/operations.rs
@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 2.20.0. Do not edit
+// This file is generated by rust-protobuf 2.22.0. Do not edit
 // @generated
 
 // https://github.com/rust-lang/rust-clippy/issues/702
@@ -21,7 +21,7 @@
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_20_0;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0;
 
 #[derive(PartialEq,Clone,Default)]
 pub struct Operation {

diff --git a/vendor/mozilla-rust-sdk/googleapis-raw/src/rpc/code.rs b/vendor/mozilla-rust-sdk/googleapis-raw/src/rpc/code.rs
@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 2.20.0. Do not edit
+// This file is generated by rust-protobuf 2.22.0. Do not edit
 // @generated
 
 // https://github.com/rust-lang/rust-clippy/issues/702
@@ -21,7 +21,7 @@
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_20_0;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0;
 
 #[derive(Clone,PartialEq,Eq,Debug,Hash)]
 pub enum Code {

diff --git a/vendor/mozilla-rust-sdk/googleapis-raw/src/rpc/error_details.rs b/vendor/mozilla-rust-sdk/googleapis-raw/src/rpc/error_details.rs
@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 2.20.0. Do not edit
+// This file is generated by rust-protobuf 2.22.0. Do not edit
 // @generated
 
 // https://github.com/rust-lang/rust-clippy/issues/702
@@ -21,7 +21,7 @@
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_20_0;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0;
 
 #[derive(PartialEq,Clone,Default)]
 pub struct RetryInfo {

diff --git a/vendor/mozilla-rust-sdk/googleapis-raw/src/rpc/status.rs b/vendor/mozilla-rust-sdk/googleapis-raw/src/rpc/status.rs
@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 2.20.0. Do not edit
+// This file is generated by rust-protobuf 2.22.0. Do not edit
 // @generated
 
 // https://github.com/rust-lang/rust-clippy/issues/702
@@ -21,7 +21,7 @@
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_20_0;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0;
 
 #[derive(PartialEq,Clone,Default)]
 pub struct Status {

diff --git a/...r/mozilla-rust-sdk/googleapis-raw/src/spanner/admin/database/v1/spanner_database_admin.rs b/...r/mozilla-rust-sdk/googleapis-raw/src/spanner/admin/database/v1/spanner_database_admin.rs
@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 2.20.0. Do not edit
+// This file is generated by rust-protobuf 2.22.0. Do not edit
 // @generated
 
 // https://github.com/rust-lang/rust-clippy/issues/702
@@ -21,7 +21,7 @@
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_20_0;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0;
 
 #[derive(PartialEq,Clone,Default)]
 pub struct Database {

diff --git a/...r/mozilla-rust-sdk/googleapis-raw/src/spanner/admin/instance/v1/spanner_instance_admin.rs b/...r/mozilla-rust-sdk/googleapis-raw/src/spanner/admin/instance/v1/spanner_instance_admin.rs
@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 2.20.0. Do not edit
+// This file is generated by rust-protobuf 2.22.0. Do not edit
 // @generated
 
 // https://github.com/rust-lang/rust-clippy/issues/702
@@ -21,7 +21,7 @@
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_20_0;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0;
 
 #[derive(PartialEq,Clone,Default)]
 pub struct InstanceConfig {

diff --git a/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/keys.rs b/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/keys.rs
@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 2.20.0. Do not edit
+// This file is generated by rust-protobuf 2.22.0. Do not edit
 // @generated
 
 // https://github.com/rust-lang/rust-clippy/issues/702
@@ -21,7 +21,7 @@
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_20_0;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0;
 
 #[derive(PartialEq,Clone,Default)]
 pub struct KeyRange {

diff --git a/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/mutation.rs b/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/mutation.rs
@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 2.20.0. Do not edit
+// This file is generated by rust-protobuf 2.22.0. Do not edit
 // @generated
 
 // https://github.com/rust-lang/rust-clippy/issues/702
@@ -21,7 +21,7 @@
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_20_0;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0;
 
 #[derive(PartialEq,Clone,Default)]
 pub struct Mutation {

diff --git a/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/query_plan.rs b/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/query_plan.rs
@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 2.20.0. Do not edit
+// This file is generated by rust-protobuf 2.22.0. Do not edit
 // @generated
 
 // https://github.com/rust-lang/rust-clippy/issues/702
@@ -21,7 +21,7 @@
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_20_0;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0;
 
 #[derive(PartialEq,Clone,Default)]
 pub struct PlanNode {

diff --git a/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/result_set.rs b/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/result_set.rs
@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 2.20.0. Do not edit
+// This file is generated by rust-protobuf 2.22.0. Do not edit
 // @generated
 
 // https://github.com/rust-lang/rust-clippy/issues/702
@@ -21,7 +21,7 @@
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_20_0;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0;
 
 #[derive(PartialEq,Clone,Default)]
 pub struct ResultSet {

diff --git a/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/spanner.rs b/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/spanner.rs
@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 2.20.0. Do not edit
+// This file is generated by rust-protobuf 2.22.0. Do not edit
 // @generated
 
 // https://github.com/rust-lang/rust-clippy/issues/702
@@ -21,7 +21,7 @@
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_20_0;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0;
 
 #[derive(PartialEq,Clone,Default)]
 pub struct CreateSessionRequest {

diff --git a/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/transaction.rs b/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/transaction.rs
@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 2.20.0. Do not edit
+// This file is generated by rust-protobuf 2.22.0. Do not edit
 // @generated
 
 // https://github.com/rust-lang/rust-clippy/issues/702
@@ -21,7 +21,7 @@
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_20_0;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0;
 
 #[derive(PartialEq,Clone,Default)]
 pub struct TransactionOptions {

diff --git a/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/type_pb.rs b/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/type_pb.rs
@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 2.20.0. Do not edit
+// This file is generated by rust-protobuf 2.22.0. Do not edit
 // @generated
 
 // https://github.com/rust-lang/rust-clippy/issues/702
@@ -21,7 +21,7 @@
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_20_0;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0;
 
 #[derive(PartialEq,Clone,Default)]
 pub struct Type {

diff --git a/vendor/mozilla-rust-sdk/googleapis/Cargo.toml b/vendor/mozilla-rust-sdk/googleapis/Cargo.toml
@@ -9,5 +9,5 @@ futures = "0.3.8"
 grpcio = "0.7.1"
 
 [dependencies.googleapis-raw]
-version = "0.0.5"
+version = "0.0.6"
 path = "../googleapis-raw"