about summary refs log tree commit diff
path: root/src/libstd/sys/windows/path.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-11-30 12:42:44 +0000
committerbors <bors@rust-lang.org>2019-11-30 12:42:44 +0000
commitd8bdb3fdcbd88eb16e1a6669236122c41ed2aed3 (patch)
tree33974ee0e3d5976f284b056e03e6ef529d15e563 /src/libstd/sys/windows/path.rs
parent8f1bbd69e13c9e04a4c2b75612bc0c31af972439 (diff)
parentb14d9c21203ea79035bf4a8a8a68ad34658a265f (diff)
downloadrust-d8bdb3fdcbd88eb16e1a6669236122c41ed2aed3.tar.gz
rust-d8bdb3fdcbd88eb16e1a6669236122c41ed2aed3.zip
Auto merge of #66887 - dtolnay:rollup-uxowp8d, r=Centril
Rollup of 4 pull requests

Successful merges:

 - #66818 (Format libstd/os with rustfmt)
 - #66819 (Format libstd/sys with rustfmt)
 - #66820 (Format libstd with rustfmt)
 - #66847 (Allow any identifier as format arg name)

Failed merges:

r? @ghost
Diffstat (limited to 'src/libstd/sys/windows/path.rs')
-rw-r--r--src/libstd/sys/windows/path.rs9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/libstd/sys/windows/path.rs b/src/libstd/sys/windows/path.rs
index 7eae28cb14f..524f21f889b 100644
--- a/src/libstd/sys/windows/path.rs
+++ b/src/libstd/sys/windows/path.rs
@@ -1,6 +1,6 @@
-use crate::path::Prefix;
 use crate::ffi::OsStr;
 use crate::mem;
+use crate::path::Prefix;
 
 fn os_str_as_u8_slice(s: &OsStr) -> &[u8] {
     unsafe { mem::transmute(s) }
@@ -38,8 +38,9 @@ pub fn parse_prefix(path: &OsStr) -> Option<Prefix<'_>> {
                     // \\?\UNC\server\share
                     path = &path[4..];
                     let (server, share) = match parse_two_comps(path, is_verbatim_sep) {
-                        Some((server, share)) =>
-                            (u8_slice_as_os_str(server), u8_slice_as_os_str(share)),
+                        Some((server, share)) => {
+                            (u8_slice_as_os_str(server), u8_slice_as_os_str(share))
+                        }
                         None => (u8_slice_as_os_str(path), u8_slice_as_os_str(&[])),
                     };
                     return Some(VerbatimUNC(server, share));
@@ -70,7 +71,7 @@ pub fn parse_prefix(path: &OsStr) -> Option<Prefix<'_>> {
                 }
                 _ => (),
             }
-        } else if path.get(1) == Some(& b':') {
+        } else if path.get(1) == Some(&b':') {
             // C:
             let c = path[0];
             if c.is_ascii() && (c as char).is_alphabetic() {