diff options
| author | Aron Parker <hl3mukkel@gmail.com> | 2022-04-22 11:02:04 +0200 |
|---|---|---|
| committer | Aron Parker <hl3mukkel@gmail.com> | 2022-04-22 11:02:04 +0200 |
| commit | 9a9d5534f04d81afc6fcdbe13fda490fcf595c60 (patch) | |
| tree | 79b5c58370180791183b7855d87ef1b9ae65a91f | |
| parent | 1158ade996d69498e946ca5901184aaa3e0edf4c (diff) | |
| download | rust-9a9d5534f04d81afc6fcdbe13fda490fcf595c60.tar.gz rust-9a9d5534f04d81afc6fcdbe13fda490fcf595c60.zip | |
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.
| -rw-r--r-- | library/std/src/sys/windows/mod.rs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/library/std/src/sys/windows/mod.rs b/library/std/src/sys/windows/mod.rs index 31c7208bbf1..8e1450e4d29 100644 --- a/library/std/src/sys/windows/mod.rs +++ b/library/std/src/sys/windows/mod.rs @@ -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<u16> = 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, |
