github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-03-27 14:45:13 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Remove needless use of dynamic dispatch

Browse Source 
We return a plain function, all with matching signatures. No need for dynamic
dispatch here.
This commit is contained in:
Mahmoud Al-Qudsi 2024-05-24 17:30:38 -05:00
parent cd9f5bdbaa
commit 6921394db2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/builtins/path.rs
View File

@ -667,15 +667,15 @@ fn path_sort(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr]) -> Op
return retval; return retval;
} }
let keyfunc: &dyn Fn(&wstr) -> &wstr = match &opts.key { let keyfunc: fn(&wstr) -> &wstr = match &opts.key {
Some(k) if k == "basename" => &wbasename as _, Some(k) if k == "basename" => wbasename,
Some(k) if k == "dirname" => &wdirname as _, Some(k) if k == "dirname" => wdirname,
Some(k) if k == "path" => { Some(k) if k == "path" => {
// Act as if --key hadn't been given. // Act as if --key hadn't been given.
opts.key = None; opts.key = None;
&wbasename as _ wbasename
} }
None => &wbasename as _, None => wbasename,
Some(k) => { Some(k) => {
path_error!(streams, "%ls: Invalid sort key '%ls'\n", args[0], k); path_error!(streams, "%ls: Invalid sort key '%ls'\n", args[0], k);
return STATUS_INVALID_ARGS; return STATUS_INVALID_ARGS;