File tree Expand file tree Collapse file tree 5 files changed +8
-22
lines changed Expand file tree Collapse file tree 5 files changed +8
-22
lines changed Original file line number Diff line number Diff line change @@ -95,9 +95,7 @@ impl Component for Bios {
95
95
device : & str ,
96
96
_update_firmware : bool ,
97
97
) -> Result < InstalledContent > {
98
- let meta = if let Some ( meta) = get_component_update ( src_root, self ) ? {
99
- meta
100
- } else {
98
+ let Some ( meta) = get_component_update ( src_root, self ) ? else {
101
99
anyhow:: bail!( "No update metadata for component {} found" , self . name( ) ) ;
102
100
} ;
103
101
Original file line number Diff line number Diff line change @@ -249,9 +249,7 @@ pub(crate) fn adopt_and_update(name: &str) -> Result<ContentMetadata> {
249
249
250
250
ensure_writable_boot ( ) ?;
251
251
252
- let update = if let Some ( update) = component. query_update ( & sysroot) ? {
253
- update
254
- } else {
252
+ let Some ( update) = component. query_update ( & sysroot) ? else {
255
253
anyhow:: bail!( "Component {} has no available update" , name) ;
256
254
} ;
257
255
let mut state_guard =
@@ -270,12 +268,10 @@ pub(crate) fn adopt_and_update(name: &str) -> Result<ContentMetadata> {
270
268
pub ( crate ) fn validate ( name : & str ) -> Result < ValidationResult > {
271
269
let state = SavedState :: load_from_disk ( "/" ) ?. unwrap_or_default ( ) ;
272
270
let component = component:: new_from_name ( name) ?;
273
- let inst = if let Some ( inst) = state. installed . get ( name) {
274
- inst. clone ( )
275
- } else {
271
+ let Some ( inst) = state. installed . get ( name) else {
276
272
anyhow:: bail!( "Component {} is not installed" , name) ;
277
273
} ;
278
- component. validate ( & inst)
274
+ component. validate ( inst)
279
275
}
280
276
281
277
pub ( crate ) fn status ( ) -> Result < Status > {
Original file line number Diff line number Diff line change @@ -283,9 +283,7 @@ impl Component for Efi {
283
283
device : & str ,
284
284
update_firmware : bool ,
285
285
) -> Result < InstalledContent > {
286
- let meta = if let Some ( meta) = get_component_update ( src_root, self ) ? {
287
- meta
288
- } else {
286
+ let Some ( meta) = get_component_update ( src_root, self ) ? else {
289
287
anyhow:: bail!( "No update metadata for component {} found" , self . name( ) ) ;
290
288
} ;
291
289
log:: debug!( "Found metadata {}" , meta. version) ;
Original file line number Diff line number Diff line change @@ -104,9 +104,7 @@ impl FileTree {
104
104
let mut ret = HashMap :: new ( ) ;
105
105
for entry in dir. list_dir ( "." ) ? {
106
106
let entry = entry?;
107
- let name = if let Some ( name) = entry. file_name ( ) . to_str ( ) {
108
- name
109
- } else {
107
+ let Some ( name) = entry. file_name ( ) . to_str ( ) else {
110
108
bail ! ( "Invalid UTF-8 filename: {:?}" , entry. file_name( ) )
111
109
} ;
112
110
if name. starts_with ( TMP_PREFIX ) {
@@ -239,9 +237,7 @@ impl FileTree {
239
237
fn cleanup_tmp ( dir : & openat:: Dir ) -> Result < ( ) > {
240
238
for entry in dir. list_dir ( "." ) ? {
241
239
let entry = entry?;
242
- let name = if let Some ( name) = entry. file_name ( ) . to_str ( ) {
243
- name
244
- } else {
240
+ let Some ( name) = entry. file_name ( ) . to_str ( ) else {
245
241
// Skip invalid UTF-8 for now, we will barf on it later though.
246
242
continue ;
247
243
} ;
Original file line number Diff line number Diff line change @@ -37,9 +37,7 @@ pub(crate) fn filenames(dir: &openat::Dir) -> Result<HashSet<String>> {
37
37
let mut ret = HashSet :: new ( ) ;
38
38
for entry in dir. list_dir ( "." ) ? {
39
39
let entry = entry?;
40
- let name = if let Some ( name) = entry. file_name ( ) . to_str ( ) {
41
- name
42
- } else {
40
+ let Some ( name) = entry. file_name ( ) . to_str ( ) else {
43
41
bail ! ( "Invalid UTF-8 filename: {:?}" , entry. file_name( ) )
44
42
} ;
45
43
match dir. get_file_type ( & entry) ? {
You can’t perform that action at this time.
0 commit comments