Skip to content

Commit

Permalink
Auto merge of #96314 - AronParker:issue-96297-fix, r=thomcc
Browse files Browse the repository at this point in the history
Reduce allocations for path conversions on Windows

Previously, UTF-8 to UTF-16 Path conversions on Windows unnecessarily allocate twice, as described in #96297. This commit fixes that issue.
  • Loading branch information
bors committed Apr 23, 2022
2 parents 8834629 + 6cfdeaf commit 64c5deb
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion library/std/src/sys/windows/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,13 @@ pub fn unrolled_find_u16s(needle: u16, haystack: &[u16]) -> Option<usize> {

pub fn to_u16s<S: AsRef<OsStr>>(s: S) -> crate::io::Result<Vec<u16>> {
fn inner(s: &OsStr) -> crate::io::Result<Vec<u16>> {
let mut maybe_result: Vec<u16> = s.encode_wide().collect();
// Most paths are ASCII, so reserve capacity for as much as there are bytes
// in the OsStr plus one for the null-terminating character. We are not
// wasting bytes here as paths created by this function are primarily used
// in an ephemeral fashion.
let mut maybe_result = Vec::with_capacity(s.len() + 1);
maybe_result.extend(s.encode_wide());

if unrolled_find_u16s(0, &maybe_result).is_some() {
return Err(crate::io::const_io_error!(
ErrorKind::InvalidInput,
Expand Down

0 comments on commit 64c5deb

Please sign in to comment.