From 324ae8d7830d01165ca552c6137f99d7d0413bc2 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sun, 13 Jan 2019 23:55:45 +0300 Subject: [PATCH] limit width to 80 unless --files is specified --- src/cli.rs | 2 +- src/main.rs | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/cli.rs b/src/cli.rs index 4da0a0b35..14ca0ca67 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -62,7 +62,7 @@ impl<'a> Cli<'a> { 3: enable file level trace. Not recommended on multiple files") ).get_matches(); - let columns = matches.value_of("columns").and_then(|s| s.parse().ok()); + let columns = matches.value_of("columns").map(parse_or_exit::); let files = matches.is_present("files"); let print_languages = matches.is_present("languages"); let verbose = matches.occurrences_of("verbose"); diff --git a/src/main.rs b/src/main.rs index 4fd5b1b42..f009adb74 100644 --- a/src/main.rs +++ b/src/main.rs @@ -49,9 +49,13 @@ fn main() -> Result<(), Box> { } let columns = cli.columns.or(config.columns).unwrap_or_else(|| { - term_size::dimensions().map_or(FALLBACK_ROW_LEN, |(w, _)| { - w.max(FALLBACK_ROW_LEN) - }) + if cli.files { + term_size::dimensions().map_or(FALLBACK_ROW_LEN, |(w, _)| { + w.max(FALLBACK_ROW_LEN) + }) + } else { + FALLBACK_ROW_LEN + } });