Skip to content

Commit 07d7d54

Browse files
Dmitry BogatovDmitry Bogatov
authored andcommitted
Avoid unstable `inner_deref' feature
1 parent bde84c6 commit 07d7d54

File tree

5 files changed

+15
-6
lines changed

5 files changed

+15
-6
lines changed

src/dc_chat.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@ unsafe fn prepare_msg_raw(
725725
timestamp,
726726
(*msg).type_0,
727727
(*msg).state,
728-
(*msg).text.deref().unwrap_or(""),
728+
(*msg).text.as_ref().map(String::as_str).unwrap_or(""),
729729
(*msg).param.to_string(),
730730
(*msg).hidden,
731731
to_string(new_in_reply_to),
@@ -1027,7 +1027,7 @@ unsafe fn set_draft_raw(context: &Context, chat_id: uint32_t, msg: *mut dc_msg_t
10271027
time(),
10281028
(*msg).type_0,
10291029
DC_STATE_OUT_DRAFT,
1030-
(*msg).text.deref().unwrap_or(""),
1030+
(*msg).text.as_ref().map(String::as_str).unwrap_or(""),
10311031
(*msg).param.to_string(),
10321032
1,
10331033
],

src/dc_lot.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,10 @@ pub unsafe fn dc_lot_fill(
163163
}
164164
}
165165

166-
let msgtext_c = (*msg).text.deref().map(CString::yolo);
166+
let msgtext_c = (*msg)
167+
.text
168+
.as_ref()
169+
.map(|s| CString::yolo(String::as_str(s)));
167170
let msgtext_ptr = msgtext_c.map(|s| s.as_ptr()).unwrap_or(ptr::null());
168171

169172
(*lot).text2 =

src/dc_mimefactory.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1098,7 +1098,10 @@ unsafe fn get_subject(
10981098
let ret: *mut libc::c_char;
10991099

11001100
let raw_subject = {
1101-
let msgtext_c = (*msg).text.deref().map(CString::yolo);
1101+
let msgtext_c = (*msg)
1102+
.text
1103+
.as_ref()
1104+
.map(|s| CString::yolo(String::as_str(s)));
11021105
let msgtext_ptr = msgtext_c.map(|s| s.as_ptr()).unwrap_or(ptr::null());
11031106

11041107
dc_msg_get_summarytext_by_raw((*msg).type_0, msgtext_ptr, &mut (*msg).param, 32, context)

src/dc_msg.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,10 @@ pub unsafe fn dc_msg_get_summarytext(
834834
return dc_strdup(0 as *const libc::c_char);
835835
}
836836

837-
let msgtext_c = (*msg).text.deref().map(CString::yolo);
837+
let msgtext_c = (*msg)
838+
.text
839+
.as_ref()
840+
.map(|s| CString::yolo(String::as_str(s)));
838841
let msgtext_ptr = msgtext_c.map(|s| s.as_ptr()).unwrap_or(ptr::null());
839842

840843
dc_msg_get_summarytext_by_raw(

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(c_variadic, ptr_wrapping_offset_from, ptr_cast, inner_deref)]
1+
#![feature(c_variadic, ptr_wrapping_offset_from, ptr_cast)]
22

33
#[macro_use]
44
extern crate failure_derive;

0 commit comments

Comments
 (0)