Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-26 01:46:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #134 from flub/as_str

Browse Source 
Rename to_str() -> as_str() to match stdlib naming convention
This commit is contained in:
Floris Bruynooghe
2019-06-08 10:57:24 +02:00
committed by GitHub
parent a32a275d73 855c7844b5
commit 0bce754adf
19 changed files with 84 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/dc_tools.rs
View File

@@ -47,7 +47,7 @@ pub unsafe fn dc_strdup_keep_null(s: *const libc::c_char) -> *mut libc::c_char {
pub unsafe fn dc_atoi_null_is_0(s: *const libc::c_char) -> libc::c_int {
if !s.is_null() {
to_str(s).parse().unwrap_or_default()
as_str(s).parse().unwrap_or_default()
} else {
0
}
@@ -58,7 +58,7 @@ pub fn dc_atof(s: *const libc::c_char) -> libc::c_double {
return 0.;
}
to_str(s).parse().unwrap_or_default()
as_str(s).parse().unwrap_or_default()
}
pub unsafe fn dc_str_replace(
@@ -1235,7 +1235,7 @@ pub unsafe fn dc_create_folder(
let mut success = 0;
let pathNfilename_abs = dc_get_abs_path(context, pathNfilename);
{
let p = std::path::Path::new(to_str(pathNfilename_abs));
let p = std::path::Path::new(as_str(pathNfilename_abs));
if !p.exists() {
match fs::create_dir_all(p) {
Ok(_) => {
@@ -1566,7 +1566,7 @@ pub fn to_string(s: *const libc::c_char) -> String {
unsafe { std::ffi::CStr::from_ptr(s).to_str().unwrap().to_string() }
}
pub fn to_str<'a>(s: *const libc::c_char) -> &'a str {
pub fn as_str<'a>(s: *const libc::c_char) -> &'a str {
assert!(!s.is_null(), "cannot be used on null pointers");
unsafe { std::ffi::CStr::from_ptr(s).to_str().unwrap() }
}