File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -46,22 +46,26 @@ fn set_args(mut p: Manual, y: &Yaml) -> Manual {
4646 . long ( parse_str ( & arg, "long" ) . as_str ( ) )
4747 . help ( parse_str ( & arg, "help" ) . as_str ( ) ) ;
4848 let short = parse_str ( & arg, "short" ) ;
49- if short != "" {
49+ if !short . is_empty ( ) {
5050 f = f. short ( short. as_str ( ) ) ;
5151 }
5252 p = p. flag ( f) ;
5353 } else {
5454 let o_val = parse_str ( & arg, "value_name" ) ;
55- let key = if o_val != "" { o_val. as_str ( ) } else { key } ;
55+ let key = if !o_val. is_empty ( ) {
56+ o_val. as_str ( )
57+ } else {
58+ key
59+ } ;
5660 let mut o = Opt :: new ( key)
5761 . long ( parse_str ( & arg, "long" ) . as_str ( ) )
5862 . help ( parse_str ( & arg, "help" ) . as_str ( ) ) ;
5963 let short = parse_str ( & arg, "short" ) ;
6064 let default_value = parse_str ( & arg, "default_value" ) ;
61- if short != "" {
65+ if !short . is_empty ( ) {
6266 o = o. short ( short. as_str ( ) ) ;
6367 }
64- if default_value != "" {
68+ if !default_value . is_empty ( ) {
6569 o = o. default_value ( default_value. as_str ( ) ) ;
6670 }
6771 p = p. option ( o) ;
Original file line number Diff line number Diff line change @@ -5,7 +5,6 @@ use std::str;
55use duct:: cmd;
66use git2:: { Config , Error , Repository } ;
77use log:: { debug, trace, warn} ;
8- use shellexpand;
98
109/// Update old `req.key` config format to include remote name, i.e, `req.remote_name.key`
1110fn migrate_legacy ( field_name : & str , remote_name : & str ) {
Original file line number Diff line number Diff line change @@ -2,8 +2,6 @@ use crate::remotes::{MergeRequest, Remote};
22use log:: { debug, trace} ;
33use regex:: Regex ;
44use serde_derive:: { Deserialize , Serialize } ;
5- use serde_json;
6- use ureq;
75
86#[ derive( Debug ) ]
97pub struct GitHub {
Original file line number Diff line number Diff line change @@ -3,8 +3,6 @@ use crate::remotes::{MergeRequest, Remote};
33use log:: { debug, error, trace} ;
44use regex:: Regex ;
55use serde_derive:: { Deserialize , Serialize } ;
6- use serde_json;
7- use ureq;
86
97#[ derive( Debug ) ]
108pub struct GitLab {
You can’t perform that action at this time.
0 commit comments