about summary refs log tree commit diff
path: root/library/alloc/src/alloc.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/alloc/src/alloc.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/alloc/src/alloc.rs')
-rw-r--r--library/alloc/src/alloc.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/library/alloc/src/alloc.rs b/library/alloc/src/alloc.rs
index 10b2dc712a6..a2fdec6fbfe 100644
--- a/library/alloc/src/alloc.rs
+++ b/library/alloc/src/alloc.rs
@@ -23,7 +23,7 @@ extern "Rust" {
     // These are the magic symbols to call the global allocator.  rustc generates
     // them to call `__rg_alloc` etc. if there is a `#[global_allocator]` attribute
     // (the code expanding that attribute macro generates those functions), or to call
-    // the default implementations in libstd (`__rdl_alloc` etc. in `library/std/src/alloc.rs`)
+    // the default implementations in std (`__rdl_alloc` etc. in `library/std/src/alloc.rs`)
     // otherwise.
     // The rustc fork of LLVM 14 and earlier also special-cases these function names to be able to optimize them
     // like `malloc`, `realloc`, and `free`, respectively.