Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-08 01:16:31 +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-27 23:49:18 +00:00
parent dd5803e576
commit ea964fd733
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/context.rs
View File

@@ -300,9 +300,11 @@ pub unsafe fn dc_open(context: &Context, dbfile: &str, blobdir: Option<&str>) ->
if 0 != dc_is_open(context) { if 0 != dc_is_open(context) {
return false; return false;
} }
*context.dbfile.write().unwrap() = Some(PathBuf::from(dbfile)); *context.dbfile.write().unwrap() = Some(PathBuf::from(dbfile));
if blobdir.is_some() && !blobdir.unwrap().is_empty() { let blobdir = blobdir.unwrap_or_default();
let dir = dc_ensure_no_slash_safe(blobdir.unwrap()).strdup(); if !blobdir.is_empty() {
let dir = dc_ensure_no_slash_safe(blobdir).strdup();
*context.blobdir.write().unwrap() = dir; *context.blobdir.write().unwrap() = dir;
} else { } else {
let dir = dbfile.to_string() + "-blobs"; let dir = dbfile.to_string() + "-blobs";