github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-22 11:22:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reimplement WGetopter::exchange() using rotate_left

Browse Source 
A simplification informed by the new test.
This commit is contained in:
ridiculousfish 2024-04-17 12:39:03 -07:00
parent f990d52d2b
commit ed8f62e723
1 changed files with 3 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/wgetopt.rs
View File

@ -194,36 +194,11 @@ impl<'opts, 'args, 'argarray> WGetopter<'opts, 'args, 'argarray> {
/// Elements are then swapped between the list so that all options end up
/// in the former list, and non-options in the latter.
fn exchange(&mut self) {
let mut left = self.first_nonopt;
let left = self.first_nonopt;
let middle = self.last_nonopt;
let mut right = self.wopt_index;
let right = self.wopt_index;
debug_assert!(left <= middle && middle <= right, "Indexes out of order");
while right > middle && middle > left {
if right - middle > middle - left {
// The left segment is the short one.
let len = middle - left;
// Swap it with the top part of the right segment.
for i in 0..len {
self.argv.swap(left + i, right - len + i);
}
// Exclude the moved elements from further swapping.
right -= len;
} else {
// The right segment is the short one.
let len = right - middle;
// Swap it with the bottom part of the left segment.
for i in 0..len {
self.argv.swap(left + i, middle + i);
}
// Exclude the moved elements from further swapping.
left += len;
}
}
self.argv[left..right].rotate_left(middle - left);
// Update the indices to indicate the new positions of the non-option
// arguments.