github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-26 19:03:38 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

rust/print_help: simplify use of OsStrings

Browse Source 
See discussion in https://github.com/fish-shell/fish-shell/pull/9818#discussion_r1210829722
This commit is contained in:
David Adam 2023-06-19 21:57:53 +08:00
parent 0cfdc90551
commit 6229f08200
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fish-rust/src/print_help.rs
View File

@ -3,7 +3,6 @@
use libc::c_char; use libc::c_char;
use std::ffi::{CStr, OsStr, OsString}; use std::ffi::{CStr, OsStr, OsString};
use std::os::unix::ffi::OsStrExt;
use std::process::Command; use std::process::Command;
const HELP_ERR: &str = "Could not show help message"; const HELP_ERR: &str = "Could not show help message";
@ -15,7 +14,7 @@ mod ffi2 {
} }
} }
fn print_help(command: &OsStr) { fn print_help(command: &str) {
let mut cmdline = OsString::new(); let mut cmdline = OsString::new();
cmdline.push("__fish_print_help "); cmdline.push("__fish_print_help ");
cmdline.push(command); cmdline.push(command);
@ -28,6 +27,6 @@ fn print_help(command: &OsStr) {
unsafe fn unsafe_print_help(command_buf: *const c_char) { unsafe fn unsafe_print_help(command_buf: *const c_char) {
let command_cstr: &CStr = unsafe { CStr::from_ptr(command_buf) }; let command_cstr: &CStr = unsafe { CStr::from_ptr(command_buf) };
let command = OsStr::from_bytes(command_cstr.to_bytes()); let command = command_cstr.to_str().unwrap();
print_help(command); print_help(command);
} }