diff options
| author | bors <bors@rust-lang.org> | 2022-09-01 22:12:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-09-01 22:12:32 +0000 |
| commit | 10706d62da83c4ec215165bc72df46219536648f (patch) | |
| tree | 56447cae81680c661c794e470279f32f9dbf7f8a /library/std | |
| parent | 2e35f954ada0f0c777844dc4fa66684efe90a035 (diff) | |
| parent | 1c12dedd5382804b6ea289e36969340194f8d44c (diff) | |
| download | rust-10706d62da83c4ec215165bc72df46219536648f.tar.gz rust-10706d62da83c4ec215165bc72df46219536648f.zip | |
Auto merge of #101295 - matthiaskrgr:rollup-046o38p, r=matthiaskrgr
Rollup of 14 pull requests
Successful merges:
- #94467 (Add `special_module_name` lint)
- #100852 (Use `getuid` to check instead of `USER` env var in rustbuild)
- #101072 (bootstrap: Add llvm-has-rust-patches target option)
- #101190 (Make docs formulation more consistent for NonZero{int})
- #101245 (Remove unneeded where whitespace)
- #101251 (Fix bad target name in Walkthrough)
- #101254 (rustdoc: remove unused `.docblock .impl-items` CSS)
- #101256 (Fixes/adjustments to Fuchsia doc walkthrough)
- #101270 (Update outdated comment about output capturing in print_to.)
- #101271 (Fix filename of armv4t-none-eabi.md)
- #101274 (Fix typo in comment)
- #101279 (Fix doc_auto_cfg for impl blocks in different modules with different `cfg`)
- #101285 (Do not suggest adding `move` to closure when `move` is already used)
- #101292 (rustdoc: remove unneeded CSS `.content table td:first-child > a`)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'library/std')
| -rw-r--r-- | library/std/src/io/stdio.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/library/std/src/io/stdio.rs b/library/std/src/io/stdio.rs index 4d3736f7914..07239746258 100644 --- a/library/std/src/io/stdio.rs +++ b/library/std/src/io/stdio.rs @@ -986,10 +986,10 @@ pub fn set_output_capture(sink: Option<LocalStream>) -> Option<LocalStream> { /// otherwise. `label` identifies the stream in a panic message. /// /// This function is used to print error messages, so it takes extra -/// care to avoid causing a panic when `local_s` is unusable. -/// For instance, if the TLS key for the local stream is -/// already destroyed, or if the local stream is locked by another -/// thread, it will just fall back to the global stream. +/// care to avoid causing a panic when `OUTPUT_CAPTURE` is unusable. +/// For instance, if the TLS key for output capturing is already destroyed, or +/// if the local stream is in use by another thread, it will just fall back to +/// the global stream. /// /// However, if the actual I/O causes an error, this function does panic. fn print_to<T>(args: fmt::Arguments<'_>, global_s: fn() -> T, label: &str) |
