reverted spacing changes

yazi-fm/src/lives/file.rs

@@ -2,27 +2,21 @@ use std::ops::Deref;
 
 use mlua::{AnyUserData, IntoLua, Lua, UserDataFields, UserDataMethods};
 use yazi_config::THEME;
-use yazi_plugin::{
+use yazi_plugin::{bindings::{Cast, Cha, Icon, Range}, elements::Style, url::Url};
-	bindings::{Cast, Cha, Icon, Range},
-	elements::Style,
-	url::Url,
-};
 use yazi_shared::MIME_DIR;
 
 use super::{CtxRef, SCOPE};
 
 pub(super) struct File {
-	idx: usize,
+	idx:    usize,
 	folder: *const yazi_core::folder::Folder,
-	tab: *const yazi_core::tab::Tab,
+	tab:    *const yazi_core::tab::Tab,
 }
 
 impl Deref for File {
 	type Target = yazi_shared::fs::File;
 
-	fn deref(&self) -> &Self::Target {
+	fn deref(&self) -> &Self::Target { &self.folder().files[self.idx] }
-		&self.folder().files[self.idx]
-	}
 }
 
 impl File {
@@ -137,12 +131,8 @@ impl File {
 	}
 
 	#[inline]
-	fn folder(&self) -> &yazi_core::folder::Folder {
+	fn folder(&self) -> &yazi_core::folder::Folder { unsafe { &*self.folder } }
-		unsafe { &*self.folder }
-	}
 
 	#[inline]
-	fn tab(&self) -> &yazi_core::tab::Tab {
+	fn tab(&self) -> &yazi_core::tab::Tab { unsafe { &*self.tab } }
-		unsafe { &*self.tab }
-	}
 }

yazi-shared/src/fs/fns.rs

@@ -1,16 +1,8 @@
-use std::{
+use std::{collections::VecDeque, fs::Metadata, path::{Path, PathBuf}};
-	collections::VecDeque,
-	fs::Metadata,
-	path::{Path, PathBuf},
-};
 
 use anyhow::Result;
 use filetime::{set_file_mtime, FileTime};
-use tokio::{
+use tokio::{fs, io, select, sync::{mpsc, oneshot}, time};
-	fs, io, select,
-	sync::{mpsc, oneshot},
-	time,
-};
 
 pub async fn accessible(path: &Path) -> bool {
 	match fs::symlink_metadata(path).await {
@@ -111,10 +103,7 @@ pub fn copy_with_progress(
 #[cfg(unix)]
 #[allow(clippy::collapsible_else_if)]
 pub fn permissions(m: libc::mode_t) -> String {
-	use libc::{
+	use libc::{S_IFBLK, S_IFCHR, S_IFDIR, S_IFIFO, S_IFLNK, S_IFMT, S_IFSOCK, S_IRGRP, S_IROTH, S_IRUSR, S_ISGID, S_ISUID, S_ISVTX, S_IWGRP, S_IWOTH, S_IWUSR, S_IXGRP, S_IXOTH, S_IXUSR};
-		S_IFBLK, S_IFCHR, S_IFDIR, S_IFIFO, S_IFLNK, S_IFMT, S_IFSOCK, S_IRGRP, S_IROTH, S_IRUSR,
-		S_ISGID, S_ISUID, S_ISVTX, S_IWGRP, S_IWOTH, S_IWUSR, S_IXGRP, S_IXOTH, S_IXUSR,
-	};
 	let mut s = String::with_capacity(10);
 
 	// File type
@@ -132,51 +121,27 @@ pub fn permissions(m: libc::mode_t) -> String {
 	s.push(if m & S_IRUSR != 0 { 'r' } else { '-' });
 	s.push(if m & S_IWUSR != 0 { 'w' } else { '-' });
 	s.push(if m & S_IXUSR != 0 {
-		if m & S_ISUID != 0 {
+		if m & S_ISUID != 0 { 's' } else { 'x' }
-			's'
-		} else {
-			'x'
-		}
 	} else {
-		if m & S_ISUID != 0 {
+		if m & S_ISUID != 0 { 'S' } else { '-' }
-			'S'
-		} else {
-			'-'
-		}
 	});
 
 	// Group
 	s.push(if m & S_IRGRP != 0 { 'r' } else { '-' });
 	s.push(if m & S_IWGRP != 0 { 'w' } else { '-' });
 	s.push(if m & S_IXGRP != 0 {
-		if m & S_ISGID != 0 {
+		if m & S_ISGID != 0 { 's' } else { 'x' }
-			's'
-		} else {
-			'x'
-		}
 	} else {
-		if m & S_ISGID != 0 {
+		if m & S_ISGID != 0 { 'S' } else { '-' }
-			'S'
-		} else {
-			'-'
-		}
 	});
 
 	// Other
 	s.push(if m & S_IROTH != 0 { 'r' } else { '-' });
 	s.push(if m & S_IWOTH != 0 { 'w' } else { '-' });
 	s.push(if m & S_IXOTH != 0 {
-		if m & S_ISVTX != 0 {
+		if m & S_ISVTX != 0 { 't' } else { 'x' }
-			't'
-		} else {
-			'x'
-		}
 	} else {
-		if m & S_ISVTX != 0 {
+		if m & S_ISVTX != 0 { 'T' } else { '-' }
-			'T'
-		} else {
-			'-'
-		}
 	});
 
 	s
@@ -193,9 +158,6 @@ pub fn owner(uid: u32, gid: u32) -> String {
 		None => String::default(),
 	};
 	format!("{username} {groupname}")
-	//users::get_user_by_uid(uid).unwrap().name().to_str().unwrap_or_default().to_string()
-	//+ " "
-	//+ users::get_group_by_gid(gid).unwrap().name().to_str().unwrap_or_default()
 }
 
 // Find the max common root in a list of files