Skip to content

Commit 236a0a3

Browse files
Format Rust code using rustfmt
1 parent 8efbf2c commit 236a0a3

File tree

2 files changed

+20
-6
lines changed

2 files changed

+20
-6
lines changed

rar-common/src/lib.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1407,7 +1407,8 @@ mod tests {
14071407
with_mutable_config(&mut file, |file| {
14081408
file.write_all(initial_content.as_bytes()).unwrap();
14091409
Ok(())
1410-
}).unwrap();
1410+
})
1411+
.unwrap();
14111412

14121413
// Open the file using LockedSettingsFile
14131414
let mut locked = LockedSettingsFile::open(
@@ -1417,7 +1418,8 @@ mod tests {
14171418
.write(true)
14181419
.to_owned(),
14191420
true, // write mode
1420-
).unwrap();
1421+
)
1422+
.unwrap();
14211423

14221424
// Modify the settings to have fewer roles
14231425
let new_config = SConfig::builder().build();

rar-common/src/util.rs

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,10 @@ pub fn open_lock_with_privileges<P: AsRef<Path>>(
346346
if e.kind() != std::io::ErrorKind::PermissionDenied {
347347
return Err(e);
348348
}
349-
debug!("Permission denied while opening {} file, retrying with privileges", p.as_ref().display());
349+
debug!(
350+
"Permission denied while opening {} file, retrying with privileges",
351+
p.as_ref().display()
352+
);
350353
with_privileges(&[Cap::DAC_READ_SEARCH], || options.open(&p)).or_else(|e| {
351354
if e.kind() != std::io::ErrorKind::PermissionDenied {
352355
return Err(e);
@@ -363,7 +366,10 @@ pub fn read_with_privileges<P: AsRef<Path>>(p: P) -> std::io::Result<File> {
363366
if e.kind() != std::io::ErrorKind::PermissionDenied {
364367
return Err(e);
365368
}
366-
debug!("Permission denied while opening {} file, retrying with privileges",p.as_ref().display());
369+
debug!(
370+
"Permission denied while opening {} file, retrying with privileges",
371+
p.as_ref().display()
372+
);
367373
with_privileges(&[Cap::DAC_READ_SEARCH], || std::fs::File::open(&p)).or_else(|e| {
368374
if e.kind() != std::io::ErrorKind::PermissionDenied {
369375
return Err(e);
@@ -378,7 +384,10 @@ pub fn remove_with_privileges<P: AsRef<Path>>(p: P) -> std::io::Result<()> {
378384
if e.kind() != std::io::ErrorKind::PermissionDenied {
379385
return Err(e);
380386
}
381-
debug!("Permission denied while removing {} file, retrying with privileges",p.as_ref().display());
387+
debug!(
388+
"Permission denied while removing {} file, retrying with privileges",
389+
p.as_ref().display()
390+
);
382391
with_privileges(&[Cap::DAC_OVERRIDE], || std::fs::remove_file(&p))
383392
})
384393
}
@@ -388,7 +397,10 @@ pub fn create_dir_all_with_privileges<P: AsRef<Path>>(p: P) -> std::io::Result<(
388397
if e.kind() != std::io::ErrorKind::PermissionDenied {
389398
return Err(e);
390399
}
391-
debug!("Permission denied while creating {} directory, retrying with privileges",p.as_ref().display());
400+
debug!(
401+
"Permission denied while creating {} directory, retrying with privileges",
402+
p.as_ref().display()
403+
);
392404
with_privileges(&[Cap::DAC_OVERRIDE], || std::fs::create_dir_all(p))
393405
})
394406
}

0 commit comments

Comments
 (0)