diff options
| author | bors <bors@rust-lang.org> | 2021-03-19 23:53:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-03-19 23:53:02 +0000 |
| commit | 6bfbf0c33a86707cedd02ca985285191282a80b3 (patch) | |
| tree | 3379b7c53a90fdbb23ef8c041ae4a8eb0b1955fe /library/std/src | |
| parent | f5f33ec0e0455eefa72fc5567eb1280a4d5ee206 (diff) | |
| parent | 51a29cbb23d2146322350fbfde53fe9523e554fb (diff) | |
| download | rust-6bfbf0c33a86707cedd02ca985285191282a80b3.tar.gz rust-6bfbf0c33a86707cedd02ca985285191282a80b3.zip | |
Auto merge of #83308 - Dylan-DPC:rollup-p2j6sy8, r=Dylan-DPC
Rollup of 8 pull requests Successful merges: - #79986 (Only build help popup when it's really needed) - #82570 (Add `as_str` method for split whitespace str iterators) - #83244 (Fix overflowing length in Vec<ZST> to VecDeque) - #83254 (Include output stream in `panic!()` documentation) - #83269 (Revert the second deprecation of collections::Bound) - #83277 (Mark early otherwise optimization unsound) - #83285 (Update LLVM to bring in SIMD updates for WebAssembly) - #83297 (Do not ICE on ty::Error as an error must already have been reported) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/collections/mod.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/library/std/src/collections/mod.rs b/library/std/src/collections/mod.rs index 7f8f9c991fe..8cda601edd1 100644 --- a/library/std/src/collections/mod.rs +++ b/library/std/src/collections/mod.rs @@ -401,9 +401,10 @@ #![stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")] -#[rustc_deprecated(reason = "moved to `std::ops::Bound`", since = "1.52.0")] +// FIXME(#82080) The deprecation here is only theoretical, and does not actually produce a warning. +#[rustc_deprecated(reason = "moved to `std::ops::Bound`", since = "1.26.0")] #[doc(hidden)] -pub type Bound<T> = crate::ops::Bound<T>; +pub use crate::ops::Bound; #[stable(feature = "rust1", since = "1.0.0")] pub use alloc_crate::collections::{binary_heap, btree_map, btree_set}; |