Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-28 22:03:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

builtins/history: Remove unnecessary unwrap

Browse source
This commit is contained in:
Fabian Boehm 2024-02-16 19:38:22 +01:00
parent 46afbea72b
commit 0d9c737a47
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/builtins/history.rs
View file

@ -267,20 +267,13 @@ pub fn history(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr]) ->
if opts.hist_cmd == HistCmd::HIST_UNDEF { if opts.hist_cmd == HistCmd::HIST_UNDEF {
opts.hist_cmd = HistCmd::HIST_SEARCH; opts.hist_cmd = HistCmd::HIST_SEARCH;
} }
if opts.search_type.is_none() {
if opts.hist_cmd == HistCmd::HIST_SEARCH {
opts.search_type = Some(history::SearchType::ContainsGlob);
}
if opts.hist_cmd == HistCmd::HIST_DELETE {
opts.search_type = Some(history::SearchType::Exact);
}
}
let mut status = STATUS_CMD_OK; let mut status = STATUS_CMD_OK;
match opts.hist_cmd { match opts.hist_cmd {
HistCmd::HIST_SEARCH => { HistCmd::HIST_SEARCH => {
if !history.search( if !history.search(
opts.search_type.unwrap(), opts.search_type
.unwrap_or(history::SearchType::ContainsGlob),
args, args,
opts.show_time_format.as_deref(), opts.show_time_format.as_deref(),
opts.max_items.unwrap_or(usize::MAX), opts.max_items.unwrap_or(usize::MAX),
@ -297,7 +290,8 @@ pub fn history(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr]) ->
// TODO: Move this code to the history module and support the other search types // TODO: Move this code to the history module and support the other search types
// including case-insensitive matches. At this time we expect the non-exact deletions to // including case-insensitive matches. At this time we expect the non-exact deletions to
// be handled only by the history function's interactive delete feature. // be handled only by the history function's interactive delete feature.
if opts.search_type.unwrap() != history::SearchType::Exact { if opts.search_type.unwrap_or(history::SearchType::Exact) != history::SearchType::Exact
{
streams streams
.err .err
.append(wgettext!("builtin history delete only supports --exact\n")); .append(wgettext!("builtin history delete only supports --exact\n"));