diff options
| author | bors <bors@rust-lang.org> | 2021-07-24 17:17:39 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-07-24 17:17:39 +0000 |
| commit | bddb59cf07efcf6e606f16b87f85e3ecd2c1ca69 (patch) | |
| tree | cc383acd5cf79e1b84b757bad894ebeb979246a1 /library/std | |
| parent | 18840b0719aa766a1bc49ea2eb5dc2e4cde7da3f (diff) | |
| parent | acfa3ac4052dfe127eee3fe8d352a48918bc2d9d (diff) | |
| download | rust-bddb59cf07efcf6e606f16b87f85e3ecd2c1ca69.tar.gz rust-bddb59cf07efcf6e606f16b87f85e3ecd2c1ca69.zip | |
Auto merge of #87434 - Manishearth:rollup-b09njin, r=Manishearth
Rollup of 9 pull requests Successful merges: - #87348 (Fix span when suggesting to add an associated type bound) - #87359 (Remove detection of rustup and cargo in 'missing extern crate' diagnostics) - #87370 (Add support for powerpc-unknown-freebsd) - #87389 (Rename `known_attrs` to `expanded_inert_attrs` and move to rustc_expand) - #87395 (Clear up std::env::set_var panic section.) - #87403 (Implement `AssignToDroppingUnionField` in THIR unsafeck) - #87410 (Mark `format_args_nl` as `#[doc(hidden)]`) - #87419 (IEEE 754 is not an RFC) - #87422 (DOC: remove unnecessary feature crate attribute from example code) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std')
| -rw-r--r-- | library/std/src/env.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/library/std/src/env.rs b/library/std/src/env.rs index 64f88c1aba6..5709d97d643 100644 --- a/library/std/src/env.rs +++ b/library/std/src/env.rs @@ -294,7 +294,7 @@ impl Error for VarError { } } -/// Sets the environment variable `k` to the value `v` for the currently running +/// Sets the environment variable `key` to the value `value` for the currently running /// process. /// /// Note that while concurrent access to environment variables is safe in Rust, @@ -310,9 +310,8 @@ impl Error for VarError { /// /// # Panics /// -/// This function may panic if `key` is empty, contains an ASCII equals sign -/// `'='` or the NUL character `'\0'`, or when the value contains the NUL -/// character. +/// This function may panic if `key` is empty, contains an ASCII equals sign `'='` +/// or the NUL character `'\0'`, or when `value` contains the NUL character. /// /// # Examples /// |