diff options
| author | Dan Davison <dandavison7@gmail.com> | 2020-06-10 14:42:44 -0400 |
|---|---|---|
| committer | Dan Davison <dandavison7@gmail.com> | 2020-06-10 14:43:21 -0400 |
| commit | 18ddf57ff200b3db692294665b0d8513b8f42daf (patch) | |
| tree | e57f37c29626865ed9aefbaefbc88f088c66e575 /src/main.rs | |
| parent | 78f595a5c81a9eb40dc7ca29acba158f4584db80 (diff) | |
Do not allow ArgMatches to be missing
Diffstat (limited to 'src/main.rs')
| -rw-r--r-- | src/main.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.rs b/src/main.rs index 3d9fa3d7..f32000ca 100644 --- a/src/main.rs +++ b/src/main.rs @@ -29,7 +29,7 @@ use std::process; use ansi_term::{self, Color}; use atty; use bytelines::ByteLinesReader; -use structopt::StructOpt; +use structopt::{clap, StructOpt}; use crate::bat::assets::{list_languages, HighlightingAssets}; use crate::bat::output::{OutputType, PagingMode}; @@ -73,7 +73,7 @@ fn main() -> std::io::Result<()> { Err(_) => None, }; - let config = cli::process_command_line_arguments(opt, Some(arg_matches), &mut git_config); + let config = cli::process_command_line_arguments(opt, arg_matches, &mut git_config); if atty::is(atty::Stream::Stdin) { return diff( @@ -204,7 +204,7 @@ index f38589a..0f1bb83 100644 hunk_header_style: "omit".to_string(), ..opt.clone() }, - None, + clap::ArgMatches::new(), &mut None, ); let mut output_type = |