about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-02-25 02:07:14 +0000
committerbors <bors@rust-lang.org>2018-02-25 02:07:14 +0000
commit026339e42ba11a559767029d933d1197aefb877a (patch)
tree884a690f24c660b4ece0ea6818846920f82631f4 /src/libstd
parent28a1e4ffefa2620ad9f4179ea339833448874fd3 (diff)
parent52047f0ba0d1b1144073963b9b009399d32fb984 (diff)
downloadrust-026339e42ba11a559767029d933d1197aefb877a.tar.gz
rust-026339e42ba11a559767029d933d1197aefb877a.zip
Auto merge of #48520 - Manishearth:rollup, r=Manishearth
Rollup of 15 pull requests

- Successful merges: #47689, #48110, #48197, #48296, #48386, #48392, #48404, #48415, #48441, #48448, #48452, #48481, #48490, #48499, #48503
- Failed merges:
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/path.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/path.rs b/src/libstd/path.rs
index e03a182653e..4bbad30a5a3 100644
--- a/src/libstd/path.rs
+++ b/src/libstd/path.rs
@@ -1825,7 +1825,7 @@ impl Path {
     /// If the path is a normal file, this is the file name. If it's the path of a directory, this
     /// is the directory name.
     ///
-    /// Returns [`None`] If the path terminates in `..`.
+    /// Returns [`None`] if the path terminates in `..`.
     ///
     /// [`None`]: ../../std/option/enum.Option.html#variant.None
     ///