File tree 2 files changed +7
-8
lines changed
2 files changed +7
-8
lines changed Original file line number Diff line number Diff line change @@ -23,7 +23,7 @@ pub struct Cli {
23
23
pub excluded : Vec < String > ,
24
24
pub print_languages : bool ,
25
25
pub true_color : bool ,
26
- pub image_off : bool ,
26
+ pub art_off : bool ,
27
27
}
28
28
29
29
impl Cli {
@@ -177,14 +177,15 @@ impl Cli {
177
177
. arg (
178
178
Arg :: with_name ( "off" )
179
179
. long ( "off" )
180
- . help ( "Prevents the ASCII art or image from displaying" ) ,
180
+ . help ( "Prevents the ASCII art or image from displaying" )
181
+ . conflicts_with_all ( & [ "image" , "ascii-language" , "ascii-input" ] ) ,
181
182
) . get_matches ( ) ;
182
183
183
184
let no_bold = matches. is_present ( "no-bold" ) ;
184
185
let no_merges = matches. is_present ( "no-merge-commits" ) ;
185
186
let no_color_blocks = matches. is_present ( "no-color-blocks" ) ;
186
187
let print_languages = matches. is_present ( "languages" ) ;
187
- let image_off = matches. is_present ( "off" ) ;
188
+ let art_off = matches. is_present ( "off" ) ;
188
189
let true_color = is_truecolor_terminal ( ) ;
189
190
190
191
let fields_to_hide: Vec < String > = if let Some ( values) = matches. values_of ( "disable-fields" )
@@ -255,7 +256,7 @@ impl Cli {
255
256
excluded,
256
257
print_languages,
257
258
true_color,
258
- image_off ,
259
+ art_off ,
259
260
} )
260
261
}
261
262
Original file line number Diff line number Diff line change @@ -256,10 +256,8 @@ impl std::fmt::Display for Info {
256
256
let center_pad = " " ;
257
257
let mut info_lines = buf. lines ( ) ;
258
258
259
- if self . config . image_off {
260
- while let Some ( line) = info_lines. next ( ) {
261
- writeln ! ( f, "{}" , line) ?;
262
- }
259
+ if self . config . art_off {
260
+ writeln ! ( f, "{}" , buf) ?;
263
261
} else if let Some ( custom_image) = & self . config . image {
264
262
if let Some ( image_backend) = & self . config . image_backend {
265
263
writeln ! (
You can’t perform that action at this time.
0 commit comments