@@ -144,10 +144,10 @@ macro_rules! value_t {
144
144
Some ( v) => {
145
145
match v. parse:: <$t>( ) {
146
146
Ok ( val) => Ok ( val) ,
147
- Err ( _) => Err ( format!( "{} isn't a valid {} " , v, stringify! ( $t ) ) ) ,
147
+ Err ( _) => Err ( format!( "'{}' isn't a valid value " , v) ) ,
148
148
}
149
149
} ,
150
- None => Err ( format!( "Argument \" {} \" not found" , $v) )
150
+ None => Err ( format!( "The argument '{}' not found" , $v) )
151
151
}
152
152
} ;
153
153
( $m: ident. values_of( $v: expr) , $t: ty) => {
@@ -159,7 +159,7 @@ macro_rules! value_t {
159
159
match pv. parse:: <$t>( ) {
160
160
Ok ( rv) => tmp. push( rv) ,
161
161
Err ( e) => {
162
- err = Some ( format!( "{} isn't a valid {} \n {}" , pv, stringify! ( $t ) , e) ) ;
162
+ err = Some ( format!( "'{}' isn't a valid value \n \t {}" , pv, e) ) ;
163
163
break
164
164
}
165
165
}
@@ -169,7 +169,7 @@ macro_rules! value_t {
169
169
None => Ok ( tmp)
170
170
}
171
171
} ,
172
- None => Err ( format!( "Argument \" {} \" not found" , $v) )
172
+ None => Err ( format!( "The argument '{}' was not found" , $v) )
173
173
}
174
174
} ;
175
175
}
@@ -227,18 +227,17 @@ macro_rules! value_t_or_exit {
227
227
match v. parse:: <$t>( ) {
228
228
Ok ( val) => val,
229
229
Err ( e) => {
230
- println!( "{} isn't a valid {} \n \t {}\n {} \n Please re-run with --help for \
230
+ println!( "'{}' isn't a valid value \n \t {}\n \n {} \n \n Please re-run with --help for \
231
231
more information",
232
232
v,
233
- stringify!( $t) ,
234
233
e,
235
234
$m. usage( ) ) ;
236
235
:: std:: process:: exit( 1 ) ;
237
236
}
238
237
}
239
238
} ,
240
239
None => {
241
- println!( "Argument \" {} \" not found or is not valid\n {} \n Please re-run with \
240
+ println!( "The argument '{}' was not found or is not valid\n \n {} \n \n Please re-run with \
242
241
--help for more information",
243
242
$v,
244
243
$m. usage( ) ) ;
@@ -254,10 +253,9 @@ macro_rules! value_t_or_exit {
254
253
match pv. parse:: <$t>( ) {
255
254
Ok ( rv) => tmp. push( rv) ,
256
255
Err ( _) => {
257
- println!( "{} isn't a valid {} \n \t {}\n Please re-run with --help for more \
256
+ println!( "'{}' isn't a valid value \n \t {}\n \n Please re-run with --help for more \
258
257
information",
259
258
pv,
260
- stringify!( $t) ,
261
259
$m. usage( ) ) ;
262
260
:: std:: process:: exit( 1 ) ;
263
261
}
@@ -266,7 +264,7 @@ macro_rules! value_t_or_exit {
266
264
tmp
267
265
} ,
268
266
None => {
269
- println!( "Argument \" {} \" not found or is not valid\n {} \n Please re-run with \
267
+ println!( "The argument '{}' not found or is not valid\n \n {} \n \n Please re-run with \
270
268
--help for more information",
271
269
$v,
272
270
$m. usage( ) ) ;
0 commit comments