Skip to content

Commit 9e6f382

Browse files
committed
---
yaml --- r: 227621 b: refs/heads/try c: 913c227 h: refs/heads/master i: 227619: 964df45 v: v3
1 parent de399d3 commit 9e6f382

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: aca2057ed5fb7af3f8905b2bc01f72fa001c35c8
33
refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
4-
refs/heads/try: c9b40a30c0a8c5776920aec54039d0571e903f5a
4+
refs/heads/try: 913c2273eba32c7a33e068a5ac68007d7f8419d1
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
66
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
77
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/liballoc/boxed.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ impl<T : ?Sized> Box<T> {
124124
#[unstable(feature = "box_raw",
125125
reason = "may be renamed or moved out of Box scope")]
126126
#[inline]
127+
// NB: may want to be called from_ptr, see comments on CStr::from_ptr
127128
pub unsafe fn from_raw(raw: *mut T) -> Self {
128129
mem::transmute(raw)
129130
}
@@ -147,6 +148,7 @@ impl<T : ?Sized> Box<T> {
147148
/// ```
148149
#[unstable(feature = "box_raw", reason = "may be renamed")]
149150
#[inline]
151+
// NB: may want to be called into_ptr, see comments on CStr::from_ptr
150152
pub fn into_raw(b: Box<T>) -> *mut T {
151153
unsafe { mem::transmute(b) }
152154
}

branches/try/src/libstd/ffi/c_str.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,9 @@ impl CString {
206206
/// `into_ptr`. The length of the string will be recalculated
207207
/// using the pointer.
208208
#[unstable(feature = "cstr_memory", reason = "recently added")]
209+
// NB: may want to be called from_raw, needs to consider CStr::from_ptr,
210+
// Box::from_raw (or whatever it's currently called), and
211+
// slice::from_raw_parts
209212
pub unsafe fn from_ptr(ptr: *const libc::c_char) -> CString {
210213
let len = libc::strlen(ptr) + 1; // Including the NUL byte
211214
let slice = slice::from_raw_parts(ptr, len as usize);
@@ -221,6 +224,7 @@ impl CString {
221224
///
222225
/// Failure to call `from_ptr` will lead to a memory leak.
223226
#[unstable(feature = "cstr_memory", reason = "recently added")]
227+
// NB: may want to be called into_raw, see comments on from_ptr
224228
pub fn into_ptr(self) -> *const libc::c_char {
225229
// It is important that the bytes be sized to fit - we need
226230
// the capacity to be determinable from the string length, and

0 commit comments

Comments
 (0)