diff options
| author | bors <bors@rust-lang.org> | 2015-10-02 09:11:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-10-02 09:11:34 +0000 |
| commit | 70076ec8b22cba7689c76afef7085cb6917793ef (patch) | |
| tree | beb4dc6391a90dfbe6ad45b033d364fca311e40f /src/libstd | |
| parent | a004ff5cafb6111bcb3a00d67133a84ff727bad1 (diff) | |
| parent | e4797fa22185f9ca52734ab4092754dd5963b3da (diff) | |
| download | rust-70076ec8b22cba7689c76afef7085cb6917793ef.tar.gz rust-70076ec8b22cba7689c76afef7085cb6917793ef.zip | |
Auto merge of #28807 - Manishearth:rollup, r=Manishearth
- Successful merges: #28554, #28686, #28786, #28788, #28791, #28797 - Failed merges:
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/ffi/c_str.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/ffi/c_str.rs b/src/libstd/ffi/c_str.rs index 7c9c2066ae9..6b7ecaa77d1 100644 --- a/src/libstd/ffi/c_str.rs +++ b/src/libstd/ffi/c_str.rs @@ -206,7 +206,7 @@ impl CString { /// Retakes ownership of a CString that was transferred to C. /// /// The only appropriate argument is a pointer obtained by calling - /// `into_ptr`. The length of the string will be recalculated + /// `into_raw`. The length of the string will be recalculated /// using the pointer. #[unstable(feature = "cstr_memory2", reason = "recently added", issue = "27769")] @@ -245,11 +245,11 @@ impl CString { /// Transfers ownership of the string to a C caller. /// /// The pointer must be returned to Rust and reconstituted using - /// `from_ptr` to be properly deallocated. Specifically, one + /// `from_raw` to be properly deallocated. Specifically, one /// should *not* use the standard C `free` function to deallocate /// this string. /// - /// Failure to call `from_ptr` will lead to a memory leak. + /// Failure to call `from_raw` will lead to a memory leak. #[stable(feature = "cstr_memory", since = "1.4.0")] pub fn into_raw(self) -> *mut libc::c_char { Box::into_raw(self.inner) as *mut libc::c_char |