about summary refs log tree commit diff
path: root/library/panic_unwind/src/lib.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/panic_unwind/src/lib.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/panic_unwind/src/lib.rs')
-rw-r--r--library/panic_unwind/src/lib.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/library/panic_unwind/src/lib.rs b/library/panic_unwind/src/lib.rs
index 7e7180a38e2..ea3c9a7a663 100644
--- a/library/panic_unwind/src/lib.rs
+++ b/library/panic_unwind/src/lib.rs
@@ -82,11 +82,11 @@ cfg_if::cfg_if! {
 }
 
 extern "C" {
-    /// Handler in libstd called when a panic object is dropped outside of
+    /// Handler in std called when a panic object is dropped outside of
     /// `catch_unwind`.
     fn __rust_drop_panic() -> !;
 
-    /// Handler in libstd called when a foreign exception is caught.
+    /// Handler in std called when a foreign exception is caught.
     fn __rust_foreign_exception() -> !;
 }