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

printf: remove unreachable code

Browse Source 
Remove an unreachable, yet translated, error string and make the code
more idiomatic

Closes #12594
This commit is contained in:
Nahor
2026-03-31 12:54:24 -07:00
committed by Johannes Altmanninger
parent 014e3b3aff
commit 344ff7be88
11 changed files with 3 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/builtins/printf.rs
View File

@@ -205,16 +205,13 @@ impl<'a, 'b> builtin_printf_state_t<'a, 'b> {
fn verify_numeric(&mut self, s: &wstr, end: &wstr, errcode: Option<Error>) {
// This check matches the historic `errcode != EINVAL` check from C++.
// Note that empty or missing values will be silently treated as 0.
if errcode != None && errcode != Some(Error::InvalidChar) && errcode != Some(Error::Empty) {
if errcode.is_some_and(|err| err != Error::InvalidChar && err != Error::Empty) {
match errcode.unwrap() {
Error::Overflow => {
self.fatal_error(wgettext_fmt!("%s: Number out of range", s));
}
Error::Empty => {
self.fatal_error(wgettext_fmt!("%s: Number was empty", s));
}
Error::InvalidChar => {
panic!("Unreachable");
Error::InvalidChar | Error::Empty => {
unreachable!("Unreachable");
}
}
} else if !end.is_empty() {