about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-10-31 14:13:43 +0000
committerbors <bors@rust-lang.org>2015-10-31 14:13:43 +0000
commit1a2eaffb63aefba666f55abd992c5e2900654f06 (patch)
tree8ac40b0d925f7bc6add16ccc28d442eff41280b0 /src/libstd
parent57a0df6db50cc2c544690e07b6f7c4638c4de9c3 (diff)
parent4af19537b2d27397c3481ad52cca752843e5928c (diff)
downloadrust-1a2eaffb63aefba666f55abd992c5e2900654f06.tar.gz
rust-1a2eaffb63aefba666f55abd992c5e2900654f06.zip
Auto merge of #29487 - sfackler:current-exe-docs, r=steveklabnik
The "optionally" stuff just makes things confusing.

r? @steveklabnik 
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/env.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/env.rs b/src/libstd/env.rs
index 11eaeafec8f..6ed9b85a617 100644
--- a/src/libstd/env.rs
+++ b/src/libstd/env.rs
@@ -416,7 +416,7 @@ impl Error for JoinPathsError {
     fn description(&self) -> &str { self.inner.description() }
 }
 
-/// Optionally returns the path to the current user's home directory if known.
+/// Returns the path to the current user's home directory if known.
 ///
 /// # Unix
 ///
@@ -480,8 +480,8 @@ pub fn temp_dir() -> PathBuf {
     os_imp::temp_dir()
 }
 
-/// Optionally returns the filesystem path to the current executable which is
-/// running but with the executable name.
+/// Returns the filesystem path to the current executable which is running but
+/// with the executable name.
 ///
 /// The path returned is not necessarily a "real path" to the executable as
 /// there may be intermediate symlinks.