Skip to content

Commit 210adc1

Browse files
committed
fix unit tests under windows
1 parent 43da087 commit 210adc1

File tree

4 files changed

+17
-10
lines changed

4 files changed

+17
-10
lines changed

assets/demo.tape

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Output "assets/lstr-demo.gif"
66
#Set Height 600
77
Set Width 1000
88
Set Height 618
9-
Set FontSize 18
9+
Set FontSize 16
1010
Set TypingSpeed 65ms
1111
Set Theme "Catppuccin Frappe"
1212

assets/lstr-demo.gif

24.1 KB
Loading

src/tui.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -317,11 +317,11 @@ fn scan_directory(
317317
};
318318
let size = if args.size && !is_dir { metadata.as_ref().map(|m| m.len()) } else { None };
319319
let permissions = if args.permissions {
320-
metadata.map(|md| {
320+
metadata.map(|_md| {
321321
#[cfg(unix)]
322322
{
323-
let mode = md.permissions().mode();
324-
let file_type_char = if md.is_dir() { 'd' } else { '-' };
323+
let mode = _md.permissions().mode();
324+
let file_type_char = if _md.is_dir() { 'd' } else { '-' };
325325
format!("{}{}", file_type_char, utils::format_permissions(mode))
326326
}
327327
#[cfg(not(unix))]

src/view.rs

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,18 +110,25 @@ pub fn run(args: &ViewArgs) -> anyhow::Result<()> {
110110

111111
let metadata =
112112
if args.size || args.permissions { entry.metadata().ok() } else { None };
113+
113114
let permissions_str = if args.permissions {
114-
let mut perms_string = "----------".to_string();
115-
if let Some(md) = &metadata {
115+
let perms = if let Some(md) = &metadata {
116116
#[cfg(unix)]
117117
{
118118
let mode = md.permissions().mode();
119119
let file_type_char = if md.is_dir() { 'd' } else { '-' };
120-
perms_string =
121-
format!("{}{}", file_type_char, utils::format_permissions(mode));
120+
format!("{}{}", file_type_char, utils::format_permissions(mode))
122121
}
123-
}
124-
format!("{} ", perms_string)
122+
#[cfg(not(unix))]
123+
{
124+
// Explicitly ignore md on non-unix platforms to satisfy clippy
125+
let _ = md;
126+
"----------".to_string()
127+
}
128+
} else {
129+
"----------".to_string()
130+
};
131+
format!("{} ", perms)
125132
} else {
126133
String::new()
127134
};

0 commit comments

Comments
 (0)