about summary refs log tree commit diff
path: root/library/std/src/rt.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-12-30 16:10:00 +0000
committerbors <bors@rust-lang.org>2022-12-30 16:10:00 +0000
commitbbdca4c28fd9b57212cb3316ff4ffb1529affcbe (patch)
tree62b632d0bd97f16b4d675ca0b9112e69976b4d61 /library/std/src/rt.rs
parent7c991868c60a4afc1ee6334b912ea96061a2c98d (diff)
parent3f9909a7c4183a7e4e46ee346a045ec876ed118b (diff)
downloadrust-bbdca4c28fd9b57212cb3316ff4ffb1529affcbe.tar.gz
rust-bbdca4c28fd9b57212cb3316ff4ffb1529affcbe.zip
Auto merge of #106296 - matthiaskrgr:rollup-ukdbqwx, r=matthiaskrgr
Rollup of 4 pull requests

Successful merges:

 - #99244 (doc: clearer and more correct Iterator::scan)
 - #103707 (Replace libstd, libcore, liballoc terminology in docs)
 - #104182 (`IN6ADDR_ANY_INIT` and `IN6ADDR_LOOPBACK_INIT` documentation.)
 - #106273 (rustdoc: remove redundant CSS `.source .content { overflow: visible }`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src/rt.rs')
-rw-r--r--library/std/src/rt.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/library/std/src/rt.rs b/library/std/src/rt.rs
index 9c2f0c1dd3e..f1eeb75be7c 100644
--- a/library/std/src/rt.rs
+++ b/library/std/src/rt.rs
@@ -139,9 +139,9 @@ fn lang_start_internal(
     // mechanism itself.
     //
     // There are a couple of instances where unwinding can begin. First is inside of the
-    // `rt::init`, `rt::cleanup` and similar functions controlled by libstd. In those instances a
-    // panic is a libstd implementation bug. A quite likely one too, as there isn't any way to
-    // prevent libstd from accidentally introducing a panic to these functions. Another is from
+    // `rt::init`, `rt::cleanup` and similar functions controlled by bstd. In those instances a
+    // panic is a std implementation bug. A quite likely one too, as there isn't any way to
+    // prevent std from accidentally introducing a panic to these functions. Another is from
     // user code from `main` or, more nefariously, as described in e.g. issue #86030.
     // SAFETY: Only called once during runtime initialization.
     panic::catch_unwind(move || unsafe { init(argc, argv, sigpipe) }).map_err(rt_abort)?;