about summary refs log tree commit diff
path: root/src/libstd/path.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-07-24 20:15:21 +0000
committerbors <bors@rust-lang.org>2017-07-24 20:15:21 +0000
commit598eddf4f785df12e79fba5a996f153dc6fdb7e0 (patch)
tree3fb84fd0a941dcfa2aaf1d627259301732b0ec42 /src/libstd/path.rs
parentb80e946101dd49dd1864b6229f9430c55036c7ce (diff)
parent0bb4291295b672d53edf816b5bde2d78c110d654 (diff)
downloadrust-598eddf4f785df12e79fba5a996f153dc6fdb7e0.tar.gz
rust-598eddf4f785df12e79fba5a996f153dc6fdb7e0.zip
Auto merge of #43454 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
Rollup of 11 pull requests

- Successful merges: #43297, #43322, #43342, #43361, #43366, #43374, #43379, #43401, #43421, #43428, #43446
- Failed merges:
Diffstat (limited to 'src/libstd/path.rs')
-rw-r--r--src/libstd/path.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/path.rs b/src/libstd/path.rs
index 432605cf3b2..619d0795421 100644
--- a/src/libstd/path.rs
+++ b/src/libstd/path.rs
@@ -476,7 +476,7 @@ impl<'a> Hash for PrefixComponent<'a> {
 
 /// A single component of a path.
 ///
-/// A `Component` roughtly corresponds to a substring between path separators
+/// A `Component` roughly corresponds to a substring between path separators
 /// (`/` or `\`).
 ///
 /// This `enum` is created by iterating over [`Components`], which in turn is
@@ -571,7 +571,7 @@ impl<'a> AsRef<OsStr> for Component<'a> {
     }
 }
 
-/// An interator over the [`Component`]s of a [`Path`].
+/// An iterator over the [`Component`]s of a [`Path`].
 ///
 /// This `struct` is created by the [`components`] method on [`Path`].
 /// See its documentation for more.
@@ -2019,7 +2019,7 @@ impl Path {
     /// * Repeated separators are ignored, so `a/b` and `a//b` both have
     ///   `a` and `b` as components.
     ///
-    /// * Occurences of `.` are normalized away, except if they are at the
+    /// * Occurrences of `.` are normalized away, except if they are at the
     ///   beginning of the path. For example, `a/./b`, `a/b/`, `a/b/.` and
     ///   `a/b` all have `a` and `b` as components, but `./a/b` starts with
     ///   an additional [`CurDir`] component.