Skip to content

Add try_reserve and try_reserve_exact for OsString #92338

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

Merged
bors merged 7 commits into from
Jan 1, 2022
Merged

Add try_reserve and try_reserve_exact for OsString #92338

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c40ac57
Add try_reserve for OsString
Xuanwo Dec 28, 2021
013fbc6
Fix windows build
Xuanwo Dec 28, 2021
27b92c9
Implement support in wtf8
Xuanwo Dec 28, 2021
9166428
Update library/std/src/ffi/os_str.rs
Xuanwo Dec 29, 2021
b07ae1c
Address comments
Xuanwo Dec 29, 2021
1f62c24
Fix some copy/paste hysteresis in OsString try_reserve docs
dtolnay Dec 30, 2021
d29941e
Remove needless allocation from example code of OsString
dtolnay Dec 30, 2021
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
Prev Previous commit
Next Next commit
Fix some copy/paste hysteresis in OsString try_reserve docs 
It appears `find_max_slow` comes from the BinaryHeap docs, where the
try_reserve example is a slow implementation of find_max. It has no
relevance to this code in OsString though.
  • Loading branch information
@dtolnay
dtolnay committed Dec 30, 2021
commit 1f62c24d5a11fcbc3b9d489bcac9492daf7fb82a
8 changes: 4 additions & 4 deletions library/std/src/ffi/os_str.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ impl OsString {
/// use std::ffi::OsString;
/// use std::collections::TryReserveError;
///
/// fn find_max_slow(data: &str) -> Result<OsString, TryReserveError> {
/// fn process_data(data: &str) -> Result<OsString, TryReserveError> {
/// let mut s = OsString::new();
///
/// // Pre-reserve the memory, exiting if we can't
Expand All @@ -295,7 +295,7 @@ impl OsString {
///
/// Ok(s)
/// }
/// # find_max_slow("123").expect("why is the test harness OOMing on 12 bytes?");
/// # process_data("123").expect("why is the test harness OOMing on 3 bytes?");
/// ```
#[unstable(feature = "try_reserve_2", issue = "91789")]
#[inline]
Expand Down Expand Up @@ -352,7 +352,7 @@ impl OsString {
/// use std::ffi::OsString;
/// use std::collections::TryReserveError;
///
/// fn find_max_slow(data: &str) -> Result<OsString, TryReserveError> {
/// fn process_data(data: &str) -> Result<OsString, TryReserveError> {
/// let mut s = OsString::new();
///
/// // Pre-reserve the memory, exiting if we can't
Expand All @@ -363,7 +363,7 @@ impl OsString {
///
/// Ok(s)
/// }
/// # find_max_slow("123").expect("why is the test harness OOMing on 12 bytes?");
/// # process_data("123").expect("why is the test harness OOMing on 3 bytes?");
/// ```
#[unstable(feature = "try_reserve_2", issue = "91789")]
#[inline]
Expand Down