RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-27 19:17:43 +00:00
Code Issues Activity

expand: fix formatting issues and cleanup

Browse source
This commit is contained in:
Sebastian Bentmar Holgersson 2023-01-03 22:06:40 +00:00 • committed by Sylvestre Ledru
parent 69d8729598
commit 1bf723fe40
2 changed files with 18 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/uu/expand/src/expand.rs
View file

@ -38,7 +38,7 @@ static DEFAULT_TABSTOP: usize = 8;
/// The mode to use when replacing tabs beyond the last one specified in /// The mode to use when replacing tabs beyond the last one specified in
/// the `--tabs` argument. /// the `--tabs` argument.
#[derive(PartialEq, Debug)] #[derive(PartialEq)]
enum RemainingMode { enum RemainingMode {
None, None,
Slash, Slash,
@ -195,7 +195,6 @@ fn tabstops_parse(s: &str) -> Result<(RemainingMode, Vec<usize>), ParseError> {
Ok((remaining_mode, nums)) Ok((remaining_mode, nums))
} }
#[derive(Debug)]
struct Options { struct Options {
files: Vec<String>, files: Vec<String>,
tabstops: Vec<usize>, tabstops: Vec<usize>,
@ -345,11 +344,11 @@ fn next_tabstop(tabstops: &[usize], col: usize, remaining_mode: &RemainingMode)
Some(t) => t - col, Some(t) => t - col,
None => { None => {
let step_size = tabstops[num_tabstops - 1]; let step_size = tabstops[num_tabstops - 1];
let last_fixed_tabstop = tabstops[num_tabstops-2]; let last_fixed_tabstop = tabstops[num_tabstops - 2];
let characters_since_last_tabstop = col-last_fixed_tabstop; let characters_since_last_tabstop = col - last_fixed_tabstop;
let steps_required = 1 + characters_since_last_tabstop/step_size; let steps_required = 1 + characters_since_last_tabstop / step_size;
steps_required*step_size-characters_since_last_tabstop steps_required * step_size - characters_since_last_tabstop
} }
}, },
RemainingMode::Slash => match tabstops[0..num_tabstops - 1].iter().find(|&&t| t > col) { RemainingMode::Slash => match tabstops[0..num_tabstops - 1].iter().find(|&&t| t > col) {