self-hosted/teleport
self-hosted/teleport
1
0
Fork 0
mirror of https://github.com/gravitational/teleport synced 2024-10-19 16:53:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to Rust 1.58.1 (#9985)

Browse source 
In Rust 1.58, deriving Debug no longer counts as using a struct's
fields, so we need to allow dead_code for our structs that implement
RDP protocols. (Just because we don't use the fields doesn't mean
we shoudln't decode them)
This commit is contained in:
Zac Bergquist 2022-01-27 19:34:45 -07:00 committed by GitHub
parent ff3c911cac
commit 2aba666dc9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -296,7 +296,7 @@ clean:
rm -rf $(BUILDDIR)
rm -rf $(ER_BPF_BUILDDIR)
rm -rf $(RS_BPF_BUILDDIR)
cargo clean
-cargo clean
-go clean -cache
rm -rf teleport
rm -rf *.gz

2
build.assets/Makefile
View file

@ -17,7 +17,7 @@ TEST_KUBE ?=
OS ?= linux
ARCH ?= amd64
RUNTIME ?= go1.17.2
RUST_VERSION ?= 1.56.1
RUST_VERSION ?= 1.58.1
BORINGCRYPTO_RUNTIME=$(RUNTIME)b7
LIBBPF_VERSION ?= 0.3.1

2
lib/srv/desktop/rdp/rdpclient/src/rdpdr.rs
View file

@ -610,6 +610,7 @@ impl ServerDeviceAnnounceResponse {
}
#[derive(Debug)]
#[allow(dead_code)]
struct DeviceIoRequest {
device_id: u32,
file_id: u32,
@ -670,6 +671,7 @@ enum MinorFunction {
}
#[derive(Debug)]
#[allow(dead_code)]
struct DeviceControlRequest {
header: DeviceIoRequest,
output_buffer_length: u32,

28
lib/srv/desktop/rdp/rdpclient/src/scard.rs
View file

@ -508,7 +508,7 @@ impl RPCETypeHeader {
}
#[derive(Debug)]
#[allow(non_camel_case_types)]
#[allow(non_camel_case_types, dead_code)]
struct ScardAccessStartedEvent_Call {
unused: u32,
}
@ -612,7 +612,7 @@ impl Long_Return {
}
#[derive(Debug)]
#[allow(non_camel_case_types)]
#[allow(non_camel_case_types, dead_code)]
struct EstablishContext_Call {
scope: Scope,
}
@ -731,7 +731,7 @@ fn decode_ptr(payload: &mut Payload, index: &mut u32) -> RdpResult<u32> {
}
#[derive(Debug)]
#[allow(non_camel_case_types)]
#[allow(non_camel_case_types, dead_code)]
struct ListReaders_Call {
context: Context,
groups_length: u32,
@ -903,7 +903,7 @@ impl Context_Call {
}
#[derive(Debug)]
#[allow(non_camel_case_types)]
#[allow(non_camel_case_types, dead_code)]
struct GetStatusChange_Call {
context: Context,
timeout: u32,
@ -1110,7 +1110,7 @@ impl GetStatusChange_Return {
}
#[derive(Debug)]
#[allow(non_camel_case_types)]
#[allow(non_camel_case_types, dead_code)]
struct Connect_Call {
reader: String,
common: Connect_Common,
@ -1143,7 +1143,7 @@ bitflags! {
}
#[derive(Debug)]
#[allow(non_camel_case_types)]
#[allow(non_camel_case_types, dead_code)]
struct Connect_Common {
context: Context,
share_mode: u32,
@ -1251,7 +1251,7 @@ impl Handle {
}
#[derive(Debug)]
#[allow(non_camel_case_types)]
#[allow(non_camel_case_types, dead_code)]
struct HCardAndDisposition_Call {
handle: Handle,
disposition: u32,
@ -1274,7 +1274,7 @@ impl HCardAndDisposition_Call {
}
#[derive(Debug)]
#[allow(non_camel_case_types)]
#[allow(non_camel_case_types, dead_code)]
struct Status_Call {
handle: Handle,
reader_names_is_null: bool,
@ -1373,7 +1373,7 @@ impl Status_Return {
}
#[derive(Debug)]
#[allow(non_camel_case_types)]
#[allow(non_camel_case_types, dead_code)]
struct Transmit_Call {
handle: Handle,
send_pci: SCardIO_Request,
@ -1427,7 +1427,7 @@ impl Transmit_Call {
}
#[derive(Debug)]
#[allow(non_camel_case_types)]
#[allow(non_camel_case_types, dead_code)]
struct SCardIO_Request {
protocol: CardProtocol,
extra_bytes_length: u32,
@ -1486,7 +1486,7 @@ impl Transmit_Return {
}
#[derive(Debug)]
#[allow(non_camel_case_types)]
#[allow(non_camel_case_types, dead_code)]
struct GetDeviceTypeId_Call {
context: Context,
reader_name: String,
@ -1565,7 +1565,7 @@ impl ReadCache_Call {
}
#[derive(Debug)]
#[allow(non_camel_case_types)]
#[allow(non_camel_case_types, dead_code)]
struct ReadCache_Common {
context: Context,
card_uuid: Vec<u8>,
@ -1658,7 +1658,7 @@ impl WriteCache_Call {
}
#[derive(Debug)]
#[allow(non_camel_case_types)]
#[allow(non_camel_case_types, dead_code)]
struct WriteCache_Common {
context: Context,
card_uuid: Vec<u8>,
@ -1696,7 +1696,7 @@ impl WriteCache_Common {
}
#[derive(Debug)]
#[allow(non_camel_case_types)]
#[allow(non_camel_case_types, dead_code)]
struct GetReaderIcon_Call {
context: Context,
reader_name: String,