Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-09-21 06:51:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Allow to pass slices of owned strings to trace_if_enabled

Browse source
This commit is contained in:
Johannes Altmanninger 2023-04-22 20:10:08 +02:00
parent 05ec1039ed
commit 1bffa823d8
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fish-rust/src/trace.rs
View file

@ -49,7 +49,7 @@ fn trace_argv_ffi(parser: &parser_t, command: wcharz_t, args: &wcstring_list_ffi
trace_argv(parser, command.as_utfstr(), &args_ref);
}
pub fn trace_argv(parser: &parser_t, command: &wstr, args: &[&wstr]) {
pub fn trace_argv<S: AsRef<wstr>>(parser: &parser_t, command: &wstr, args: &[S]) {
// Format into a string to prevent interleaving with flog in other threads.
// Add the + prefix.
let mut trace_text = L!("-").repeat(parser.blocks_size() - 1);
@ -61,14 +61,14 @@ pub fn trace_argv(parser: &parser_t, command: &wstr, args: &[&wstr]) {
}
for arg in args {
trace_text.push(' ');
trace_text.push_utfstr(&escape(arg));
trace_text.push_utfstr(&escape(arg.as_ref()));
}
trace_text.push('\n');
ffi::log_extra_to_flog_file(&trace_text.to_ffi());
}
/// Convenience helper to trace a single string if tracing is enabled.
pub fn trace_if_enabled(parser: &parser_t, command: &wstr, args: &[&wstr]) {
pub fn trace_if_enabled<S: AsRef<wstr>>(parser: &parser_t, command: &wstr, args: &[S]) {
if trace_enabled(parser) {
trace_argv(parser, command, args);
}