Merge pull request #2341 from hermit-os/workspace-clippy

fix(xtask): Clippy

Author: mkroening

.github/workflows/ci.yml

@@ -40,6 +40,7 @@ jobs:
       - uses: mkroening/rust-toolchain-toml@main
       - run: rustup target add x86_64-unknown-none aarch64-unknown-none-softfloat riscv64gc-unknown-none-elf
       - run: rustup component add clippy
+      - run: cargo clippy --package xtask
       - name: cargo hack clippy (x86_64)
         run: |
           cargo clippy --package hermit-kernel --target x86_64-unknown-none --features tcp,virtio-console,virtio-fs,virtio-net,virtio-vsock

Cargo.toml

@@ -278,34 +278,8 @@ trace = ["net-trace"]
 ## An alias for the `virtio-vsock` feature.
 vsock = ["virtio-vsock"]
 
-[lints.rust]
-rust_2018_idioms = "warn"
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(careful)'] }
-unsafe_op_in_unsafe_fn = "warn"
-
-[lints.clippy]
-borrow_as_ptr = "warn"
-cast_lossless = "warn"
-decimal_literal_representation = "warn"
-default_trait_access = "warn"
-explicit_deref_methods = "warn"
-if_not_else = "warn"
-ignored_unit_patterns = "warn"
-implicit_clone = "warn"
-inconsistent_struct_constructor = "warn"
-manual_assert = "warn"
-manual_let_else = "warn"
-match_same_arms = "warn"
-match_wildcard_for_single_variants = "warn"
-ptr_as_ptr = "warn"
-ptr_cast_constness = "warn"
-ref_as_ptr = "warn"
-ref_option = "warn"
-semicolon_if_nothing_returned = "warn"
-separated_literal_suffix = "warn"
-transmute_ptr_to_ptr = "warn"
-uninlined_format_args = "warn"
-unreadable_literal = "warn"
+[lints]
+workspace = true
 
 [dependencies]
 hermit-macro = { version = "=0.1.0", path = "hermit-macro" }
@@ -410,6 +384,35 @@ exclude = [
 	"hermit-builtins",
 ]
 
+[workspace.lints.rust]
+rust_2018_idioms = "warn"
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(careful)'] }
+unsafe_op_in_unsafe_fn = "warn"
+
+[workspace.lints.clippy]
+borrow_as_ptr = "warn"
+cast_lossless = "warn"
+decimal_literal_representation = "warn"
+default_trait_access = "warn"
+explicit_deref_methods = "warn"
+if_not_else = "warn"
+ignored_unit_patterns = "warn"
+implicit_clone = "warn"
+inconsistent_struct_constructor = "warn"
+manual_assert = "warn"
+manual_let_else = "warn"
+match_same_arms = "warn"
+match_wildcard_for_single_variants = "warn"
+ptr_as_ptr = "warn"
+ptr_cast_constness = "warn"
+ref_as_ptr = "warn"
+ref_option = "warn"
+semicolon_if_nothing_returned = "warn"
+separated_literal_suffix = "warn"
+transmute_ptr_to_ptr = "warn"
+uninlined_format_args = "warn"
+unreadable_literal = "warn"
+
 [patch.crates-io]
 safe-mmio = { git = "https://github.com/hermit-os/safe-mmio", branch = "be" }
 

xtask/Cargo.toml

@@ -19,3 +19,6 @@ ureq = { version = "3", default-features = false, features = ["rustls"], optiona
 vsock = { version = "0.5", optional = true }
 wait-timeout = { version = "0.2", optional = true }
 xshell = "0.2"
+
+[lints]
+workspace = true

xtask/src/build.rs

@@ -112,7 +112,7 @@ impl Build {
 		}
 
 		if self.randomize_layout {
-			rustflags.push("-Zrandomize-layout")
+			rustflags.push("-Zrandomize-layout");
 		}
 
 		rustflags.extend(self.cargo_build.artifact.arch.rustflags());

xtask/src/ci/qemu.rs

@@ -159,7 +159,7 @@ impl Qemu {
 
 		match image_name {
 			"axum-example" | "http_server" | "http_server_poll" | "http_server_select" => {
-				test_http_server(guest_ip)?
+				test_http_server(guest_ip)?;
 			}
 			"httpd" => test_httpd(guest_ip)?,
 			"testudp" => test_testudp(guest_ip)?,
@@ -172,7 +172,7 @@ impl Qemu {
 					.iter()
 					.flat_map(|s| s.split(&[' ', ','][..]))
 					.any(|feature| feature == "client");
-				test_vsock(has_client)?
+				test_vsock(has_client)?;
 			}
 			_ => {}
 		}
@@ -428,10 +428,10 @@ impl Qemu {
 						Device::VirtioFsPci => "vhost-user-fs-pci",
 						_ => unreachable!(),
 					};
-					let default_virtio_features = if !self.no_default_virtio_features {
-						",packed=on"
-					} else {
+					let default_virtio_features = if self.no_default_virtio_features {
 						""
+					} else {
+						",packed=on"
 					};
 					vec![
 						"-chardev".to_owned(),