chore: update to Rust 1.58 and switch to GCP Rust crate

Cargo.toml

@@ -38,7 +38,7 @@ diesel_migrations = { version = "1.4.0", features = ["mysql"] }
 docopt = "1.1.0"
 env_logger = "0.9"
 futures = { version = "0.3", features = ["compat"] }
-googleapis-raw = { version = "0", path = "vendor/mozilla-rust-sdk/googleapis-raw" }
+google-cloud-rust-raw = "0.11.0"
 # Some versions of OpenSSL 1.1.1 conflict with grpcio's built-in boringssl which can cause
 # syncserver to either fail to either compile, or start. In those cases, try
 # `cargo build --features grpcio/openssl ...`

Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.57-buster as builder
+FROM rust:1.58-buster as builder
 WORKDIR /app
 ADD . /app
 ENV PATH=$PATH:/root/.cargo/bin

src/bin/purge_ttl.rs

@@ -8,7 +8,7 @@ use std::time::{Duration, Instant};
 use cadence::{
     BufferedUdpMetricSink, Metric, QueuingMetricSink, StatsdClient, Timed, DEFAULT_PORT,
 };
-use googleapis_raw::spanner::v1::{
+use google_cloud_rust_raw::spanner::v1::{
     spanner::{
         BeginTransactionRequest, CommitRequest, CreateSessionRequest, ExecuteSqlRequest, Session,
     },
@@ -141,7 +141,7 @@ fn commit_transaction(
 }
 
 pub struct SyncResultSet {
-    result: googleapis_raw::spanner::v1::result_set::ResultSet,
+    result: google_cloud_rust_raw::spanner::v1::result_set::ResultSet,
 }
 
 impl Iterator for SyncResultSet {
@@ -209,10 +209,7 @@ fn delete_incremental(
 
             total += 1;
         }
-        delete_sql = format!(
-            "{})",
-            delete_sql.trim_end_matches(&", ".to_string()).to_string()
-        );
+        delete_sql = format!("{})", delete_sql.trim_end_matches(&", ".to_string()));
         trace!("Deleting chunk with: {}", delete_sql);
         let mut delete_req = continue_transaction(session, txn.clone());
         delete_req.set_sql(delete_sql);

src/db/mysql/models.rs

@@ -97,6 +97,7 @@ pub struct MysqlDb {
 /// Despite the db conn structs being !Sync (see Arc<MysqlDbInner> above) we
 /// don't spawn multiple MysqlDb calls at a time in the thread pool. Calls are
 /// queued to the thread pool via Futures, naturally serialized.
+#[allow(clippy::non_send_fields_in_send_ty)]
 unsafe impl Send for MysqlDb {}
 
 pub struct MysqlDbInner {

src/db/spanner/batch.rs

@@ -3,7 +3,7 @@ use std::{
     str::FromStr,
 };
 
-use googleapis_raw::spanner::v1::type_pb::{StructType, Type, TypeCode};
+use google_cloud_rust_raw::spanner::v1::type_pb::{StructType, Type, TypeCode};
 use protobuf::{
     well_known_types::{ListValue, Value},
     RepeatedField,

src/db/spanner/macros.rs

@@ -20,7 +20,7 @@ macro_rules! params {
 #[test]
 fn test_params_macro() {
     use crate::db::spanner::support::ToSpannerValue;
-    use googleapis_raw::spanner::v1::type_pb::{Type, TypeCode};
+    use google_cloud_rust_raw::spanner::v1::type_pb::{Type, TypeCode};
     use protobuf::{
         well_known_types::{ListValue, Value},
         RepeatedField,

src/db/spanner/manager/session.rs

@@ -1,5 +1,5 @@
 use actix_web::web::block;
-use googleapis_raw::spanner::v1::{
+use google_cloud_rust_raw::spanner::v1::{
     spanner::{CreateSessionRequest, GetSessionRequest, Session},
     spanner_grpc::SpannerClient,
 };

src/db/spanner/models.rs

@@ -8,7 +8,7 @@ use std::{
 };
 
 use futures::future::TryFutureExt;
-use googleapis_raw::spanner::v1::{
+use google_cloud_rust_raw::spanner::v1::{
     mutation::{Mutation, Mutation_Write},
     spanner::{BeginTransactionRequest, CommitRequest, ExecuteSqlRequest, RollbackRequest},
     transaction::{

src/db/spanner/support.rs

@@ -5,7 +5,7 @@ use std::{
 };
 
 use futures::stream::{StreamExt, StreamFuture};
-use googleapis_raw::spanner::v1::{
+use google_cloud_rust_raw::spanner::v1::{
     result_set::{PartialResultSet, ResultSetMetadata, ResultSetStats},
     spanner::ExecuteSqlRequest,
     type_pb::{StructType_Field, Type, TypeCode},

src/db/tests/db.rs

@@ -870,7 +870,7 @@ async fn get_bsos() -> Result<()> {
             uid,
             coll,
             // XXX: to_string?
-            &format!("b{}", revi.to_string()),
+            &format!("b{}", revi),
             Some("Hello"),
             Some(*sortindex),
             None,

src/db/util.rs

@@ -84,7 +84,7 @@ impl SyncTimestamp {
     /// string such as 1996-12-19T16:39:57-08:00
     pub fn from_rfc3339(val: &str) -> Result<Self, DbError> {
         let dt = DateTime::parse_from_rfc3339(val)
-            .map_err(|e| DbErrorKind::Integrity(format!("Invalid TIMESTAMP {}", e.to_string())))?;
+            .map_err(|e| DbErrorKind::Integrity(format!("Invalid TIMESTAMP {}", e)))?;
         Self::from_datetime(dt)
     }
 

src/tokenserver/db/models.rs

@@ -44,6 +44,7 @@ pub struct TokenserverDb {
 /// Despite the db conn structs being !Sync (see Arc<MysqlDbInner> above) we
 /// don't spawn multiple MysqlDb calls at a time in the thread pool. Calls are
 /// queued to the thread pool via Futures, naturally serialized.
+#[allow(clippy::non_send_fields_in_send_ty)]
 unsafe impl Send for TokenserverDb {}
 
 pub struct DbInner {