-
Notifications
You must be signed in to change notification settings - Fork 13.3k
Use less CString in the examples of CStr. #136187
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -55,18 +55,15 @@ use crate::{fmt, ops, slice, str}; | |
/// Passing a Rust-originating C string: | ||
/// | ||
/// ``` | ||
/// use std::ffi::{CString, CStr}; | ||
/// use std::ffi::CStr; | ||
/// use std::os::raw::c_char; | ||
/// | ||
/// fn work(data: &CStr) { | ||
/// # /* Extern functions are awkward in doc comments - fake it instead | ||
/// extern "C" { fn work_with(data: *const c_char); } | ||
/// # */ unsafe extern "C" fn work_with(s: *const c_char) {} | ||
/// | ||
/// unsafe extern "C" fn work_with(s: *const c_char) {} | ||
/// unsafe { work_with(data.as_ptr()) } | ||
/// } | ||
/// | ||
/// let s = CString::new("data data data data").expect("CString::new failed"); | ||
/// let s = c"Hello world!"; | ||
/// work(&s); | ||
/// ``` | ||
/// | ||
|
@@ -384,13 +381,12 @@ impl CStr { | |
/// # Examples | ||
/// | ||
/// ``` | ||
/// use std::ffi::{CStr, CString}; | ||
/// use std::ffi::CStr; | ||
/// | ||
/// unsafe { | ||
/// let cstring = CString::new("hello").expect("CString::new failed"); | ||
/// let cstr = CStr::from_bytes_with_nul_unchecked(cstring.to_bytes_with_nul()); | ||
/// assert_eq!(cstr, &*cstring); | ||
/// } | ||
/// let bytes = b"Hello world!\0"; | ||
/// | ||
/// let cstr = unsafe { CStr::from_bytes_with_nul_unchecked(bytes) }; | ||
/// assert_eq!(cstr.to_bytes_with_nul(), bytes); | ||
workingjubilee marked this conversation as resolved.
Show resolved
Hide resolved
|
||
/// ``` | ||
#[inline] | ||
#[must_use] | ||
|
@@ -449,38 +445,43 @@ impl CStr { | |
/// behavior when `ptr` is used inside the `unsafe` block: | ||
/// | ||
/// ```no_run | ||
/// # #![allow(unused_must_use)] | ||
/// # #![expect(dangling_pointers_from_temporaries)] | ||
/// use std::ffi::CString; | ||
/// use std::ffi::{CStr, CString}; | ||
/// | ||
/// // Do not do this: | ||
/// let ptr = CString::new("Hello").expect("CString::new failed").as_ptr(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Here, we called |
||
/// unsafe { | ||
/// // `ptr` is dangling | ||
/// *ptr; | ||
/// } | ||
/// // 💀 The meaning of this entire program is undefined, | ||
/// // 💀 and nothing about its behavior is guaranteed, | ||
/// // 💀 not even that its behavior resembles the code as written, | ||
/// // 💀 just because it contains a single instance of undefined behavior! | ||
/// | ||
/// // 🚨 creates a dangling pointer to a temporary `CString` | ||
/// // 🚨 that is deallocated at the end of the statement | ||
/// let ptr = CString::new("Hi!".to_uppercase()).unwrap().as_ptr(); | ||
/// | ||
/// // without undefined behavior, you would expect that `ptr` equals: | ||
/// dbg!(CStr::from_bytes_with_nul(b"HI!\0").unwrap()); | ||
/// | ||
/// // 🙏 Possibly the program behaved as expected so far, | ||
/// // 🙏 and this just shows `ptr` is now garbage..., but | ||
/// // 💀 this violates `CStr::from_ptr`'s safety contract | ||
/// // 💀 leading to a dereference of a dangling pointer, | ||
/// // 💀 which is immediate undefined behavior. | ||
/// // 💀 *BOOM*, you're dead, you're entire program has no meaning. | ||
/// dbg!(unsafe { CStr::from_ptr(ptr) }); | ||
/// ``` | ||
/// | ||
/// This happens because the pointer returned by `as_ptr` does not carry any | ||
/// lifetime information and the `CString` is deallocated immediately after | ||
/// the `CString::new("Hello").expect("CString::new failed").as_ptr()` | ||
/// expression is evaluated. | ||
/// This happens because, the pointer returned by `as_ptr` does not carry any | ||
/// lifetime information, and the `CString` is deallocated immediately after | ||
/// the expression that it is part of has been evaluated. | ||
/// To fix the problem, bind the `CString` to a local variable: | ||
/// | ||
/// ```no_run | ||
/// # #![allow(unused_must_use)] | ||
/// use std::ffi::CString; | ||
/// | ||
/// let hello = CString::new("Hello").expect("CString::new failed"); | ||
/// let ptr = hello.as_ptr(); | ||
/// unsafe { | ||
/// // `ptr` is valid because `hello` is in scope | ||
/// *ptr; | ||
/// } | ||
/// ``` | ||
/// use std::ffi::{CStr, CString}; | ||
/// | ||
/// This way, the lifetime of the `CString` in `hello` encompasses | ||
/// the lifetime of `ptr` and the `unsafe` block. | ||
/// let c_str = CString::new("Hi!".to_uppercase()).unwrap(); | ||
/// let ptr = c_str.as_ptr(); | ||
/// | ||
/// assert_eq!(unsafe { CStr::from_ptr(ptr) }, c"HI!"); | ||
/// ``` | ||
#[inline] | ||
#[must_use] | ||
#[stable(feature = "rust1", since = "1.0.0")] | ||
|
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
as is this
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since you're here, do you have any idea about "/* Extern functions are awkward in doc comments - fake it instead"?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's just a comment about how linking functions gets weird in rustdoc tests.