From 3331d2d87dbae52e1cac98b56f7116b46349b776 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Tue, 4 Mar 2025 12:58:23 -0800
Subject: [PATCH] chore: update to rust 1.85 (#242609)

---
 build/azure-pipelines/cli/install-rust-posix.yml | 2 +-
 build/azure-pipelines/cli/install-rust-win32.yml | 2 +-
 cli/src/auth.rs                                  | 4 ++--
 cli/src/log.rs                                   | 2 +-
 cli/src/tunnels/singleton_server.rs              | 2 +-
 cli/src/util/io.rs                               | 3 +++
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/build/azure-pipelines/cli/install-rust-posix.yml b/build/azure-pipelines/cli/install-rust-posix.yml
index fee56e028f7..0607cde33e5 100644
--- a/build/azure-pipelines/cli/install-rust-posix.yml
+++ b/build/azure-pipelines/cli/install-rust-posix.yml
@@ -1,7 +1,7 @@
 parameters:
   - name: channel
     type: string
-    default: 1.81
+    default: 1.85
   - name: targets
     default: []
     type: object
diff --git a/build/azure-pipelines/cli/install-rust-win32.yml b/build/azure-pipelines/cli/install-rust-win32.yml
index 45a1cfd188e..bff114fccd0 100644
--- a/build/azure-pipelines/cli/install-rust-win32.yml
+++ b/build/azure-pipelines/cli/install-rust-win32.yml
@@ -1,7 +1,7 @@
 parameters:
   - name: channel
     type: string
-    default: 1.81
+    default: 1.85
   - name: targets
     default: []
     type: object
diff --git a/cli/src/auth.rs b/cli/src/auth.rs
index 9116e48339f..d4d62a8bf10 100644
--- a/cli/src/auth.rs
+++ b/cli/src/auth.rs
@@ -665,12 +665,12 @@ impl Auth {
 			.into();
 		}
 
-		return StatusError {
+		StatusError {
 			body: String::from_utf8_lossy(&body).to_string(),
 			status_code,
 			url: url.to_string(),
 		}
-		.into();
+		.into()
 	}
 	/// Implements the device code flow, returning the credentials upon success.
 	async fn do_device_code_flow(&self) -> Result<StoredCredential, AnyError> {
diff --git a/cli/src/log.rs b/cli/src/log.rs
index 538827ed124..f58f49b2176 100644
--- a/cli/src/log.rs
+++ b/cli/src/log.rs
@@ -282,7 +282,7 @@ pub struct DownloadLogger<'a> {
 	logger: &'a Logger,
 }
 
-impl<'a> crate::util::io::ReportCopyProgress for DownloadLogger<'a> {
+impl crate::util::io::ReportCopyProgress for DownloadLogger<'_> {
 	fn report_progress(&mut self, bytes_so_far: u64, total_bytes: u64) {
 		if total_bytes > 0 {
 			self.logger.emit(
diff --git a/cli/src/tunnels/singleton_server.rs b/cli/src/tunnels/singleton_server.rs
index 7fbd00d04d3..f183f935ce3 100644
--- a/cli/src/tunnels/singleton_server.rs
+++ b/cli/src/tunnels/singleton_server.rs
@@ -142,7 +142,7 @@ pub fn make_singleton_server(
 	}
 }
 
-pub async fn start_singleton_server<'a>(
+pub async fn start_singleton_server(
 	args: SingletonServerArgs<'_>,
 ) -> Result<ServerTermination, AnyError> {
 	let shutdown_rx = ShutdownRequest::create_rx([
diff --git a/cli/src/util/io.rs b/cli/src/util/io.rs
index c5816ae55ad..4b8118a219f 100644
--- a/cli/src/util/io.rs
+++ b/cli/src/util/io.rs
@@ -235,6 +235,7 @@ mod tests {
 			.write(true)
 			.read(true)
 			.create(true)
+			.truncate(true)
 			.open(&file_path)
 			.unwrap();
 
@@ -271,6 +272,7 @@ mod tests {
 			.write(true)
 			.read(true)
 			.create(true)
+			.truncate(true)
 			.open(&file_path)
 			.unwrap();
 
@@ -305,6 +307,7 @@ mod tests {
 			.write(true)
 			.read(true)
 			.create(true)
+			.truncate(true)
 			.open(&file_path)
 			.unwrap();
 		let mut rng = rand::thread_rng();