diff options
| author | bors <bors@rust-lang.org> | 2015-05-17 06:25:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-05-17 06:25:58 +0000 |
| commit | 9f3a7f0c2bba10164c1e8581e2b3da7f9524178c (patch) | |
| tree | 4822093f18d67cd2acbbded5d23c2f1b1eeeacfc /src/libstd/path.rs | |
| parent | 4f83c4b8513fe77ab27e1f8d07cf5c7d577a1fe2 (diff) | |
| parent | a0815c8c747eb63adec7b863047c0f176eafce94 (diff) | |
| download | rust-9f3a7f0c2bba10164c1e8581e2b3da7f9524178c.tar.gz rust-9f3a7f0c2bba10164c1e8581e2b3da7f9524178c.zip | |
Auto merge of #25525 - Manishearth:rollup, r=Manishearth
- Successful merges: #25465, #25469, #25472, #25474, #25476, #25484, #25490, #25493, #25503, #25506, #25508, #25510, #25516, #25522 - 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 934b3156357..6732af556e0 100644 --- a/src/libstd/path.rs +++ b/src/libstd/path.rs @@ -1485,7 +1485,7 @@ impl Path { iter_after(self.components().rev(), child.as_ref().components().rev()).is_some() } - /// Extracts the stem (non-extension) portion of `self.file()`. + /// Extracts the stem (non-extension) portion of `self.file_name()`. /// /// The stem is: /// @@ -1508,7 +1508,7 @@ impl Path { self.file_name().map(split_file_at_dot).and_then(|(before, after)| before.or(after)) } - /// Extracts the extension of `self.file()`, if possible. + /// Extracts the extension of `self.file_name()`, if possible. /// /// The extension is: /// |