From 7aa0776abde7f203cbe3307f3deb02f317eea53e Mon Sep 17 00:00:00 2001 From: bjorn3 <17426603+bjorn3@users.noreply.github.com> Date: Wed, 3 Dec 2025 22:02:20 +0100 Subject: [PATCH] Rustfmt --- audiod/src/main.rs | 3 ++- drivers/acpid/src/acpi.rs | 7 +++++-- drivers/acpid/src/aml_physmem.rs | 25 ++++++++++++++----------- drivers/common/src/lib.rs | 2 +- drivers/graphics/fbcond/src/main.rs | 2 +- drivers/hwd/src/main.rs | 8 +++++--- drivers/input/usbhidd/src/main.rs | 2 +- drivers/pcid/src/scheme.rs | 8 +++++--- ptyd/src/main.rs | 18 ++++++++++++++---- ptyd/src/pgrp.rs | 11 +++++++++-- ptyd/src/scheme.rs | 21 ++++++++++++++++++--- 11 files changed, 75 insertions(+), 32 deletions(-) diff --git a/audiod/src/main.rs b/audiod/src/main.rs index cc9aa90025..2aeda1c817 100644 --- a/audiod/src/main.rs +++ b/audiod/src/main.rs @@ -60,7 +60,8 @@ fn daemon(daemon: Daemon) -> anyhow::Result<()> { let ns = libredox::call::mkns(&[ //IoSlice::new(b"memory"), TODO: already included, uncommenting gives EEXIST IoSlice::new(b"rand"), // for HashMap - ]).context("failed to make namespace")?; + ]) + .context("failed to make namespace")?; libredox::call::setrens(ns, ns).context("failed to set namespace")?; // Spawn a thread to mix and send audio data diff --git a/drivers/acpid/src/acpi.rs b/drivers/acpid/src/acpi.rs index fc156fff96..1fc034c0fd 100644 --- a/drivers/acpid/src/acpi.rs +++ b/drivers/acpid/src/acpi.rs @@ -262,7 +262,8 @@ impl AmlSymbols { let handler = AmlPhysMemHandler::new(Arc::clone(&self.page_cache)); //TODO: use these parsed tables for the rest of acpid let rsdp_address = usize::from_str_radix(&std::env::var("RSDP_ADDR")?, 16)?; - let tables = unsafe { AcpiTables::from_rsdp(handler.clone(), rsdp_address).map_err(format_err)? }; + let tables = + unsafe { AcpiTables::from_rsdp(handler.clone(), rsdp_address).map_err(format_err)? }; let platform = AcpiPlatform::new(tables, handler).map_err(format_err)?; let interpreter = Interpreter::new_from_platform(&platform).map_err(format_err)?; self.aml_context = Some(interpreter); @@ -279,7 +280,9 @@ impl AmlSymbols { } } } - self.aml_context.as_mut().expect("AML context not initialized") + self.aml_context + .as_mut() + .expect("AML context not initialized") } pub fn symbols_cache(&self) -> &FxHashMap { diff --git a/drivers/acpid/src/aml_physmem.rs b/drivers/acpid/src/aml_physmem.rs index 631c6f7583..15dfa25b16 100644 --- a/drivers/acpid/src/aml_physmem.rs +++ b/drivers/acpid/src/aml_physmem.rs @@ -152,14 +152,14 @@ impl AmlPhysMemHandler { match libredox::Fd::open( "/scheme/pci/access", libredox::flag::O_RDWR | libredox::flag::O_CLOEXEC, - 0 + 0, ) { Ok(fd) => Some(fd), Err(err) => { log::error!("failed to open /scheme/pci/access: {}", err); None } - } + }, ); Self { page_cache, pci_fd } } @@ -172,11 +172,11 @@ impl AmlPhysMemHandler { // Offset: u16, 12 bits, 4096 total, at 0 bits [ kind.into(), - (u64::from(addr.segment()) << 28) | - (u64::from(addr.bus()) << 20) | - (u64::from(addr.device()) << 15) | - (u64::from(addr.function()) << 12) | - u64::from(off) + (u64::from(addr.segment()) << 28) + | (u64::from(addr.bus()) << 20) + | (u64::from(addr.device()) << 15) + | (u64::from(addr.function()) << 12) + | u64::from(off), ] } @@ -184,13 +184,16 @@ impl AmlPhysMemHandler { let metadata = Self::pci_call_metadata(1, addr, off); match &*self.pci_fd { Some(pci_fd) => match pci_fd.call_ro(value, syscall::CallFlags::empty(), &metadata) { - Ok(_) => {}, + Ok(_) => {} Err(err) => { log::error!("read pci {addr}@{off:04X}:{:02X}: {}", value.len(), err); } }, None => { - log::error!("read pci {addr}@{off:04X}:{:02X}: pci access not available", value.len()); + log::error!( + "read pci {addr}@{off:04X}:{:02X}: pci access not available", + value.len() + ); } } } @@ -199,11 +202,11 @@ impl AmlPhysMemHandler { let metadata = Self::pci_call_metadata(2, addr, off); match &*self.pci_fd { Some(pci_fd) => match pci_fd.call_wo(value, syscall::CallFlags::empty(), &metadata) { - Ok(_) => {}, + Ok(_) => {} Err(err) => { log::error!("write pci {addr}@{off:04X}={value:02X?}: {}", err); } - } + }, None => { log::error!("write pci {addr}@{off:04X}={value:02X?}: pci access not available"); } diff --git a/drivers/common/src/lib.rs b/drivers/common/src/lib.rs index 275caec413..9a10dcc798 100644 --- a/drivers/common/src/lib.rs +++ b/drivers/common/src/lib.rs @@ -19,7 +19,7 @@ pub mod sgl; /// Low latency timeout for driver loops pub mod timeout; -pub use logger::{output_level, file_level, setup_logging}; +pub use logger::{file_level, output_level, setup_logging}; /// Specifies the write behavior for a specific region of memory /// diff --git a/drivers/graphics/fbcond/src/main.rs b/drivers/graphics/fbcond/src/main.rs index d33f89c86a..ad0c88016a 100644 --- a/drivers/graphics/fbcond/src/main.rs +++ b/drivers/graphics/fbcond/src/main.rs @@ -23,7 +23,7 @@ fn main() { "fbcond", "fbcond", common::output_level(), - common::file_level() + common::file_level(), ); daemon::Daemon::new(|daemon| inner(daemon, &vt_ids)); diff --git a/drivers/hwd/src/main.rs b/drivers/hwd/src/main.rs index 200ec15aef..ab07522ccb 100644 --- a/drivers/hwd/src/main.rs +++ b/drivers/hwd/src/main.rs @@ -39,9 +39,11 @@ fn daemon(daemon: daemon::Daemon) -> ! { // Must launch after acpid but before probe calls /scheme/acpi/symbols match process::Command::new("pcid").spawn() { Ok(mut child) => match child.wait() { - Ok(status) => if !status.success() { - log::error!("pcid exited with status {}", status); - }, + Ok(status) => { + if !status.success() { + log::error!("pcid exited with status {}", status); + } + } Err(err) => { log::error!("failed to wait for pcid: {}", err); } diff --git a/drivers/input/usbhidd/src/main.rs b/drivers/input/usbhidd/src/main.rs index efc763399d..8b5d5e8c2c 100644 --- a/drivers/input/usbhidd/src/main.rs +++ b/drivers/input/usbhidd/src/main.rs @@ -182,7 +182,7 @@ fn main() { .expect(USAGE) .parse::() .expect("Expected integer as input of interface"); - + let name = format!("{}_{}_{}_hid", scheme, port, interface_num); common::setup_logging( "usb", diff --git a/drivers/pcid/src/scheme.rs b/drivers/pcid/src/scheme.rs index 2c6fb65d19..59a96edf49 100644 --- a/drivers/pcid/src/scheme.rs +++ b/drivers/pcid/src/scheme.rs @@ -134,7 +134,7 @@ impl SchemeSync for PciScheme { addr: _, ref mut st, } => Self::read_channel(st, buf), - _ => Err(Error::new(EBADF)) + _ => Err(Error::new(EBADF)), } } fn getdents<'buf>( @@ -232,7 +232,7 @@ impl SchemeSync for PciScheme { ((value >> 15) & 0x1F) as u8, ((value >> 12) & 0x7) as u8, ), - (value & 0xFFF) as u16 + (value & 0xFFF) as u16, ) } None => return Err(Error::new(EINVAL)), @@ -259,7 +259,9 @@ impl SchemeSync for PciScheme { } if write { let value = u32::from_le_bytes(bytes); - unsafe { self.pcie.write(addr, start + i, value); } + unsafe { + self.pcie.write(addr, start + i, value); + } } } Ok(payload.len()) diff --git a/ptyd/src/main.rs b/ptyd/src/main.rs index 5fa232791a..8e38a2de01 100644 --- a/ptyd/src/main.rs +++ b/ptyd/src/main.rs @@ -4,8 +4,8 @@ use libredox::error::Error; use libredox::{flag, Fd}; use redox_scheme::{CallRequest, RequestKind, Response, SignalBehavior, Socket}; -use syscall::EINTR; use syscall::data::TimeSpec; +use syscall::EINTR; mod controlterm; mod pgrp; @@ -106,7 +106,10 @@ fn scan_requests( match request.kind() { RequestKind::Cancellation(req) => { - if let Some(idx) = todo.iter().position(|t| t.request.request().request_id() == req.id) { + if let Some(idx) = todo + .iter() + .position(|t| t.request.request().request_id() == req.id) + { todo[idx].cancelling = true; } } @@ -116,7 +119,10 @@ fn scan_requests( .write_response(response, SignalBehavior::Restart) .expect("pty: failed to write responses to pty scheme"); } else { - todo.push(Todo { request, cancelling: false }); + todo.push(Todo { + request, + cancelling: false, + }); } } _ => (), @@ -134,7 +140,11 @@ fn do_todos(socket: &Socket, scheme: &mut PtyScheme, todo: &mut Vec) { .write_response(response, SignalBehavior::Restart) .expect("pty: failed to write responses to pty scheme"); } else if todo[i].cancelling { - socket.write_response(Response::new(&todo[i].request, Err(Error::new(EINTR).into())), SignalBehavior::Restart) + socket + .write_response( + Response::new(&todo[i].request, Err(Error::new(EINTR).into())), + SignalBehavior::Restart, + ) .expect("pty: failed to write responses to pty scheme"); todo.remove(i); } else { diff --git a/ptyd/src/pgrp.rs b/ptyd/src/pgrp.rs index 87cf06bc7a..2cd785124d 100644 --- a/ptyd/src/pgrp.rs +++ b/ptyd/src/pgrp.rs @@ -44,7 +44,10 @@ impl Resource for PtyPgrp { let pty = pty_lock.borrow(); //println!("READ PGRP {}: {}", pty.id, pty.pgrp); - let dst_buf = buf.get_mut(..4).and_then(|b| <&mut [u8; 4]>::try_from(b).ok()).ok_or(Error::new(EBADF))?; + let dst_buf = buf + .get_mut(..4) + .and_then(|b| <&mut [u8; 4]>::try_from(b).ok()) + .ok_or(Error::new(EBADF))?; *dst_buf = (pty.pgrp as u32).to_ne_bytes(); Ok(Some(4)) @@ -57,7 +60,11 @@ impl Resource for PtyPgrp { if let Some(pty_lock) = self.pty.upgrade() { let mut pty = pty_lock.borrow_mut(); - let new_pgrp = u32::from_ne_bytes(buf.get(..4).and_then(|b| <[u8; 4]>::try_from(b).ok()).ok_or(Error::new(EBADF))?); + let new_pgrp = u32::from_ne_bytes( + buf.get(..4) + .and_then(|b| <[u8; 4]>::try_from(b).ok()) + .ok_or(Error::new(EBADF))?, + ); pty.pgrp = new_pgrp as usize; //println!("WRITE PGRP {}: {} => {}", pty.id, pty.pgrp, new_pgrp); diff --git a/ptyd/src/scheme.rs b/ptyd/src/scheme.rs index 73c2626a58..8a304d5b3c 100644 --- a/ptyd/src/scheme.rs +++ b/ptyd/src/scheme.rs @@ -46,7 +46,10 @@ impl SchemeBlock for PtyScheme { } else { let control_term_id = path.parse::().or(Err(Error::new(EINVAL)))?; let pty = { - let handle = self.handles.get(&control_term_id).ok_or(Error::new(ENOENT))?; + let handle = self + .handles + .get(&control_term_id) + .ok_or(Error::new(ENOENT))?; handle.pty() }; @@ -82,12 +85,24 @@ impl SchemeBlock for PtyScheme { Ok(Some(id)) } - fn read(&mut self, id: usize, buf: &mut [u8], _offset: u64, _fcntl_flags: u32) -> Result> { + fn read( + &mut self, + id: usize, + buf: &mut [u8], + _offset: u64, + _fcntl_flags: u32, + ) -> Result> { let handle = self.handles.get_mut(&id).ok_or(Error::new(EBADF))?; handle.read(buf) } - fn write(&mut self, id: usize, buf: &[u8], _offset: u64, _fcntl_flags: u32) -> Result> { + fn write( + &mut self, + id: usize, + buf: &[u8], + _offset: u64, + _fcntl_flags: u32, + ) -> Result> { let handle = self.handles.get_mut(&id).ok_or(Error::new(EBADF))?; handle.write(buf) }