Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for custom allocator for (C)String #79500

Closed
wants to merge 3 commits into from
Closed

Add support for custom allocator for (C)String #79500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba2d28f
Add support for custom allocators in `String`
TimDiekmann Nov 28, 2020
83ae028
Add custom allocator support for `CString`
TimDiekmann Nov 28, 2020
61ce8e0
Satisfy tidy
TimDiekmann Nov 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion library/alloc/src/alloc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ extern "Rust" {
/// Note: while this type is unstable, the functionality it provides can be
/// accessed through the [free functions in `alloc`](self#functions).
#[unstable(feature = "allocator_api", issue = "32838")]
#[derive(Copy, Clone, Default, Debug)]
#[derive(Copy, Clone, Default, Debug, Ord, PartialOrd, Eq, PartialEq)]
#[cfg(not(test))]
pub struct Global;

Expand Down
6 changes: 4 additions & 2 deletions library/alloc/src/str.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
// It's cleaner to just turn off the unused_imports warning than to fix them.
#![allow(unused_imports)]

use core::alloc::AllocRef;
use core::borrow::{Borrow, BorrowMut};
use core::iter::FusedIterator;
use core::mem;
Expand Down Expand Up @@ -571,6 +572,7 @@ impl str {
/// ```
#[stable(feature = "str_box_extras", since = "1.20.0")]
#[inline]
pub unsafe fn from_boxed_utf8_unchecked(v: Box<[u8]>) -> Box<str> {
unsafe { Box::from_raw(Box::into_raw(v) as *mut str) }
pub unsafe fn from_boxed_utf8_unchecked<A: AllocRef>(v: Box<[u8], A>) -> Box<str, A> {
let (slice, alloc) = Box::into_raw_with_alloc(v);
unsafe { Box::from_raw_in(slice as *mut str, alloc) }
}
Loading