@@ -21,7 +21,7 @@ fn output_result(cmd: &mut Command) -> Result<String, String> {
21
21
String :: from_utf8( output. stderr) . map_err( |err| format!( "{err:?}" ) ) ?
22
22
) ) ;
23
23
}
24
- Ok ( String :: from_utf8 ( output. stdout ) . map_err ( |err| format ! ( "{err:?}" ) ) ? )
24
+ String :: from_utf8 ( output. stdout ) . map_err ( |err| format ! ( "{err:?}" ) )
25
25
}
26
26
27
27
/// Finds the remote for rust-lang/rust.
@@ -64,18 +64,14 @@ pub fn rev_exists(rev: &str, git_dir: Option<&Path>) -> Result<bool, String> {
64
64
match output. status . code ( ) {
65
65
Some ( 0 ) => Ok ( true ) ,
66
66
Some ( 128 ) => Ok ( false ) ,
67
- None => {
68
- return Err ( format ! (
69
- "git didn't exit properly: {}" ,
70
- String :: from_utf8( output. stderr) . map_err( |err| format!( "{err:?}" ) ) ?
71
- ) ) ;
72
- }
73
- Some ( code) => {
74
- return Err ( format ! (
75
- "git command exited with status code: {code}: {}" ,
76
- String :: from_utf8( output. stderr) . map_err( |err| format!( "{err:?}" ) ) ?
77
- ) ) ;
78
- }
67
+ None => Err ( format ! (
68
+ "git didn't exit properly: {}" ,
69
+ String :: from_utf8( output. stderr) . map_err( |err| format!( "{err:?}" ) ) ?
70
+ ) ) ,
71
+ Some ( code) => Err ( format ! (
72
+ "git command exited with status code: {code}: {}" ,
73
+ String :: from_utf8( output. stderr) . map_err( |err| format!( "{err:?}" ) ) ?
74
+ ) ) ,
79
75
}
80
76
}
81
77
@@ -96,7 +92,7 @@ pub fn updated_master_branch(
96
92
}
97
93
}
98
94
99
- Err ( format ! ( "Cannot find any suitable upstream master branch" ) )
95
+ Err ( "Cannot find any suitable upstream master branch" . to_owned ( ) )
100
96
}
101
97
102
98
pub fn get_git_merge_base (
@@ -118,7 +114,7 @@ pub fn get_git_merge_base(
118
114
pub fn get_git_modified_files (
119
115
config : & GitConfig < ' _ > ,
120
116
git_dir : Option < & Path > ,
121
- extensions : & Vec < & str > ,
117
+ extensions : & [ & str ] ,
122
118
) -> Result < Option < Vec < String > > , String > {
123
119
let merge_base = get_git_merge_base ( config, git_dir) ?;
124
120
0 commit comments