h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-12 23:01:16 -03:00
Code Issues Packages Projects Releases Wiki Activity

string: error messages fixes

Browse Source 
- fix wrong pattern used in `string replace` error message
- replace unreachable error with `unreachable!` in `string`
- fix cmd being used in place of subcmd 

Part of #12603
This commit is contained in:
Nahor
2026-04-01 13:18:01 -07:00
committed by Johannes Altmanninger
parent f6a72b4e19
commit 8d92016e72
3 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/builtins/string.rs
View File

@@ -34,11 +34,6 @@ macro_rules! string_error {
}
use string_error;
fn string_unknown_option(parser: &Parser, streams: &mut IoStreams, subcmd: &wstr, opt: &wstr) {
string_error!(streams, BUILTIN_ERR_UNKNOWN, subcmd, opt);
builtin_print_error_trailer(parser, streams.err, L!("string"));
}
trait StringSubCommand<'args> {
const SHORT_OPTIONS: &'static wstr;
const LONG_OPTIONS: &'static [WOption<'static>];
@@ -87,13 +82,19 @@ fn parse_opts(
return Err(STATUS_INVALID_ARGS);
}
'?' => {
string_unknown_option(parser, streams, cmd, args_read[w.wopt_index - 1]);
string_error!(
streams,
BUILTIN_ERR_UNKNOWN,
cmd,
args_read[w.wopt_index - 1]
);
builtin_print_error_trailer(parser, streams.err, L!("string"));
return Err(STATUS_INVALID_ARGS);
}
c => {
let retval = self.parse_opt(cmd, c, w.woptarg);
if let Err(e) = retval {
e.print_error(&args_read, parser, streams, w.woptarg, w.wopt_index);
e.print_error(&args_read, streams, w.woptarg, w.wopt_index);
return Err(e.retval());
}
}
@@ -236,22 +237,26 @@ impl StringError {
fn print_error(
&self,
args: &[&wstr],
parser: &Parser,
streams: &mut IoStreams,
optarg: Option<&wstr>,
optind: usize,
) {
let cmd = args[0];
let subcmd = args[0];
use StringError::*;
match self {
InvalidArgs(msg) => {
streams.err.appendln("string ".chars().chain(msg.chars()));
}
NotANumber => {
string_error!(streams, BUILTIN_ERR_NOT_NUMBER, cmd, optarg.unwrap());
string_error!(streams, BUILTIN_ERR_NOT_NUMBER, subcmd, optarg.unwrap());
}
UnknownOption => {
string_unknown_option(parser, streams, cmd, args[optind - 1]);
// This would mean the subcmd's XXX_OPTIONS does not match
// the list in its `parse_opt()` implementation
unreachable!(
"unexpected option '{}' for 'string {subcmd}'",
args[optind - 1]
)
}
}
}
@@ -368,7 +373,7 @@ pub fn string(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr]) -> B
_ => {
streams
.err
.appendln(&wgettext_fmt!(BUILTIN_ERR_INVALID_SUBCMD, cmd, args[0]));
.appendln(&wgettext_fmt!(BUILTIN_ERR_INVALID_SUBCMD, cmd, subcmd_name));
builtin_print_error_trailer(parser, streams.err, cmd);
Err(STATUS_INVALID_ARGS)
}

2
src/builtins/string/replace.rs
View File

@@ -194,7 +194,7 @@ fn new(
replacement.to_owned()
} else {
Self::interpret_escape(replacement)
.ok_or_else(|| RegexError::InvalidEscape(pattern.to_owned()))?
.ok_or_else(|| RegexError::InvalidEscape(replacement.to_owned()))?
};
Self::Regex {
replacement,