From 720d59737acaa8a9b280811b274ca9033006cd1d Mon Sep 17 00:00:00 2001
From: Joonas Koivunen <joonas@neon.tech>
Date: Fri, 8 Sep 2023 16:28:41 +0300
Subject: [PATCH] rust-1.72.0 changes (#5255)

Prepare to upgrade rust version to latest stable.

- `rustfmt` has learned to format `let irrefutable = $expr else { ...
};` blocks
- There's a new warning about virtual (workspace) crate resolver, picked
the latest resolver as I suspect everyone would expect it to be the
latest; should not matter anyways
- Some new clippies, which seem alright
---
 Cargo.toml                                          | 1 +
 libs/pq_proto/src/lib.rs                            | 2 +-
 libs/remote_storage/src/s3_bucket.rs                | 2 +-
 pageserver/src/config.rs                            | 4 ++--
 pageserver/src/tenant/storage_layer/remote_layer.rs | 2 +-
 s3_scrubber/src/checks.rs                           | 5 ++++-
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 9e2a32ba52..847865cfe8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
     "compute_tools",
     "control_plane",
diff --git a/libs/pq_proto/src/lib.rs b/libs/pq_proto/src/lib.rs
index 809fa5fffd..47faad363f 100644
--- a/libs/pq_proto/src/lib.rs
+++ b/libs/pq_proto/src/lib.rs
@@ -959,7 +959,7 @@ mod tests {
         let make_params = |options| StartupMessageParams::new([("options", options)]);
 
         let params = StartupMessageParams::new([]);
-        assert!(matches!(params.options_escaped(), None));
+        assert!(params.options_escaped().is_none());
 
         let params = make_params("");
         assert!(split_options(&params).is_empty());
diff --git a/libs/remote_storage/src/s3_bucket.rs b/libs/remote_storage/src/s3_bucket.rs
index 9d05fa32b3..9262f1e88f 100644
--- a/libs/remote_storage/src/s3_bucket.rs
+++ b/libs/remote_storage/src/s3_bucket.rs
@@ -573,7 +573,7 @@ mod tests {
 
     #[test]
     fn relative_path() {
-        let all_paths = vec!["", "some/path", "some/path/"];
+        let all_paths = ["", "some/path", "some/path/"];
         let all_paths: Vec<RemotePath> = all_paths
             .iter()
             .map(|x| RemotePath::new(Path::new(x)).expect("bad path"))
diff --git a/pageserver/src/config.rs b/pageserver/src/config.rs
index 624503a3a5..89ba3b6310 100644
--- a/pageserver/src/config.rs
+++ b/pageserver/src/config.rs
@@ -73,7 +73,7 @@ pub mod defaults {
     /// Default built-in configuration file.
     ///
     pub const DEFAULT_CONFIG_FILE: &str = formatcp!(
-        r###"
+        r#"
 # Initial configuration file created by 'pageserver --init'
 #listen_pg_addr = '{DEFAULT_PG_LISTEN_ADDR}'
 #listen_http_addr = '{DEFAULT_HTTP_LISTEN_ADDR}'
@@ -118,7 +118,7 @@ pub mod defaults {
 
 [remote_storage]
 
-"###
+"#
     );
 }
 
diff --git a/pageserver/src/tenant/storage_layer/remote_layer.rs b/pageserver/src/tenant/storage_layer/remote_layer.rs
index 3f8d700863..3968c16c31 100644
--- a/pageserver/src/tenant/storage_layer/remote_layer.rs
+++ b/pageserver/src/tenant/storage_layer/remote_layer.rs
@@ -74,7 +74,7 @@ impl Layer for RemoteLayer {
         _reconstruct_state: &mut ValueReconstructState,
         _ctx: &RequestContext,
     ) -> Result<ValueReconstructResult> {
-        bail!("layer {self} needs to be downloaded");
+        Err(anyhow::anyhow!("layer {self} needs to be downloaded"))
     }
 }
 
diff --git a/s3_scrubber/src/checks.rs b/s3_scrubber/src/checks.rs
index e86c381985..914681d707 100644
--- a/s3_scrubber/src/checks.rs
+++ b/s3_scrubber/src/checks.rs
@@ -46,7 +46,10 @@ pub async fn validate_pageserver_active_tenant_and_timelines(
             .push(active_branch);
 
         let Some(active_project) = s3_active_projects.get(&active_project_id) else {
-            error!("Branch {:?} for project {:?} has no such project in the active projects", active_branch_id, active_project_id);
+            error!(
+                "Branch {:?} for project {:?} has no such project in the active projects",
+                active_branch_id, active_project_id
+            );
             continue;
         };