Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-08 09:26:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Simplify to_string_lossy()

Browse Source 
Call .to_string_lossy() without trying .to_str() first.
This commit is contained in:
Alexander Krotov
2019-10-09 00:50:08 +03:00
committed by holger krekel
parent 102220834c
commit e4cca92910
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/dc_tools.rs
View File

@@ -800,9 +800,7 @@ pub fn to_string_lossy(s: *const libc::c_char) -> String {
let cstr = unsafe { CStr::from_ptr(s) }; let cstr = unsafe { CStr::from_ptr(s) };
cstr.to_str() cstr.to_string_lossy().to_string()
.map(|s| s.to_string())
.unwrap_or_else(|_| cstr.to_string_lossy().to_string())
} }
pub fn as_str<'a>(s: *const libc::c_char) -> &'a str { pub fn as_str<'a>(s: *const libc::c_char) -> &'a str {