Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit bbdca4c

Browse files
committedDec 30, 2022
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
2 parents 7c99186 + 3f9909a commit bbdca4c

File tree

43 files changed

+104
-95
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+104
-95
lines changed
 

‎library/alloc/src/alloc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ extern "Rust" {
2323
// These are the magic symbols to call the global allocator. rustc generates
2424
// them to call `__rg_alloc` etc. if there is a `#[global_allocator]` attribute
2525
// (the code expanding that attribute macro generates those functions), or to call
26-
// the default implementations in libstd (`__rdl_alloc` etc. in `library/std/src/alloc.rs`)
26+
// the default implementations in std (`__rdl_alloc` etc. in `library/std/src/alloc.rs`)
2727
// otherwise.
2828
// The rustc fork of LLVM 14 and earlier also special-cases these function names to be able to optimize them
2929
// like `malloc`, `realloc`, and `free`, respectively.

‎library/alloc/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//! This library provides smart pointers and collections for managing
44
//! heap-allocated values.
55
//!
6-
//! This library, like libcore, normally doesn’t need to be used directly
6+
//! This library, like core, normally doesn’t need to be used directly
77
//! since its contents are re-exported in the [`std` crate](../std/index.html).
88
//! Crates that use the `#![no_std]` attribute however will typically
99
//! not depend on `std`, so they’d use this crate instead.
@@ -75,7 +75,7 @@
7575
))]
7676
#![no_std]
7777
#![needs_allocator]
78-
// To run liballoc tests without x.py without ending up with two copies of liballoc, Miri needs to be
78+
// To run alloc tests without x.py without ending up with two copies of alloc, Miri needs to be
7979
// able to "empty" this crate. See <https://github.com/rust-lang/miri-test-libstd/issues/4>.
8080
// rustc itself never sets the feature, so this line has no affect there.
8181
#![cfg(any(not(feature = "miri-test-libstd"), test, doctest))]

0 commit comments

Comments
 (0)
Please sign in to comment.