diff options
| author | bors <bors@rust-lang.org> | 2016-04-11 13:20:56 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-04-11 13:20:56 -0700 |
| commit | c0221c8897db309a79990367476177b1230bb264 (patch) | |
| tree | 2f4d930c57ca7921d12a61046a5852a3d21d73ae /src/libstd/path.rs | |
| parent | b622c3e0856767d8e53cf141e2e0a7b6d72a198b (diff) | |
| parent | 55e90bbd5eeaffb68f5d14b77c4a4a667d1f6877 (diff) | |
| download | rust-c0221c8897db309a79990367476177b1230bb264.tar.gz rust-c0221c8897db309a79990367476177b1230bb264.zip | |
Auto merge of #32882 - steveklabnik:rollup, r=steveklabnik
Rollup of 9 pull requests - Successful merges: #32768, #32802, #32815, #32823, #32849, #32854, #32862, #32870, #32873 - Failed merges:
Diffstat (limited to 'src/libstd/path.rs')
| -rw-r--r-- | src/libstd/path.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/path.rs b/src/libstd/path.rs index 5309cc3c858..f413bed86a8 100644 --- a/src/libstd/path.rs +++ b/src/libstd/path.rs @@ -466,7 +466,7 @@ enum State { Done = 3, } -/// A Windows path prefix, e.g. `C:` or `\server\share`. +/// A Windows path prefix, e.g. `C:` or `\\server\share`. /// /// Does not occur on Unix. #[stable(feature = "rust1", since = "1.0.0")] @@ -528,7 +528,7 @@ impl<'a> Hash for PrefixComponent<'a> { #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)] #[stable(feature = "rust1", since = "1.0.0")] pub enum Component<'a> { - /// A Windows path prefix, e.g. `C:` or `\server\share`. + /// A Windows path prefix, e.g. `C:` or `\\server\share`. /// /// Does not occur on Unix. #[stable(feature = "rust1", since = "1.0.0")] |