File tree 3 files changed +5
-10
lines changed
3 files changed +5
-10
lines changed Original file line number Diff line number Diff line change @@ -195,8 +195,8 @@ impl<'a> LineFormatter<'a> {
195
195
}
196
196
TagEnd :: Strong => { }
197
197
TagEnd :: Strikethrough => { }
198
- TagEnd :: Link { .. } => { }
199
- TagEnd :: Image { .. } => { } // shouldn't happen, handled in start
198
+ TagEnd :: Link => { }
199
+ TagEnd :: Image => { } // shouldn't happen, handled in start
200
200
TagEnd :: FootnoteDefinition => { }
201
201
TagEnd :: MetadataBlock ( _) => { }
202
202
TagEnd :: Superscript => { }
Original file line number Diff line number Diff line change @@ -1048,13 +1048,8 @@ fn get_and_parse_new_rustup_version(path: &Path) -> Option<String> {
1048
1048
}
1049
1049
1050
1050
fn get_new_rustup_version ( path : & Path ) -> Option < String > {
1051
- match Command :: new ( path) . arg ( "--version" ) . output ( ) {
1052
- Err ( _) => None ,
1053
- Ok ( output) => match String :: from_utf8 ( output. stdout ) {
1054
- Ok ( version) => Some ( version) ,
1055
- Err ( _) => None ,
1056
- } ,
1057
- }
1051
+ let output = Command :: new ( path) . arg ( "--version" ) . output ( ) . ok ( ) ?;
1052
+ String :: from_utf8 ( output. stdout ) . ok ( )
1058
1053
}
1059
1054
1060
1055
fn parse_new_rustup_version ( version : String ) -> String {
Original file line number Diff line number Diff line change @@ -204,7 +204,7 @@ impl<'a> Toolchain<'a> {
204
204
. cfg
205
205
. process
206
206
. var_os ( sysenv:: LOADER_PATH )
207
- . filter ( |x| x . len ( ) > 0 )
207
+ . filter ( |x| !x . is_empty ( ) )
208
208
. is_none ( )
209
209
{
210
210
// These are the defaults when DYLD_FALLBACK_LIBRARY_PATH isn't
You can’t perform that action at this time.
0 commit comments