From d9b69c68f9ee0fdbcaec4b9ba31198799df5ff22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20CORTIER?= Date: Sun, 3 Nov 2024 05:12:53 -0500 Subject: [PATCH] build: enable unused_crate_dependencies lint All reported cases were actually unused dependencies. --- Cargo.lock | 6 ------ Cargo.toml | 2 +- crates/ironrdp-ainput/Cargo.toml | 6 ++---- crates/ironrdp-cliprdr-format/Cargo.toml | 5 ++--- crates/ironrdp-cliprdr-native/Cargo.toml | 3 +-- crates/ironrdp-graphics/Cargo.toml | 1 - crates/ironrdp-rdpdr-native/Cargo.toml | 1 - crates/ironrdp-rdpsnd-native/src/lib.rs | 3 +++ crates/ironrdp-testsuite-core/src/lib.rs | 1 + crates/ironrdp-testsuite-core/tests/main.rs | 3 +-- crates/ironrdp/src/lib.rs | 6 ++++++ crates/now-proto-pdu/Cargo.toml | 3 +-- ffi/Cargo.toml | 3 --- fuzz/Cargo.lock | 4 +--- 14 files changed, 19 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7d159b7e..851d2dae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1506,7 +1506,6 @@ dependencies = [ "thiserror", "tracing", "tracing-subscriber", - "windows 0.58.0", ] [[package]] @@ -2309,7 +2308,6 @@ dependencies = [ "bitflags 2.6.0", "ironrdp-core", "ironrdp-dvc", - "ironrdp-pdu", "num-derive", "num-traits", ] @@ -2393,7 +2391,6 @@ name = "ironrdp-cliprdr-format" version = "0.1.0" dependencies = [ "ironrdp-core", - "ironrdp-pdu", "png", "thiserror", ] @@ -2404,7 +2401,6 @@ version = "0.1.0" dependencies = [ "ironrdp-cliprdr", "ironrdp-core", - "ironrdp-svc", "thiserror", "tracing", "windows 0.58.0", @@ -2497,7 +2493,6 @@ dependencies = [ "byteorder", "expect-test", "ironrdp-core", - "ironrdp-error", "ironrdp-pdu", "lazy_static", "num-derive", @@ -3148,7 +3143,6 @@ version = "0.1.0" dependencies = [ "bitflags 2.6.0", "ironrdp-core", - "ironrdp-error", "ironrdp-pdu", ] diff --git a/Cargo.toml b/Cargo.toml index 5f06ce14..5c3ebdf0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -94,7 +94,7 @@ noop_method_call = "warn" # missing_docs = "warn" # TODO: NOTE(@CBenoit): we probably want to ensure this in core tier crates only # == Compile-time / optimization == # -# TODO: unused_crate_dependencies = "warn" +unused_crate_dependencies = "warn" unused_macro_rules = "warn" [workspace.lints.clippy] diff --git a/crates/ironrdp-ainput/Cargo.toml b/crates/ironrdp-ainput/Cargo.toml index cc136776..8dfe3c5e 100644 --- a/crates/ironrdp-ainput/Cargo.toml +++ b/crates/ironrdp-ainput/Cargo.toml @@ -16,13 +16,11 @@ doctest = false test = false [dependencies] -ironrdp-dvc.workspace = true -ironrdp-pdu.workspace = true bitflags.workspace = true - +ironrdp-core.workspace = true +ironrdp-dvc.workspace = true num-derive.workspace = true # TODO: remove num-traits.workspace = true # TODO: remove -ironrdp-core.workspace = true [lints] workspace = true diff --git a/crates/ironrdp-cliprdr-format/Cargo.toml b/crates/ironrdp-cliprdr-format/Cargo.toml index e3362485..c17d7e6e 100644 --- a/crates/ironrdp-cliprdr-format/Cargo.toml +++ b/crates/ironrdp-cliprdr-format/Cargo.toml @@ -17,10 +17,9 @@ doctest = false test = false [dependencies] -ironrdp-pdu.workspace = true -thiserror.workspace = true -png = "0.17" ironrdp-core.workspace = true +thiserror.workspace = true # FIXME: handwrite the Error trait implementations. +png = "0.17" [lints] workspace = true diff --git a/crates/ironrdp-cliprdr-native/Cargo.toml b/crates/ironrdp-cliprdr-native/Cargo.toml index 14d001c9..2b76bf23 100644 --- a/crates/ironrdp-cliprdr-native/Cargo.toml +++ b/crates/ironrdp-cliprdr-native/Cargo.toml @@ -17,9 +17,8 @@ doctest = false test = false [dependencies] -ironrdp-core.workspace = true ironrdp-cliprdr.workspace = true -ironrdp-svc.workspace = true +ironrdp-core.workspace = true tracing.workspace = true [target.'cfg(windows)'.dependencies] diff --git a/crates/ironrdp-graphics/Cargo.toml b/crates/ironrdp-graphics/Cargo.toml index 2cee70b4..53dc755c 100644 --- a/crates/ironrdp-graphics/Cargo.toml +++ b/crates/ironrdp-graphics/Cargo.toml @@ -21,7 +21,6 @@ bitflags.workspace = true bitvec = "1.0" byteorder.workspace = true # TODO: remove ironrdp-core.workspace = true -ironrdp-error.workspace = true ironrdp-pdu = { workspace = true, features = ["std"] } lazy_static.workspace = true # TODO: remove in favor of https://doc.rust-lang.org/std/sync/struct.OnceLock.html num-derive.workspace = true # TODO: remove diff --git a/crates/ironrdp-rdpdr-native/Cargo.toml b/crates/ironrdp-rdpdr-native/Cargo.toml index 9628d493..42ac2e8d 100644 --- a/crates/ironrdp-rdpdr-native/Cargo.toml +++ b/crates/ironrdp-rdpdr-native/Cargo.toml @@ -15,7 +15,6 @@ categories.workspace = true doctest = false test = false - [target.'cfg(any(target_os = "macos", target_os = "linux"))'.dependencies] ironrdp-core.workspace = true ironrdp-pdu.workspace = true diff --git a/crates/ironrdp-rdpsnd-native/src/lib.rs b/crates/ironrdp-rdpsnd-native/src/lib.rs index 41bc07b2..2ffa6dac 100644 --- a/crates/ironrdp-rdpsnd-native/src/lib.rs +++ b/crates/ironrdp-rdpsnd-native/src/lib.rs @@ -3,6 +3,9 @@ html_logo_url = "https://webdevolutions.blob.core.windows.net/images/projects/devolutions/logos/devolutions-icon-shadow.svg" )] +#[cfg(test)] +use tracing_subscriber as _; + #[macro_use] extern crate tracing; diff --git a/crates/ironrdp-testsuite-core/src/lib.rs b/crates/ironrdp-testsuite-core/src/lib.rs index 7f73e006..253ec042 100644 --- a/crates/ironrdp-testsuite-core/src/lib.rs +++ b/crates/ironrdp-testsuite-core/src/lib.rs @@ -4,6 +4,7 @@ #![allow(clippy::cast_possible_truncation)] #![allow(clippy::cast_possible_wrap)] #![allow(clippy::cast_sign_loss)] +#![allow(unused_crate_dependencies)] #[macro_use] extern crate array_concat; diff --git a/crates/ironrdp-testsuite-core/tests/main.rs b/crates/ironrdp-testsuite-core/tests/main.rs index 3f176a3f..d0a24b46 100644 --- a/crates/ironrdp-testsuite-core/tests/main.rs +++ b/crates/ironrdp-testsuite-core/tests/main.rs @@ -17,11 +17,10 @@ mod dvc; mod fuzz_regression; mod graphics; mod input; +mod now_proto; mod pcb; mod pdu; mod rdcleanpath; mod rdpsnd; mod server_name; mod session; - -mod now_proto; diff --git a/crates/ironrdp/src/lib.rs b/crates/ironrdp/src/lib.rs index 9cc50011..43588e20 100644 --- a/crates/ironrdp/src/lib.rs +++ b/crates/ironrdp/src/lib.rs @@ -3,6 +3,12 @@ html_logo_url = "https://webdevolutions.blob.core.windows.net/images/projects/devolutions/logos/devolutions-icon-shadow.svg" )] +#[cfg(test)] +use { + anyhow as _, async_trait as _, bmp as _, ironrdp_blocking as _, ironrdp_cliprdr_native as _, pico_args as _, + rand as _, tokio_rustls as _, tracing as _, tracing_subscriber as _, x509_cert as _, +}; + #[cfg(feature = "acceptor")] pub use ironrdp_acceptor as acceptor; #[cfg(feature = "cliprdr")] diff --git a/crates/now-proto-pdu/Cargo.toml b/crates/now-proto-pdu/Cargo.toml index 502f4484..54a5083e 100644 --- a/crates/now-proto-pdu/Cargo.toml +++ b/crates/now-proto-pdu/Cargo.toml @@ -18,12 +18,11 @@ test = false [dependencies] bitflags = "2" ironrdp-core.workspace = true -ironrdp-error = { path = "../ironrdp-error" } ironrdp-pdu = { path = "../ironrdp-pdu" } [features] default = ["std"] -std = ["ironrdp-error/std", "ironrdp-pdu/std", "ironrdp-core/std"] +std = ["ironrdp-pdu/std", "ironrdp-core/std"] [lints] workspace = true diff --git a/ffi/Cargo.toml b/ffi/Cargo.toml index 7787a828..07e8ea11 100644 --- a/ffi/Cargo.toml +++ b/ffi/Cargo.toml @@ -30,9 +30,6 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] } [target.'cfg(windows)'.build-dependencies] embed-resource = "2.5" -[target.'cfg(windows)'.dependencies] -windows = { workspace = true, features = ["Win32_Foundation"] } - [lints] workspace = true diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock index 71502687..464e60ec 100644 --- a/fuzz/Cargo.lock +++ b/fuzz/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "adler" @@ -288,7 +288,6 @@ name = "ironrdp-cliprdr-format" version = "0.1.0" dependencies = [ "ironrdp-core", - "ironrdp-pdu", "png", "thiserror", ] @@ -359,7 +358,6 @@ dependencies = [ "bitvec", "byteorder", "ironrdp-core", - "ironrdp-error", "ironrdp-pdu", "lazy_static", "num-derive",