diff options
| author | bors <bors@rust-lang.org> | 2022-09-19 14:06:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-09-19 14:06:23 +0000 |
| commit | a55dd71d5fb0ec5a6a3a9e8c27b2127ba491ce52 (patch) | |
| tree | 2de5a3c571f7f5b54f4922b644f72f33786eb0e0 /library/std/src/sys/windows/path.rs | |
| parent | b31188e88b245f48b364c6cb186b821bd472bd8a (diff) | |
| parent | 7358a9b03e5d22ea4d74d89cb00d3985fc89c773 (diff) | |
| download | rust-1.64.0.tar.gz rust-1.64.0.zip | |
Auto merge of #102018 - pietroalbini:pa-1.64.0, r=pietroalbini 1.64.0
[stable] Prepare 1.64.0 release This PR prepares the 1.64.0 stable release builds. In addition to bumping the channel and including the latest release notes changes, this PR also backports the following PRs: * #100852 * #101366 * #101468 * #101922 This PR also reverts the following PRs, as decided in https://github.com/rust-lang/rust/issues/101899#issuecomment-1250996783: * https://github.com/rust-lang/rust/pull/95295 * https://github.com/rust-lang/rust/pull/99136 (followup to the previous PR) r? `@ghost` cc `@rust-lang/release`
Diffstat (limited to 'library/std/src/sys/windows/path.rs')
| -rw-r--r-- | library/std/src/sys/windows/path.rs | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/library/std/src/sys/windows/path.rs b/library/std/src/sys/windows/path.rs index a0f82207099..beeca1917a9 100644 --- a/library/std/src/sys/windows/path.rs +++ b/library/std/src/sys/windows/path.rs @@ -198,14 +198,7 @@ fn parse_next_component(path: &OsStr, verbatim: bool) -> (&OsStr, &OsStr) { match path.bytes().iter().position(|&x| separator(x)) { Some(separator_start) => { - let mut separator_end = separator_start + 1; - - // a series of multiple separator characters is treated as a single separator, - // except in verbatim paths - while !verbatim && separator_end < path.len() && separator(path.bytes()[separator_end]) - { - separator_end += 1; - } + let separator_end = separator_start + 1; let component = &path.bytes()[..separator_start]; |