mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #131617 - RalfJung:const_cow_is_borrowed, r=tgross35

Browse Source 
remove const_cow_is_borrowed feature gate

The two functions guarded by this are still unstable, and there's no reason to require a separate feature gate for their const-ness -- we can just have `cow_is_borrowed` cover both kinds of stability.

Cc #65143
This commit is contained in:
Matthias Krüger 2024-10-12 23:00:59 +02:00 committed by GitHub
commit de72917050
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/alloc/src/borrow.rs
View File

@ -225,7 +225,6 @@ impl<B: ?Sized + ToOwned> Cow<'_, B> {
/// assert!(!bull.is_borrowed()); /// assert!(!bull.is_borrowed());
/// ``` /// ```
#[unstable(feature = "cow_is_borrowed", issue = "65143")] #[unstable(feature = "cow_is_borrowed", issue = "65143")]
#[rustc_const_unstable(feature = "const_cow_is_borrowed", issue = "65143")]
pub const fn is_borrowed(&self) -> bool { pub const fn is_borrowed(&self) -> bool {
match *self { match *self {
Borrowed(_) => true, Borrowed(_) => true,
@ -248,7 +247,6 @@ pub const fn is_borrowed(&self) -> bool {
/// assert!(!bull.is_owned()); /// assert!(!bull.is_owned());
/// ``` /// ```
#[unstable(feature = "cow_is_borrowed", issue = "65143")] #[unstable(feature = "cow_is_borrowed", issue = "65143")]
#[rustc_const_unstable(feature = "const_cow_is_borrowed", issue = "65143")]
pub const fn is_owned(&self) -> bool { pub const fn is_owned(&self) -> bool {
!self.is_borrowed() !self.is_borrowed()
} }

1
library/alloc/src/lib.rs
View File

@ -108,7 +108,6 @@
#![feature(coerce_unsized)] #![feature(coerce_unsized)]
#![feature(const_align_of_val)] #![feature(const_align_of_val)]
#![feature(const_box)] #![feature(const_box)]
#![feature(const_cow_is_borrowed)]
#![feature(const_eval_select)] #![feature(const_eval_select)]
#![feature(const_heap)] #![feature(const_heap)]
#![feature(const_maybe_uninit_write)] #![feature(const_maybe_uninit_write)]

1
library/alloc/tests/lib.rs
View File

@ -4,7 +4,6 @@
#![feature(assert_matches)] #![feature(assert_matches)]
#![feature(btree_extract_if)] #![feature(btree_extract_if)]
#![feature(cow_is_borrowed)] #![feature(cow_is_borrowed)]
#![feature(const_cow_is_borrowed)]
#![feature(const_heap)] #![feature(const_heap)]
#![cfg_attr(bootstrap, feature(const_mut_refs))] #![cfg_attr(bootstrap, feature(const_mut_refs))]
#![feature(const_try)] #![feature(const_try)]