diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2021-03-19 23:01:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-19 23:01:39 +0100 |
| commit | dbf589f9700fdebfbfd4b26b58b9d813f7677e84 (patch) | |
| tree | 57c3c852321efec87a1b8125a9bfaf41c787acd3 | |
| parent | 2cc5d727926dd8868ef0f7f62748da9105704402 (diff) | |
| parent | 1e322e33fe4469ff18e3d9fddc218b82bbede82e (diff) | |
| download | rust-dbf589f9700fdebfbfd4b26b58b9d813f7677e84.tar.gz rust-dbf589f9700fdebfbfd4b26b58b9d813f7677e84.zip | |
Rollup merge of #83269 - bstrie:revertdep, r=m-ou-se
Revert the second deprecation of collections::Bound Per the review at https://github.com/rust-lang/rust/pull/82122#discussion_r596448078 and the decision at https://rust-lang.zulipchat.com/#narrow/stream/219381-t-libs/topic/unavoidable.20breakage.20when.20deprecating.20an.20enum.3F , revert this small portion of #82122 for the time being. This doesn't affect the other components of that patch, i.e. `intrinsics::drop_in_place` is still deprecated-for-real, and uses of `collections::Bound` remain removed from the repo.
| -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}; |