rwf2
/
Rocket
mirror of https://github.com/rwf2/Rocket.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use '#[repr(C)]' on 'str' wrappers to guarantee correct layout. 

Closes #494.
This commit is contained in:
Sergio Benitez 2017-12-14 18:09:45 +07:00
parent 94c7a1997e
commit 6460be62c3
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/src/http/raw_str.rs
View File

@ -46,6 +46,7 @@ use http::uncased::UncasedStr;
/// ///
/// [`FromParam`]: /rocket/request/trait.FromParam.html /// [`FromParam`]: /rocket/request/trait.FromParam.html
/// [`FromFormValue`]: /rocket/request/trait.FromFormValue.html /// [`FromFormValue`]: /rocket/request/trait.FromFormValue.html
#[repr(C)]
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)] #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
pub struct RawStr(str); pub struct RawStr(str);
@ -276,7 +277,7 @@ impl RawStr {
impl<'a> From<&'a str> for &'a RawStr { impl<'a> From<&'a str> for &'a RawStr {
#[inline(always)] #[inline(always)]
fn from(string: &'a str) -> &'a RawStr { fn from(string: &'a str) -> &'a RawStr {
unsafe { ::std::mem::transmute(string) } unsafe { &*(string as *const str as *const RawStr) }
} }
} }

1
lib/src/http/uncased.rs
View File

@ -18,6 +18,7 @@ use std::fmt;
/// ///
/// let ascii_ref: &UncasedStr = "Hello, world!".into(); /// let ascii_ref: &UncasedStr = "Hello, world!".into();
/// ``` /// ```
#[repr(C)]
#[derive(Debug)] #[derive(Debug)]
pub struct UncasedStr(str); pub struct UncasedStr(str);