From b95e549acbf2bb31c385eb50f60016da0f54e253 Mon Sep 17 00:00:00 2001
From: Ethan Donowitz <8703826+ethowitz@users.noreply.github.com>
Date: Fri, 18 Nov 2022 17:25:39 -0500
Subject: [PATCH] chore: upgrade to Rust 1.65 (#1441)

---
 .circleci/config.yml               | 4 ++--
 Dockerfile                         | 2 +-
 syncserver/src/db/tests/support.rs | 2 +-
 syncserver/src/server/test.rs      | 2 +-
 syncserver/src/tokenserver/mod.rs  | 2 +-
 syncserver/src/web/auth.rs         | 2 +-
 syncserver/src/web/extractors.rs   | 2 +-
 tokenserver-common/src/error.rs    | 6 +++---
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e36dce71..87a95b66 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -160,7 +160,7 @@ commands:
 jobs:
   checks:
     docker:
-      - image: cimg/rust:1.64.0
+      - image: cimg/rust:1.65.0
         auth:
           username: $DOCKER_USER
           password: $DOCKER_PASS
@@ -176,7 +176,7 @@ jobs:
 
   build-and-test:
     docker:
-      - image: cimg/rust:1.64.0
+      - image: cimg/rust:1.65.0
         auth:
           username: $DOCKER_USER
           password: $DOCKER_PASS
diff --git a/Dockerfile b/Dockerfile
index 4d5950c3..750f882b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.64-buster as builder
+FROM rust:1.65-buster as builder
 WORKDIR /app
 ADD . /app
 ENV PATH=$PATH:/root/.cargo/bin
diff --git a/syncserver/src/db/tests/support.rs b/syncserver/src/db/tests/support.rs
index 61f1f79d..9590d7fa 100644
--- a/syncserver/src/db/tests/support.rs
+++ b/syncserver/src/db/tests/support.rs
@@ -75,7 +75,7 @@ pub fn postbso(
 ) -> params::PostCollectionBso {
     params::PostCollectionBso {
         id: bid.to_owned(),
-        payload: payload.map(&str::to_owned),
+        payload: payload.map(str::to_owned),
         sortindex,
         ttl,
     }
diff --git a/syncserver/src/server/test.rs b/syncserver/src/server/test.rs
index 6e78187b..6378e586 100644
--- a/syncserver/src/server/test.rs
+++ b/syncserver/src/server/test.rs
@@ -172,7 +172,7 @@ fn create_hawk_header(method: &str, port: u16, path: &str) -> String {
         &SECRETS.master_secret,
     )
     .expect("hkdf_expand_32 failed in create_hawk_header");
-    let token_secret = base64::encode_config(&token_secret, base64::URL_SAFE);
+    let token_secret = base64::encode_config(token_secret, base64::URL_SAFE);
     let request = RequestBuilder::new(method, host, port, path).request();
     let credentials = Credentials {
         id,
diff --git a/syncserver/src/tokenserver/mod.rs b/syncserver/src/tokenserver/mod.rs
index b651acc9..52cb27fd 100644
--- a/syncserver/src/tokenserver/mod.rs
+++ b/syncserver/src/tokenserver/mod.rs
@@ -120,7 +120,7 @@ impl From<&RequestHead> for LogItems {
                 items.insert_if_not_empty("ua.os.family", metrics_os);
                 items.insert_if_not_empty("ua.browser.family", metrics_browser);
                 items.insert_if_not_empty("ua.name", ua_result.name);
-                items.insert_if_not_empty("ua.os.ver", &ua_result.os_version.to_owned());
+                items.insert_if_not_empty("ua.os.ver", &ua_result.os_version);
                 items.insert_if_not_empty("ua.browser.ver", ua_result.version);
                 items.insert_if_not_empty("ua", ua_result.version);
             }
diff --git a/syncserver/src/web/auth.rs b/syncserver/src/web/auth.rs
index 12523ea8..958698ad 100644
--- a/syncserver/src/web/auth.rs
+++ b/syncserver/src/web/auth.rs
@@ -90,7 +90,7 @@ impl HawkPayload {
             &secrets.master_secret,
         )
         .map_err(|e| ApiErrorKind::Internal(format!("HKDF Error: {:?}", e)))?;
-        let token_secret = base64::encode_config(&token_secret, base64::URL_SAFE);
+        let token_secret = base64::encode_config(token_secret, base64::URL_SAFE);
 
         let request = RequestBuilder::new(method, host, port, path).request();
 
diff --git a/syncserver/src/web/extractors.rs b/syncserver/src/web/extractors.rs
index bf3ab47a..5bb2d2c7 100644
--- a/syncserver/src/web/extractors.rs
+++ b/syncserver/src/web/extractors.rs
@@ -1830,7 +1830,7 @@ mod tests {
             &SECRETS.master_secret,
         )
         .unwrap();
-        let token_secret = base64::encode_config(&token_secret, base64::URL_SAFE);
+        let token_secret = base64::encode_config(token_secret, base64::URL_SAFE);
         let credentials = Credentials {
             id,
             key: Key::new(token_secret.as_bytes(), hawk::DigestAlgorithm::Sha256).unwrap(),
diff --git a/tokenserver-common/src/error.rs b/tokenserver-common/src/error.rs
index 3e54cb7c..cab5ce00 100644
--- a/tokenserver-common/src/error.rs
+++ b/tokenserver-common/src/error.rs
@@ -19,7 +19,7 @@ pub struct TokenserverError {
     /// For internal use only. Used to report any additional context behind an error to
     /// distinguish between similar errors in Sentry.
     pub context: String,
-    pub backtrace: Backtrace,
+    pub backtrace: Box<Backtrace>,
     pub token_type: TokenType,
 }
 
@@ -59,7 +59,7 @@ impl Default for TokenserverError {
             description: "Unauthorized".to_owned(),
             http_status: StatusCode::UNAUTHORIZED,
             context: "Unauthorized".to_owned(),
-            backtrace: Backtrace::new(),
+            backtrace: Box::new(Backtrace::new()),
             token_type: TokenType::Oauth,
         }
     }
@@ -254,7 +254,7 @@ impl From<DbError> for TokenserverError {
         TokenserverError {
             description: db_error.to_string(),
             context: db_error.to_string(),
-            backtrace: db_error.backtrace,
+            backtrace: Box::new(db_error.backtrace),
             http_status: if db_error.status.is_server_error() {
                 // Use the status code from the DbError if it already suggests an internal error;
                 // it might be more specific than `StatusCode::SERVICE_UNAVAILABLE`