From b1b9e62d571dc928b95e7de086a98cb8a4b00400 Mon Sep 17 00:00:00 2001
From: Isaiah Becker-Mayer <isaiah@goteleport.com>
Date: Thu, 28 Mar 2024 13:11:17 -0500
Subject: [PATCH 1/3] Updates `RUST_VERSION` to the latest stable (1.77.0)

---
 build.assets/versions.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.assets/versions.mk b/build.assets/versions.mk
index 4b82a250fa8f8..fee039c813ded 100644
--- a/build.assets/versions.mk
+++ b/build.assets/versions.mk
@@ -7,7 +7,7 @@ GOLANGCI_LINT_VERSION ?= v1.57.1
 NODE_VERSION ?= 20.11.1
 
 # Run lint-rust check locally before merging code after you bump this.
-RUST_VERSION ?= 1.71.1
+RUST_VERSION ?= 1.77.0
 LIBBPF_VERSION ?= 1.2.2
 LIBPCSCLITE_VERSION ?= 1.9.9-teleport
 

From d75ce5c6bf3d8ad69aac22f68c3272e12c4ad453 Mon Sep 17 00:00:00 2001
From: Isaiah Becker-Mayer <isaiah@goteleport.com>
Date: Thu, 28 Mar 2024 17:08:31 -0500
Subject: [PATCH 2/3] Fixes linting errors

---
 lib/srv/desktop/rdp/rdpclient/src/lib.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/srv/desktop/rdp/rdpclient/src/lib.rs b/lib/srv/desktop/rdp/rdpclient/src/lib.rs
index 3b9d26e3cc823..d3e30365266db 100644
--- a/lib/srv/desktop/rdp/rdpclient/src/lib.rs
+++ b/lib/srv/desktop/rdp/rdpclient/src/lib.rs
@@ -203,6 +203,7 @@ pub unsafe extern "C" fn connect_rdp(go_ref: usize, params: CGOConnectParams) ->
 }
 
 #[derive(Debug)]
+#[allow(dead_code)] // Tcp and Rdp variants are considered "dead code", but we want them for debug logging.
 enum ConnectError {
     Tcp(IoError),
     Rdp(RdpError),
@@ -613,6 +614,10 @@ fn connect_rdp_inner(go_ref: usize, params: ConnectParams) -> Result<Client, Con
     shared_tcp.tcp.set_read_timeout(None)?;
 
     Ok(Client {
+        // Any `arc_with_non_send_sync` is generally a bad idea, but the system is stable
+        // and will be deprecated over the course of the next few months as we transition
+        // all supported versions to `IronRDP`.
+        #[allow(clippy::arc_with_non_send_sync)]
         rdp_client: Arc::new(Mutex::new(rdp_client)),
         tcp_fd,
         go_ref,

From 442c98b4de1d08701ea2cca612103720f40d4ece Mon Sep 17 00:00:00 2001
From: Isaiah Becker-Mayer <isaiah@goteleport.com>
Date: Mon, 15 Apr 2024 12:56:02 -0700
Subject: [PATCH 3/3] Comment out #[allow(clippy::arc_with_non_send_sync)]

This is a temporary hack to get CI to pass. It is necessary for the
RUST_VERSION which we are updating to (1.77.0), however CI is still
using an image with the previous version 1.71.1. Meanwhile `arc_with_non_send_sync`
was added in 1.72.0 (https://rust-lang.github.io/rust-clippy/master/index.html#/arc_with_non_send_sync).

The PR with this commit will therefore require a follow up PR to uncomment
the line once the CI image is updated.
---
 lib/srv/desktop/rdp/rdpclient/src/lib.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/srv/desktop/rdp/rdpclient/src/lib.rs b/lib/srv/desktop/rdp/rdpclient/src/lib.rs
index d3e30365266db..f23cece78dd90 100644
--- a/lib/srv/desktop/rdp/rdpclient/src/lib.rs
+++ b/lib/srv/desktop/rdp/rdpclient/src/lib.rs
@@ -617,7 +617,8 @@ fn connect_rdp_inner(go_ref: usize, params: ConnectParams) -> Result<Client, Con
         // Any `arc_with_non_send_sync` is generally a bad idea, but the system is stable
         // and will be deprecated over the course of the next few months as we transition
         // all supported versions to `IronRDP`.
-        #[allow(clippy::arc_with_non_send_sync)]
+        // TODO(isaiah): Temporary hack to pass CI when updating RUST_VERSION; uncomment the following line once merged:
+        // #[allow(clippy::arc_with_non_send_sync)]
         rdp_client: Arc::new(Mutex::new(rdp_client)),
         tcp_fd,
         go_ref,