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.

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

std: Rename cstr_memory feature to use "raw" #27836

Merged
merged 1 commit into from
Aug 18, 2015

Conversation

alexcrichton
Copy link
Member

This commit renames the CString::{into_ptr, from_ptr} methods to into_raw
and from_raw to mirror the corresponding methods on Box and the naming of
"raw" for from_raw_parts on slices and vectors.

cc #27769

@rust-highfive
Copy link
Collaborator

r? @huonw

(rust_highfive has picked a reviewer for you, use r? to override)

@bors
Copy link
Contributor

bors commented Aug 16, 2015

☔ The latest upstream changes (presumably #27818) made this pull request unmergeable. Please resolve the merge conflicts.

/// 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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should say from_raw here.

@bluss
Copy link
Member

bluss commented Aug 18, 2015

r=me with the docs updated

@bluss bluss assigned bluss and unassigned huonw Aug 18, 2015
This commit renames the `CString::{into_ptr, from_ptr}` methods to `into_raw`
and `from_raw` to mirror the corresponding methods on `Box` and the naming of
"raw" for `from_raw_parts` on slices and vectors.

cc rust-lang#27769
@alexcrichton
Copy link
Member Author

@bors: r=bluss 3cf9e10

bors added a commit that referenced this pull request Aug 18, 2015
This commit renames the `CString::{into_ptr, from_ptr}` methods to `into_raw`
and `from_raw` to mirror the corresponding methods on `Box` and the naming of
"raw" for `from_raw_parts` on slices and vectors.

cc #27769
@bors
Copy link
Contributor

bors commented Aug 18, 2015

⌛ Testing commit 3cf9e10 with merge 2fb3fb2...

@bors bors merged commit 3cf9e10 into rust-lang:master Aug 18, 2015
@alexcrichton alexcrichton deleted the rename-cstring-raw branch August 21, 2015 21:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants