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

fmt: replace two magic numbers with consts

Browse source
This commit is contained in:
Daniel Hofstetter 2024-03-20 10:23:33 +01:00
parent 660014e532
commit 45bdca9f16
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/uu/fmt/src/fmt.rs
View file

@ -21,6 +21,10 @@ mod parasplit;
const ABOUT: &str = help_about!("fmt.md"); const ABOUT: &str = help_about!("fmt.md");
const USAGE: &str = help_usage!("fmt.md"); const USAGE: &str = help_usage!("fmt.md");
const MAX_WIDTH: usize = 2500; const MAX_WIDTH: usize = 2500;
const DEFAULT_GOAL: usize = 70;
const DEFAULT_WIDTH: usize = 75;
// by default, goal is 93% of width
const DEFAULT_GOAL_TO_WIDTH_RATIO: usize = 93;
mod options { mod options {
pub const CROWN_MARGIN: &str = "crown-margin"; pub const CROWN_MARGIN: &str = "crown-margin";
@ -39,9 +43,6 @@ mod options {
pub const FILES: &str = "files"; pub const FILES: &str = "files";
} }
// by default, goal is 93% of width
const DEFAULT_GOAL_TO_WIDTH_RATIO: usize = 93;
pub type FileOrStdReader = BufReader<Box<dyn Read + 'static>>; pub type FileOrStdReader = BufReader<Box<dyn Read + 'static>>;
pub struct FmtOptions { pub struct FmtOptions {
crown: bool, crown: bool,
@ -103,7 +104,7 @@ impl FmtOptions {
let w = (g * 100 / DEFAULT_GOAL_TO_WIDTH_RATIO).max(g + 3); let w = (g * 100 / DEFAULT_GOAL_TO_WIDTH_RATIO).max(g + 3);
(w, g) (w, g)
} }
(None, None) => (75, 70), (None, None) => (DEFAULT_WIDTH, DEFAULT_GOAL),
}; };
debug_assert!(width >= goal, "GOAL {goal} should not be greater than WIDTH {width} when given {width_opt:?} and {goal_opt:?}."); debug_assert!(width >= goal, "GOAL {goal} should not be greater than WIDTH {width} when given {width_opt:?} and {goal_opt:?}.");