Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-02 05:22:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix one clippy::unneeded_unwrap warning

Browse Source
This commit is contained in:
Dmitry Bogatov
2019-08-28 00:11:48 +00:00
parent 6a5e107e64
commit 886870964b
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/dc_imex.rs
View File

@@ -940,16 +940,7 @@ unsafe fn import_self_keys(context: &Context, dir_name: *const libc::c_char) ->
let mut buf2_headerline: *const libc::c_char = ptr::null_mut();
if !dir_name.is_null() {
let dir = std::path::Path::new(as_str(dir_name));
let dir_handle = std::fs::read_dir(dir);
if dir_handle.is_err() {
error!(
context,
0,
"Import: Cannot open directory \"{}\".",
as_str(dir_name),
);
} else {
let dir_handle = dir_handle.unwrap();
if let Ok(dir_handle) = std::fs::read_dir(dir) {
for entry in dir_handle {
if entry.is_err() {
break;
@@ -1033,6 +1024,13 @@ unsafe fn import_self_keys(context: &Context, dir_name: *const libc::c_char) ->
as_str(dir_name),
);
}
} else {
error!(
context,
0,
"Import: Cannot open directory \"{}\".",
as_str(dir_name),
);
}
}