From c00c74f3f96f36440733e5007b465452d39212a2 Mon Sep 17 00:00:00 2001 From: salmonik Date: Sat, 1 Aug 2026 02:50:34 +0200 Subject: rustfmt: reflow fat.rs/fs.rs formatting --- rsnix/src/fat.rs | 23 +++++++++++++++++------ rsnix/src/fs.rs | 7 +------ 2 files changed, 18 insertions(+), 12 deletions(-) (limited to 'rsnix') diff --git a/rsnix/src/fat.rs b/rsnix/src/fat.rs index c486dfe..52aa641 100644 --- a/rsnix/src/fat.rs +++ b/rsnix/src/fat.rs @@ -34,8 +34,8 @@ pub struct Entry { } struct Volume { - disk: usize, // AHCI disk index this volume was mounted from - uid: String, // unique mount name: "LABEL-XXXXXXXX" + disk: usize, // AHCI disk index this volume was mounted from + uid: String, // unique mount name: "LABEL-XXXXXXXX" sectors_per_cluster: u8, reserved: u16, fat_count: u8, @@ -56,11 +56,15 @@ pub fn volume_count() -> usize { /// Unique mount name of volume `vol` ("RSDOS-5BD1E55F"). pub fn uid(vol: usize) -> &'static str { - unsafe { VOLS.get(vol) }.map(|v| v.uid.as_str()).unwrap_or("") + unsafe { VOLS.get(vol) } + .map(|v| v.uid.as_str()) + .unwrap_or("") } pub fn root_cluster(vol: usize) -> u32 { - unsafe { VOLS.get(vol) }.map(|v| v.root_cluster).unwrap_or(0) + unsafe { VOLS.get(vol) } + .map(|v| v.root_cluster) + .unwrap_or(0) } /// Point all FAT operations at volume `vol`; also selects the backing @@ -504,7 +508,13 @@ pub fn read_file( Ok(out) } -pub fn write_file(vol: usize, parent_dir_cluster: u32, name: &str, buf: &[u8], pos: u64) -> Result { +pub fn write_file( + vol: usize, + parent_dir_cluster: u32, + name: &str, + buf: &[u8], + pos: u64, +) -> Result { select_vol(vol)?; if buf.is_empty() { return Ok(0); @@ -764,7 +774,8 @@ fn add_dir_entry(parent: u32, name: &str, is_dir: bool, cluster: u32) -> Result< // chunk (highest seq, LAST flag) goes first, and the // head chunk (seq 1) lands immediately before the SFN. let seq = (g + 1) as u8 | if g == groups - 1 { 0x40 } else { 0 }; - let e = &mut buf[(start + groups - 1 - g) * 32..(start + groups - 1 - g) * 32 + 32]; + let e = + &mut buf[(start + groups - 1 - g) * 32..(start + groups - 1 - g) * 32 + 32]; e.fill(0); e[0] = seq; e[11] = 0x0F; diff --git a/rsnix/src/fs.rs b/rsnix/src/fs.rs index 4b76e07..2a1a3e3 100644 --- a/rsnix/src/fs.rs +++ b/rsnix/src/fs.rs @@ -178,12 +178,7 @@ pub fn init() -> (usize, usize) { // Mount every FAT32 volume under /disk// (UID = label-serial). let disks = crate::fat::volume_count(); if disks > 0 { - let disk_dir = add( - "disk", - Some(root), - FileType::Dir, - NodeData::Dir(Vec::new()), - ); + let disk_dir = add("disk", Some(root), FileType::Dir, NodeData::Dir(Vec::new())); for vol in 0..disks { let uid = String::from(crate::fat::uid(vol)); let root_cl = crate::fat::root_cluster(vol); -- cgit v1.2.3