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/vec/mod.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/vec/mod.rs')
| -rw-r--r-- | library/alloc/src/vec/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/alloc/src/vec/mod.rs b/library/alloc/src/vec/mod.rs index 1028bb981b9..1da73862d4a 100644 --- a/library/alloc/src/vec/mod.rs +++ b/library/alloc/src/vec/mod.rs @@ -3191,7 +3191,7 @@ where } } -// note: test pulls in libstd, which causes errors here +// note: test pulls in std, which causes errors here #[cfg(not(test))] #[stable(feature = "vec_from_box", since = "1.18.0")] impl<T, A: Allocator> From<Box<[T], A>> for Vec<T, A> { @@ -3209,7 +3209,7 @@ impl<T, A: Allocator> From<Box<[T], A>> for Vec<T, A> { } } -// note: test pulls in libstd, which causes errors here +// note: test pulls in std, which causes errors here #[cfg(not(no_global_oom_handling))] #[cfg(not(test))] #[stable(feature = "box_from_vec", since = "1.20.0")] |
