Skip to content

Commit dbf589f

Browse files
authored
Rollup merge of #83269 - bstrie:revertdep, r=m-ou-se
Revert the second deprecation of collections::Bound Per the review at #82122 (comment) 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.
2 parents 2cc5d72 + 1e322e3 commit dbf589f

File tree

1 file changed

+3
-2
lines changed
  • library/std/src/collections

1 file changed

+3
-2
lines changed

library/std/src/collections/mod.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -401,9 +401,10 @@
401401
#![stable(feature = "rust1", since = "1.0.0")]
402402

403403
#[stable(feature = "rust1", since = "1.0.0")]
404-
#[rustc_deprecated(reason = "moved to `std::ops::Bound`", since = "1.52.0")]
404+
// FIXME(#82080) The deprecation here is only theoretical, and does not actually produce a warning.
405+
#[rustc_deprecated(reason = "moved to `std::ops::Bound`", since = "1.26.0")]
405406
#[doc(hidden)]
406-
pub type Bound<T> = crate::ops::Bound<T>;
407+
pub use crate::ops::Bound;
407408

408409
#[stable(feature = "rust1", since = "1.0.0")]
409410
pub use alloc_crate::collections::{binary_heap, btree_map, btree_set};

0 commit comments

Comments
 (0)