Skip to content

Replace OsStr's .display() with .to_string_lossy() #293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Colecf merged 1 commit into from
Aug 5, 2025
Merged

Replace OsStr's .display() with .to_string_lossy() #293

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions src-rs/regen_dump.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ fn inner(
let files = load_vec_string(fp)?;
if dump_files {
for file in files {
println!("{}", file.display());
println!("{}", file.to_string_lossy());
}
}
}
Expand All @@ -97,7 +97,7 @@ fn inner(
let undefined = load_vec_string(fp)?;
if dump_env {
for var in undefined {
println!("undefined: {}", var.display());
println!("undefined: {}", var.to_string_lossy());
}
}
}
Expand All @@ -107,7 +107,7 @@ fn inner(
let name = load_string(fp)?;
let value = load_string(fp)?;
if dump_env {
println!("{}: {}", name.display(), value.display());
println!("{}: {}", name.to_string_lossy(), value.to_string_lossy());
}
}

Expand All @@ -117,10 +117,10 @@ fn inner(

let files = load_vec_string(fp)?;
if dump_globs {
println!("{}", pat.display());
println!("{}", pat.to_string_lossy());

for s in files {
println!(" {}", s.display());
println!(" {}", s.to_string_lossy());
}
}
}
Expand All @@ -145,46 +145,46 @@ fn inner(

if dump_finds {
println!("cmd type: FIND");
println!(" shell: {}", shell.display());
println!(" shell flagss: {}", shellflag.display());
println!(" loc: {}:{line}", file.display());
println!(" cmd: {}", cmd.display());
println!(" shell: {}", shell.to_string_lossy());
println!(" shell flagss: {}", shellflag.to_string_lossy());
println!(" loc: {}:{line}", file.to_string_lossy());
println!(" cmd: {}", cmd.to_string_lossy());
if !result.is_empty() && result.len() < 500 && !result.as_bytes().contains(&b'\n') {
println!(" output: {}", result.display());
println!(" output: {}", result.to_string_lossy());
} else {
println!(" output: <{} bytes>", result.len());
}
println!(" missing dirs:");
for d in missing_dirs {
println!(" {}", d.display());
println!(" {}", d.to_string_lossy());
}
println!(" files:");
for f in files {
println!(" {}", f.display());
println!(" {}", f.to_string_lossy());
}
println!(" read dirs:");
for d in read_dirs {
println!(" {}", d.display());
println!(" {}", d.to_string_lossy());
}
println!();
}
} else if dump_cmds {
match op {
CommandOp::Shell => {
println!("cmd type: SHELL");
println!(" shell: {}", shell.display());
println!(" shell flagss: {}", shellflag.display());
println!(" shell: {}", shell.to_string_lossy());
println!(" shell flagss: {}", shellflag.to_string_lossy());
}
CommandOp::Read => println!("cmd type: READ"),
CommandOp::ReadMissing => println!("cmd type: READ_MISSING"),
CommandOp::Write => println!("cmd type: WRITE"),
CommandOp::Append => println!("cmd type: APPEND"),
CommandOp::Find => unreachable!(),
}
println!(" loc: {}:{line}", file.display());
println!(" cmd: {}", cmd.display());
println!(" loc: {}:{line}", file.to_string_lossy());
println!(" cmd: {}", cmd.to_string_lossy());
if !result.is_empty() && result.len() < 500 && !result.as_bytes().contains(&b'\n') {
println!(" output: {}", result.display());
println!(" output: {}", result.to_string_lossy());
} else {
println!(" output: <{} bytes>", result.len());
}
Expand Down