diff options
| author | bors <bors@rust-lang.org> | 2022-12-30 16:10:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-12-30 16:10:00 +0000 |
| commit | bbdca4c28fd9b57212cb3316ff4ffb1529affcbe (patch) | |
| tree | 62b632d0bd97f16b4d675ca0b9112e69976b4d61 /library/alloc/src/lib.rs | |
| parent | 7c991868c60a4afc1ee6334b912ea96061a2c98d (diff) | |
| parent | 3f9909a7c4183a7e4e46ee346a045ec876ed118b (diff) | |
| download | rust-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/lib.rs')
| -rw-r--r-- | library/alloc/src/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/alloc/src/lib.rs b/library/alloc/src/lib.rs index 09f459f84f7..f6cbac005ff 100644 --- a/library/alloc/src/lib.rs +++ b/library/alloc/src/lib.rs @@ -3,7 +3,7 @@ //! This library provides smart pointers and collections for managing //! heap-allocated values. //! -//! This library, like libcore, normally doesn’t need to be used directly +//! This library, like core, normally doesn’t need to be used directly //! since its contents are re-exported in the [`std` crate](../std/index.html). //! Crates that use the `#![no_std]` attribute however will typically //! not depend on `std`, so they’d use this crate instead. @@ -75,7 +75,7 @@ ))] #![no_std] #![needs_allocator] -// To run liballoc tests without x.py without ending up with two copies of liballoc, Miri needs to be +// To run alloc tests without x.py without ending up with two copies of alloc, Miri needs to be // able to "empty" this crate. See <https://github.com/rust-lang/miri-test-libstd/issues/4>. // rustc itself never sets the feature, so this line has no affect there. #![cfg(any(not(feature = "miri-test-libstd"), test, doctest))] |
