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.

Sign up for GitHub

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

fix(xtask): run clippy on virtio-mmio configurations #1199

Merged
merged 3 commits into from
May 15, 2024
Merged

fix(xtask): run clippy on virtio-mmio configurations #1199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10682cf
fix(x86_64/mmio): clippy::len_zero
mkroening May 15, 2024
ef53d0b
fix(riscv64): compilation with virtio-mmio
mkroening May 15, 2024
9a61d3d
fix(xtask): run clippy on virtio-mmio configurations
mkroening May 15, 2024
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 src/arch/riscv64/kernel/devicetree.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ pub fn init_drivers() {
if let Ok(VirtioDriver::Network(drv)) =
mmio_virtio::init_device(mmio, irq.try_into().unwrap())
{
mmio::register_driver(MmioDriver::VirtioNet(
register_driver(MmioDriver::VirtioNet(
hermit_sync::InterruptSpinMutex::new(drv),
))
}
Expand Down
2 changes: 1 addition & 1 deletion src/arch/x86_64/kernel/mmio.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ fn guess_device() -> Result<(&'static mut MmioRegisterLayout, u8), &'static str>
fn detect_network() -> Result<(&'static mut MmioRegisterLayout, u8), &'static str> {
let linux_mmio = env::mmio();

if linux_mmio.len() > 0 {
if !linux_mmio.is_empty() {
check_linux_args(linux_mmio)
} else {
guess_device()
Expand Down
4 changes: 4 additions & 0 deletions xtask/src/clippy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ impl Clippy {
cmd!(sh, "cargo clippy --target={triple}")
.arg("--no-default-features")
.run()?;
cmd!(sh, "cargo clippy --target={triple}")
.arg("--no-default-features")
.arg("--features=fs,tcp")
.run()?;
cmd!(sh, "cargo clippy --target={triple}")
.arg("--no-default-features")
.arg("--features=acpi,fsgsbase,pci,smp,vga")
Expand Down