Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[v13] Update rust to latest stable (1.77.0) #39990

Merged
merged 4 commits into from
Apr 15, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.assets/versions.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 5 additions & 0 deletions lib/srv/desktop/rdp/rdpclient/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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,
Expand Down
Loading