Skip to content

Commit cbeb4a9

Browse files
authored
Unrolled build for rust-lang#137109
Rollup merge of rust-lang#137109 - bend-n:knife, r=oli-obk stabilize extract_if Tracking issue: rust-lang#43244 Closes: rust-lang#43244 FCP completed: rust-lang#43244 (comment)
2 parents f5729cf + c39f33b commit cbeb4a9

File tree

11 files changed

+9
-22
lines changed

11 files changed

+9
-22
lines changed

compiler/rustc_errors/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#![feature(box_into_inner)]
1616
#![feature(box_patterns)]
1717
#![feature(error_reporter)]
18-
#![feature(extract_if)]
1918
#![feature(if_let_guard)]
2019
#![feature(let_chains)]
2120
#![feature(negative_impls)]

compiler/rustc_lint/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#![feature(array_windows)]
2727
#![feature(assert_matches)]
2828
#![feature(box_patterns)]
29-
#![feature(extract_if)]
3029
#![feature(if_let_guard)]
3130
#![feature(iter_order_by)]
3231
#![feature(let_chains)]

compiler/rustc_metadata/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#![feature(coroutines)]
66
#![feature(decl_macro)]
77
#![feature(error_iter)]
8-
#![feature(extract_if)]
98
#![feature(file_buffered)]
109
#![feature(if_let_guard)]
1110
#![feature(iter_from_coroutine)]

compiler/rustc_middle/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
#![feature(decl_macro)]
4545
#![feature(discriminant_kind)]
4646
#![feature(extern_types)]
47-
#![feature(extract_if)]
4847
#![feature(file_buffered)]
4948
#![feature(if_let_guard)]
5049
#![feature(intra_doc_pointers)]

compiler/rustc_resolve/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#![doc(rust_logo)]
1616
#![feature(assert_matches)]
1717
#![feature(box_patterns)]
18-
#![feature(extract_if)]
1918
#![feature(if_let_guard)]
2019
#![feature(iter_intersperse)]
2120
#![feature(let_chains)]

compiler/rustc_trait_selection/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#![feature(associated_type_defaults)]
2121
#![feature(box_patterns)]
2222
#![feature(cfg_version)]
23-
#![feature(extract_if)]
2423
#![feature(if_let_guard)]
2524
#![feature(iter_intersperse)]
2625
#![feature(iterator_try_reduce)]

library/alloc/src/collections/linked_list.rs

+4-5
Original file line numberDiff line numberDiff line change
@@ -1140,7 +1140,6 @@ impl<T, A: Allocator> LinkedList<T, A> {
11401140
/// Splitting a list into evens and odds, reusing the original list:
11411141
///
11421142
/// ```
1143-
/// #![feature(extract_if)]
11441143
/// use std::collections::LinkedList;
11451144
///
11461145
/// let mut numbers: LinkedList<u32> = LinkedList::new();
@@ -1152,7 +1151,7 @@ impl<T, A: Allocator> LinkedList<T, A> {
11521151
/// assert_eq!(evens.into_iter().collect::<Vec<_>>(), vec![2, 4, 6, 8, 14]);
11531152
/// assert_eq!(odds.into_iter().collect::<Vec<_>>(), vec![1, 3, 5, 9, 11, 13, 15]);
11541153
/// ```
1155-
#[unstable(feature = "extract_if", reason = "recently added", issue = "43244")]
1154+
#[stable(feature = "extract_if", since = "CURRENT_RUSTC_VERSION")]
11561155
pub fn extract_if<F>(&mut self, filter: F) -> ExtractIf<'_, T, F, A>
11571156
where
11581157
F: FnMut(&mut T) -> bool,
@@ -1932,7 +1931,7 @@ impl<'a, T, A: Allocator> CursorMut<'a, T, A> {
19321931
}
19331932

19341933
/// An iterator produced by calling `extract_if` on LinkedList.
1935-
#[unstable(feature = "extract_if", reason = "recently added", issue = "43244")]
1934+
#[stable(feature = "extract_if", since = "CURRENT_RUSTC_VERSION")]
19361935
#[must_use = "iterators are lazy and do nothing unless consumed"]
19371936
pub struct ExtractIf<
19381937
'a,
@@ -1947,7 +1946,7 @@ pub struct ExtractIf<
19471946
old_len: usize,
19481947
}
19491948

1950-
#[unstable(feature = "extract_if", reason = "recently added", issue = "43244")]
1949+
#[stable(feature = "extract_if", since = "CURRENT_RUSTC_VERSION")]
19511950
impl<T, F, A: Allocator> Iterator for ExtractIf<'_, T, F, A>
19521951
where
19531952
F: FnMut(&mut T) -> bool,
@@ -1976,7 +1975,7 @@ where
19761975
}
19771976
}
19781977

1979-
#[unstable(feature = "extract_if", reason = "recently added", issue = "43244")]
1978+
#[stable(feature = "extract_if", since = "CURRENT_RUSTC_VERSION")]
19801979
impl<T: fmt::Debug, F> fmt::Debug for ExtractIf<'_, T, F> {
19811980
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
19821981
f.debug_tuple("ExtractIf").field(&self.list).finish()

library/alloc/src/vec/extract_if.rs

+3-5
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@ use crate::alloc::{Allocator, Global};
1212
/// # Example
1313
///
1414
/// ```
15-
/// #![feature(extract_if)]
16-
///
1715
/// let mut v = vec![0, 1, 2];
1816
/// let iter: std::vec::ExtractIf<'_, _, _> = v.extract_if(.., |x| *x % 2 == 0);
1917
/// ```
20-
#[unstable(feature = "extract_if", reason = "recently added", issue = "43244")]
18+
#[stable(feature = "extract_if", since = "CURRENT_RUSTC_VERSION")]
2119
#[derive(Debug)]
2220
#[must_use = "iterators are lazy and do nothing unless consumed"]
2321
pub struct ExtractIf<
@@ -59,7 +57,7 @@ impl<'a, T, F, A: Allocator> ExtractIf<'a, T, F, A> {
5957
}
6058
}
6159

62-
#[unstable(feature = "extract_if", reason = "recently added", issue = "43244")]
60+
#[stable(feature = "extract_if", since = "CURRENT_RUSTC_VERSION")]
6361
impl<T, F, A: Allocator> Iterator for ExtractIf<'_, T, F, A>
6462
where
6563
F: FnMut(&mut T) -> bool,
@@ -95,7 +93,7 @@ where
9593
}
9694
}
9795

98-
#[unstable(feature = "extract_if", reason = "recently added", issue = "43244")]
96+
#[stable(feature = "extract_if", since = "CURRENT_RUSTC_VERSION")]
9997
impl<T, F, A: Allocator> Drop for ExtractIf<'_, T, F, A> {
10098
fn drop(&mut self) {
10199
unsafe {

library/alloc/src/vec/mod.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ use core::ptr::{self, NonNull};
6666
use core::slice::{self, SliceIndex};
6767
use core::{fmt, intrinsics};
6868

69-
#[unstable(feature = "extract_if", reason = "recently added", issue = "43244")]
69+
#[stable(feature = "extract_if", since = "CURRENT_RUSTC_VERSION")]
7070
pub use self::extract_if::ExtractIf;
7171
use crate::alloc::{Allocator, Global};
7272
use crate::borrow::{Cow, ToOwned};
@@ -3684,7 +3684,6 @@ impl<T, A: Allocator> Vec<T, A> {
36843684
/// Splitting an array into evens and odds, reusing the original allocation:
36853685
///
36863686
/// ```
3687-
/// #![feature(extract_if)]
36883687
/// let mut numbers = vec![1, 2, 3, 4, 5, 6, 8, 9, 11, 13, 14, 15];
36893688
///
36903689
/// let evens = numbers.extract_if(.., |x| *x % 2 == 0).collect::<Vec<_>>();
@@ -3697,13 +3696,12 @@ impl<T, A: Allocator> Vec<T, A> {
36973696
/// Using the range argument to only process a part of the vector:
36983697
///
36993698
/// ```
3700-
/// #![feature(extract_if)]
37013699
/// let mut items = vec![0, 0, 0, 0, 0, 0, 0, 1, 2, 1, 2, 1, 2];
37023700
/// let ones = items.extract_if(7.., |x| *x == 1).collect::<Vec<_>>();
37033701
/// assert_eq!(items, vec![0, 0, 0, 0, 0, 0, 0, 2, 2, 2]);
37043702
/// assert_eq!(ones.len(), 3);
37053703
/// ```
3706-
#[unstable(feature = "extract_if", reason = "recently added", issue = "43244")]
3704+
#[stable(feature = "extract_if", since = "CURRENT_RUSTC_VERSION")]
37073705
pub fn extract_if<F, R>(&mut self, range: R, filter: F) -> ExtractIf<'_, T, F, A>
37083706
where
37093707
F: FnMut(&mut T) -> bool,

library/alloc/tests/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#![feature(cow_is_borrowed)]
88
#![feature(core_intrinsics)]
99
#![feature(downcast_unchecked)]
10-
#![feature(extract_if)]
1110
#![feature(exact_size_is_empty)]
1211
#![feature(hashmap_internals)]
1312
#![feature(linked_list_cursors)]

src/tools/miri/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#![feature(unqualified_local_imports)]
1616
#![feature(derive_coerce_pointee)]
1717
#![feature(arbitrary_self_types)]
18-
#![feature(extract_if)]
1918
// Configure clippy and other lints
2019
#![allow(
2120
clippy::collapsible_else_if,

0 commit comments

Comments
 (0)