From feb3c47bdce4112d998d485375940294f55ab5fc Mon Sep 17 00:00:00 2001 From: Caner Karaca <37447503+CanerKaraca23@users.noreply.github.com> Date: Sat, 29 Mar 2025 22:46:06 +0300 Subject: [PATCH] Fix formatting (#266) --- userspace/ksud_magic/src/sepolicy.rs | 6 +++--- userspace/ksud_magic/src/utils.rs | 2 +- userspace/ksud_overlayfs/src/module.rs | 15 +++++++-------- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/userspace/ksud_magic/src/sepolicy.rs b/userspace/ksud_magic/src/sepolicy.rs index 62dedd42..90350cad 100644 --- a/userspace/ksud_magic/src/sepolicy.rs +++ b/userspace/ksud_magic/src/sepolicy.rs @@ -1,11 +1,11 @@ -use anyhow::{bail, Result}; +use anyhow::{Result, bail}; use derive_new::new; use nom::{ + AsChar, IResult, Parser, branch::alt, - bytes::complete::{tag, take_while, take_while1, take_while_m_n}, + bytes::complete::{tag, take_while, take_while_m_n, take_while1}, character::complete::{space0, space1}, combinator::map, - AsChar, IResult, Parser, }; use std::{ffi, path::Path, vec}; diff --git a/userspace/ksud_magic/src/utils.rs b/userspace/ksud_magic/src/utils.rs index 63b392ef..cbca216a 100644 --- a/userspace/ksud_magic/src/utils.rs +++ b/userspace/ksud_magic/src/utils.rs @@ -1,6 +1,6 @@ use anyhow::{Context, Error, Ok, Result, bail}; use std::{ - fs::{create_dir_all, remove_file, write, File, OpenOptions}, + fs::{File, OpenOptions, create_dir_all, remove_file, write}, io::{ ErrorKind::{AlreadyExists, NotFound}, Write, diff --git a/userspace/ksud_overlayfs/src/module.rs b/userspace/ksud_overlayfs/src/module.rs index fe405c07..e6cbbb18 100644 --- a/userspace/ksud_overlayfs/src/module.rs +++ b/userspace/ksud_overlayfs/src/module.rs @@ -12,8 +12,8 @@ use is_executable::is_executable; use java_properties::PropertiesIter; use log::{info, warn}; -use std::fs::OpenOptions; use std::fs; +use std::fs::OpenOptions; use std::io; use std::{ collections::HashMap, @@ -381,26 +381,25 @@ fn _install_module(zip: &str) -> Result<()> { fn parse_size(size_str: &str) -> io::Result { let size_str = size_str.trim(); if size_str.is_empty() { - return Err(io::Error::new(io::ErrorKind::InvalidData, "Empty size string")); + return Err(io::Error::new( + io::ErrorKind::InvalidData, + "Empty size string", + )); } - let (num, unit) = size_str.split_at(size_str.len().saturating_sub(1)); - let num = u64::from_str(num.trim()).map_err(|_| io::Error::new(io::ErrorKind::InvalidData, "Invalid number"))?; - + let num = u64::from_str(num.trim()) + .map_err(|_| io::Error::new(io::ErrorKind::InvalidData, "Invalid number"))?; let multiplier = match unit.to_ascii_uppercase().as_str() { "G" => 1 << 30, "M" => 1 << 20, "K" => 1 << 10, _ => 1, // Default to bytes if no unit is specified }; - Ok(num * multiplier) } - fn get_sparse_image_size() -> u64 { let default_size = 6 << 30; // 6GB let custom_size_file = "/data/adb/ksu/custom_sparse_size.txt"; - match fs::read_to_string(custom_size_file) { Ok(contents) => match parse_size(&contents) { Ok(size) => size,