std: Align raw modules with unsafe conventions
#19152
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
|
Note that I took a few liberties with functions like |
alexcrichton
force-pushed
the
issue-17863
branch
from
72daf50 to
83b8efc
Compare
|
🙊 🎉 (reading now) |
| /// Creates a `String` from a `*const u8` buffer of the given length. | ||
| /// | ||
| /// This function is unsafe because of two reasons: | ||
| /// * A raw pointer is dereferenced and transmuted to `&[u8]`; |
There was a problem hiding this comment.
Some of these you say what's actually done, others you just say "we call an unsafe thing on Vec". Might want to pick one (also no transmute to a &[u8] every actually occurs).
There was a problem hiding this comment.
Hm yeah I tweaked the implementation in copy/pasting, so I'll clarify these unsafety points.
alexcrichton
force-pushed
the
issue-17863
branch
2 times, most recently
from
8299549 to
591fd66
Compare
|
Ok @gankro, updated with |
|
@_@ rebased. Just skimming but I think everything's been addressed. r=me but I dunno if you want a second opinion or anything. |
| } | ||
| result.push_str(unsafe{raw::slice_bytes(me, last_end, me.len())}); | ||
| result | ||
| replace(self.as_slice(), from, to) |
There was a problem hiding this comment.
Hm, I would've thought we'd deprecate the free replace fn in favor of this method.
|
I or github must be missing something: where is |
|
Oops sorry forgot to update the description, it's not called |
| @@ -160,14 +159,14 @@ pub fn render(w: &mut fmt::Formatter, s: &str, print_toc: bool) -> fmt::Result { | |||
|
|
|||
| let opaque = opaque as *mut hoedown_html_renderer_state; | |||
| let my_opaque: &MyOpaque = &*((*opaque).opaque as *const MyOpaque); | |||
| slice::raw::buf_as_slice((*orig_text).data, (*orig_text).size as uint, | |||
| slice::with_raw_buf((*orig_text).data, (*orig_text).size as uint, | |||
There was a problem hiding this comment.
I can't find the definition of this function.
|
@alexcrichton But it seems to be referenced in the code, still? |
alexcrichton
force-pushed
the
issue-17863
branch
from
591fd66 to
7ecb717
Compare
| /// ``` | ||
| #[inline] | ||
| #[unstable = "just renamed from `mod raw`"] | ||
| pub unsafe fn from_raw_buf<'a, T>(p: &'a *const T, len: uint) -> &'a [T] { |
There was a problem hiding this comment.
I'm reasonably happy with this design; it's pragmatic.
alexcrichton
added a commit
to alexcrichton/rust
that referenced
this pull request
Nov 22, 2014
This commit is an implementation of [RFC 240][rfc] when applied to the standard library. It primarily deprecates the entirety of `string::raw`, `vec::raw`, `slice::raw`, and `str::raw` in favor of associated functions, methods, and other free functions. The detailed renaming is: * slice::raw::buf_as_slice => slice::with_raw_buf * slice::raw::mut_buf_as_slice => slice::with_raw_mut_buf * slice::shift_ptr => deprecated with no replacement * slice::pop_ptr => deprecated with no replacement * str::raw::from_utf8 => str::from_utf8_unchecked * str::raw::c_str_to_static_slice => str::from_c_str * str::raw::slice_bytes => deprecated for slice_unchecked (slight semantic diff) * str::raw::slice_unchecked => str.slice_unchecked * string::raw::from_parts => String::from_raw_parts * string::raw::from_buf_len => String::from_raw_buf_len * string::raw::from_buf => String::from_raw_buf * string::raw::from_utf8 => String::from_utf8_unchecked * vec::raw::from_buf => Vec::from_raw_buf All previous functions exist in their `#[deprecated]` form, and the deprecation messages indicate how to migrate to the newer variants. [rfc]: https://github.com/rust-lang/rfcs/blob/master/text/0240-unsafe-api-location.md [breaking-change] Closes rust-lang#17863
alexcrichton
force-pushed
the
issue-17863
branch
from
7ecb717 to
8ca27a6
Compare
bors
added a commit
that referenced
this pull request
Nov 23, 2014
This commit is an implementation of [RFC 240][rfc] when applied to the standard library. It primarily deprecates the entirety of `string::raw`, `vec::raw`, `slice::raw`, and `str::raw` in favor of associated functions, methods, and other free functions. The detailed renaming is: * slice::raw::buf_as_slice => slice::from_raw_buf * slice::raw::mut_buf_as_slice => slice::from_raw_mut_buf * slice::shift_ptr => deprecated with no replacement * slice::pop_ptr => deprecated with no replacement * str::raw::from_utf8 => str::from_utf8_unchecked * str::raw::c_str_to_static_slice => str::from_c_str * str::raw::slice_bytes => deprecated for slice_unchecked (slight semantic diff) * str::raw::slice_unchecked => str.slice_unchecked * string::raw::from_parts => String::from_raw_parts * string::raw::from_buf_len => String::from_raw_buf_len * string::raw::from_buf => String::from_raw_buf * string::raw::from_utf8 => String::from_utf8_unchecked * vec::raw::from_buf => Vec::from_raw_buf All previous functions exist in their `#[deprecated]` form, and the deprecation messages indicate how to migrate to the newer variants. [rfc]: https://github.com/rust-lang/rfcs/blob/master/text/0240-unsafe-api-location.md [breaking-change] Closes #17863
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit is an implementation of RFC 240 when applied to the standard
library. It primarily deprecates the entirety of
string::raw,vec::raw,slice::raw, andstr::rawin favor of associated functions, methods, andother free functions. The detailed renaming is:
All previous functions exist in their
#[deprecated]form, and the deprecationmessages indicate how to migrate to the newer variants.
[breaking-change]
Closes #17863