@@ -54,10 +54,9 @@ pub fn main(config: &mut LazyConfig) -> CliResult {
54
54
. map ( String :: as_str)
55
55
== Some ( "help" )
56
56
{
57
- let header = style:: HEADER . render ( ) ;
58
- let literal = style:: LITERAL . render ( ) ;
59
- let placeholder = style:: PLACEHOLDER . render ( ) ;
60
- let reset = anstyle:: Reset . render ( ) ;
57
+ let header = style:: HEADER ;
58
+ let literal = style:: LITERAL ;
59
+ let placeholder = style:: PLACEHOLDER ;
61
60
62
61
let options = CliUnstable :: help ( ) ;
63
62
let max_length = options
@@ -72,17 +71,17 @@ pub fn main(config: &mut LazyConfig) -> CliResult {
72
71
. map ( |( opt, help) | {
73
72
let opt = opt. replace ( "_" , "-" ) ;
74
73
let help = help. unwrap ( ) ;
75
- format ! ( " {literal}-Z {opt:<max_length$}{reset } {help}" )
74
+ format ! ( " {literal}-Z {opt:<max_length$}{literal:# } {help}" )
76
75
} )
77
76
. join ( "\n " ) ;
78
77
drop_println ! (
79
78
config,
80
79
"\
81
- {header}Available unstable (nightly-only) flags:{reset }
80
+ {header}Available unstable (nightly-only) flags:{header:# }
82
81
83
82
{z_flags}
84
83
85
- Run with `{literal}cargo -Z{reset } {placeholder}[FLAG] [COMMAND]{reset }`" ,
84
+ Run with `{literal}cargo -Z{literal:# } {placeholder}[FLAG] [COMMAND]{placeholder:# }`" ,
86
85
) ;
87
86
if !config. nightly_features_allowed {
88
87
drop_println ! (
@@ -136,8 +135,7 @@ Run with `{literal}cargo -Z{reset} {placeholder}[FLAG] [COMMAND]{reset}`",
136
135
) ;
137
136
for ( name, command) in list_commands ( config) {
138
137
let known_external_desc = known_external_command_descriptions. get ( name. as_str ( ) ) ;
139
- let literal = style:: LITERAL . render ( ) ;
140
- let reset = anstyle:: Reset . render ( ) ;
138
+ let literal = style:: LITERAL ;
141
139
match command {
142
140
CommandInfo :: BuiltIn { about } => {
143
141
assert ! (
@@ -146,21 +144,25 @@ Run with `{literal}cargo -Z{reset} {placeholder}[FLAG] [COMMAND]{reset}`",
146
144
) ;
147
145
let summary = about. unwrap_or_default ( ) ;
148
146
let summary = summary. lines ( ) . next ( ) . unwrap_or ( & summary) ; // display only the first line
149
- drop_println ! ( config, " {literal}{name:<20}{reset } {summary}" ) ;
147
+ drop_println ! ( config, " {literal}{name:<20}{literal:# } {summary}" ) ;
150
148
}
151
149
CommandInfo :: External { path } => {
152
150
if let Some ( desc) = known_external_desc {
153
- drop_println ! ( config, " {literal}{name:<20}{reset } {desc}" ) ;
151
+ drop_println ! ( config, " {literal}{name:<20}{literal:# } {desc}" ) ;
154
152
} else if is_verbose {
155
- drop_println ! ( config, " {literal}{name:<20}{reset} {}" , path. display( ) ) ;
153
+ drop_println ! (
154
+ config,
155
+ " {literal}{name:<20}{literal:#} {}" ,
156
+ path. display( )
157
+ ) ;
156
158
} else {
157
- drop_println ! ( config, " {literal}{name}{reset }" ) ;
159
+ drop_println ! ( config, " {literal}{name}{literal:# }" ) ;
158
160
}
159
161
}
160
162
CommandInfo :: Alias { target } => {
161
163
drop_println ! (
162
164
config,
163
- " {literal}{name:<20}{reset } alias: {}" ,
165
+ " {literal}{name:<20}{literal:# } alias: {}" ,
164
166
target. iter( ) . join( " " )
165
167
) ;
166
168
}
0 commit comments