diff options
| author | bors <bors@rust-lang.org> | 2022-08-24 01:17:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-08-24 01:17:52 +0000 |
| commit | 25ea5a36c6e3a4fa1f739538d9e89eb1cd747564 (patch) | |
| tree | 1b0a34108e05895e8e5026f5555b4d9b893837a6 /library/std/src/sys/windows | |
| parent | 87991d5f5d72d6baca490141cb890211ba2f3843 (diff) | |
| parent | ddeb936c6d797d47ec8652c885c8a2cceba8386f (diff) | |
| download | rust-25ea5a36c6e3a4fa1f739538d9e89eb1cd747564.tar.gz rust-25ea5a36c6e3a4fa1f739538d9e89eb1cd747564.zip | |
Auto merge of #96869 - sunfishcode:main, r=joshtriplett
Optimize `Wtf8Buf::into_string` for the case where it contains UTF-8. Add a `is_known_utf8` flag to `Wtf8Buf`, which tracks whether the string is known to contain UTF-8. This is efficiently computed in many common situations, such as when a `Wtf8Buf` is constructed from a `String` or `&str`, or with `Wtf8Buf::from_wide` which is already doing UTF-16 decoding and already checking for surrogates. This makes `OsString::into_string` O(1) rather than O(N) on Windows in common cases. And, it eliminates the need to scan through the string for surrogates in `Args::next` and `Vars::next`, because the strings are already being translated with `Wtf8Buf::from_wide`. Many things on Windows construct `OsString`s with `Wtf8Buf::from_wide`, such as `DirEntry::file_name` and `fs::read_link`, so with this patch, users of those functions can subsequently call `.into_string()` without paying for an extra scan through the string for surrogates. r? `@ghost`
Diffstat (limited to 'library/std/src/sys/windows')
| -rw-r--r-- | library/std/src/sys/windows/os_str.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/library/std/src/sys/windows/os_str.rs b/library/std/src/sys/windows/os_str.rs index 11883f15022..4bdd8c505ff 100644 --- a/library/std/src/sys/windows/os_str.rs +++ b/library/std/src/sys/windows/os_str.rs @@ -164,9 +164,7 @@ impl Slice { } pub fn to_owned(&self) -> Buf { - let mut buf = Wtf8Buf::with_capacity(self.inner.len()); - buf.push_wtf8(&self.inner); - Buf { inner: buf } + Buf { inner: self.inner.to_owned() } } pub fn clone_into(&self, buf: &mut Buf) { |
