Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-16 15:04:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Stop using num_traits in builtin return

Browse source 
This can be simplified using the builtin abs() function.
This commit is contained in:
ridiculousfish 2024-01-21 16:16:37 -08:00
parent 66ebd88c44
commit 1a42bdf182
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/builtins/return.rs
View file

@ -1,7 +1,5 @@
// Implementation of the return builtin. // Implementation of the return builtin.
use num_traits::abs;
use super::prelude::*; use super::prelude::*;
#[derive(Debug, Clone, Copy, Default)] #[derive(Debug, Clone, Copy, Default)]
@ -59,8 +57,9 @@ pub fn r#return(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr]) ->
// Map negative values to (256 - their absolute value). This prevents `return -1` from // Map negative values to (256 - their absolute value). This prevents `return -1` from
// evaluating to a `$status` of 0 and keeps us from running into undefined behavior by trying to // evaluating to a `$status` of 0 and keeps us from running into undefined behavior by trying to
// left shift a negative value in W_EXITCODE(). // left shift a negative value in W_EXITCODE().
// Note in Rust, dividend % divisor has the same sign as the dividend.
if retval < 0 { if retval < 0 {
retval = 256 - (abs(retval) % 256); retval = 256 - (retval % 256).abs();
} }
// If we're not in a function, exit the current script (but not an interactive shell). // If we're not in a function, exit the current script (but not an interactive shell).