diff options
| author | bors <bors@rust-lang.org> | 2016-03-30 11:33:31 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-03-30 11:33:31 -0700 |
| commit | bfacabc6a2b59771aa336ff420c363d9695a6ad2 (patch) | |
| tree | 4b20bb126b45e2b7d4b7f941ac68b5acad25902b /src/libstd | |
| parent | 102a5be7126ef8f1e79086b98d1d9faf47ba8ece (diff) | |
| parent | 2ba860677c436e6aea62f2c64dca7a2c83384a31 (diff) | |
| download | rust-bfacabc6a2b59771aa336ff420c363d9695a6ad2.tar.gz rust-bfacabc6a2b59771aa336ff420c363d9695a6ad2.zip | |
Auto merge of #32621 - steveklabnik:rollup, r=steveklabnik
Rollup of 7 pull requests - Successful merges: #32580, #32591, #32603, #32605, #32606, #32607, #32608 - Failed merges:
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/env.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/libstd/env.rs b/src/libstd/env.rs index 749e58c1196..40f6528f63e 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() } } -/// Returns the path to the current user's home directory if known. +/// Returns the path of the current user's home directory if known. /// /// # Unix /// @@ -450,7 +450,7 @@ pub fn home_dir() -> Option<PathBuf> { os_imp::home_dir() } -/// Returns the path to a temporary directory. +/// Returns the path of a temporary directory. /// /// On Unix, returns the value of the 'TMPDIR' environment variable if it is /// set, otherwise for non-Android it returns '/tmp'. If Android, since there @@ -459,7 +459,7 @@ pub fn home_dir() -> Option<PathBuf> { /// /// On Windows, returns the value of, in order, the 'TMP', 'TEMP', /// 'USERPROFILE' environment variable if any are set and not the empty -/// string. Otherwise, tmpdir returns the path to the Windows directory. This +/// string. Otherwise, tmpdir returns the path of the Windows directory. This /// behavior is identical to that of [GetTempPath][msdn], which this function /// uses internally. /// @@ -482,14 +482,14 @@ pub fn temp_dir() -> PathBuf { os_imp::temp_dir() } -/// Returns the full filesystem path to the current running executable. +/// Returns the full filesystem path of the current running executable. /// -/// The path returned is not necessarily a "real path" to the executable as +/// The path returned is not necessarily a "real path" of the executable as /// there may be intermediate symlinks. /// /// # Errors /// -/// Acquiring the path to the current executable is a platform-specific operation +/// Acquiring the path of the current executable is a platform-specific operation /// that can fail for a good number of reasons. Some errors can include, but not /// be limited to, filesystem operations failing or general syscall failures. /// @@ -526,7 +526,7 @@ pub struct ArgsOs { inner: os_imp::Args } /// Returns the arguments which this program was started with (normally passed /// via the command line). /// -/// The first element is traditionally the path to the executable, but it can be +/// The first element is traditionally the path of the executable, but it can be /// set to arbitrary text, and may not even exist. This means this property should /// not be relied upon for security purposes. /// @@ -554,7 +554,7 @@ pub fn args() -> Args { /// Returns the arguments which this program was started with (normally passed /// via the command line). /// -/// The first element is traditionally the path to the executable, but it can be +/// The first element is traditionally the path of the executable, but it can be /// set to arbitrary text, and it may not even exist, so this property should /// not be relied upon for security purposes. /// |
