Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-12-14 23:32:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

fmt: remove crash! macro (#5589)

Browse source 
* fmt: remove crash! macro

* Fix styling in fmt

* Revert "Fix styling in fmt"

This reverts commit 002e02f50c.

* Revert "fmt: remove crash! macro"

This reverts commit d65a3f85a1.

* Replace crash! with unreachable! macro

* Remove crash! import

* Remove unreachable! from fmt

* keep the helpful comment

* Fix lint and format issues

* review fixes
This commit is contained in:
Arpit Bhadauria 2023-12-15 16:44:31 +05:30 committed by GitHub
parent 2e6005a902
commit 3a7a3bf639
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/uu/fmt/src/linebreak.rs
View file

@ -8,8 +8,6 @@
use std::io::{BufWriter, Stdout, Write}; use std::io::{BufWriter, Stdout, Write};
use std::{cmp, i64, mem}; use std::{cmp, i64, mem};
use uucore::crash;
use crate::parasplit::{ParaWords, Paragraph, WordInfo}; use crate::parasplit::{ParaWords, Paragraph, WordInfo};
use crate::FmtOptions; use crate::FmtOptions;
@ -363,28 +361,26 @@ fn find_kp_breakpoints<'a, T: Iterator<Item = &'a WordInfo<'a>>>(
} }
fn build_best_path<'a>(paths: &[LineBreak<'a>], active: &[usize]) -> Vec<(&'a WordInfo<'a>, bool)> { fn build_best_path<'a>(paths: &[LineBreak<'a>], active: &[usize]) -> Vec<(&'a WordInfo<'a>, bool)> {
let mut breakwords = vec![];
// of the active paths, we select the one with the fewest demerits // of the active paths, we select the one with the fewest demerits
let mut best_idx = match active.iter().min_by_key(|&&a| paths[a].demerits) { active
None => crash!( .iter()
1, .min_by_key(|&&a| paths[a].demerits)
"Failed to find a k-p linebreak solution. This should never happen." .map(|&(mut best_idx)| {
), let mut breakwords = vec![];
Some(&s) => s, // now, chase the pointers back through the break list, recording
}; // the words at which we should break
loop {
// now, chase the pointers back through the break list, recording let next_best = &paths[best_idx];
// the words at which we should break match next_best.linebreak {
loop { None => return breakwords,
let next_best = &paths[best_idx]; Some(prev) => {
match next_best.linebreak { breakwords.push((prev, next_best.break_before));
None => return breakwords, best_idx = next_best.prev;
Some(prev) => { }
breakwords.push((prev, next_best.break_before)); }
best_idx = next_best.prev;
} }
} })
} .unwrap_or_default()
} }
// "infinite" badness is more like (1+BAD_INFTY)^2 because of how demerits are computed // "infinite" badness is more like (1+BAD_INFTY)^2 because of how demerits are computed