diff options
| author | bors <bors@rust-lang.org> | 2019-05-25 04:10:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-25 04:10:07 +0000 |
| commit | 315ab95a9c13cbb69ae8538fcd69b9f7b0c30f89 (patch) | |
| tree | 11c1b9e9c76d0de8760e02fdca7690e9b8bfd0de /src/libstd | |
| parent | 524580312039e4fa5ccf91e8f7093cd755bc1aad (diff) | |
| parent | 19b5a103461c7bce5d53db64380360a684c1ce7d (diff) | |
| download | rust-315ab95a9c13cbb69ae8538fcd69b9f7b0c30f89.tar.gz rust-315ab95a9c13cbb69ae8538fcd69b9f7b0c30f89.zip | |
Auto merge of #61150 - Centril:rollup-wmm7qga, r=Centril
Rollup of 13 pull requests Successful merges: - #61026 (Tweak macro parse errors when reaching EOF during macro call parse) - #61095 (Update cargo) - #61096 (tidy: don't short-circuit on license error) - #61107 (Fix a couple docs typos) - #61110 (Revert edition-guide toolstate override) - #61111 (Fixed type-alias-bounds lint doc) - #61113 (Deprecate `FnBox`. `Box<dyn FnOnce()>` can be called directly, since 1.35) - #61116 (Remove the incorrect warning from README.md) - #61118 (Dont ICE on an attempt to use GAT without feature gate) - #61121 (improve debug-printing of scalars) - #61125 (Updated my mailmap entry) - #61134 (Annotate each `reverse_bits` with `#[must_use]`) - #61138 (Move async/await tests to their own folder) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/env.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libstd/env.rs b/src/libstd/env.rs index 9058ea93d6d..00e840a53e9 100644 --- a/src/libstd/env.rs +++ b/src/libstd/env.rs @@ -465,7 +465,7 @@ pub struct JoinPathsError { /// # } /// ``` /// -/// Using `env::join_paths` with `env::spit_paths` to append an item to the `PATH` environment +/// Using `env::join_paths` with [`env::split_paths`] to append an item to the `PATH` environment /// variable: /// /// ``` @@ -483,6 +483,8 @@ pub struct JoinPathsError { /// Ok(()) /// } /// ``` +/// +/// [`env::split_paths`]: fn.split_paths.html #[stable(feature = "env", since = "1.0.0")] pub fn join_paths<I, T>(paths: I) -> Result<OsString, JoinPathsError> where I: IntoIterator<Item=T>, T: AsRef<OsStr> |