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

Rollup merge of #128279 - slanterns:is_sorted, r=dtolnay

Browse Source 
Stabilize `is_sorted`

Closes: https://github.com/rust-lang/rust/issues/53485.

~~Question: does~~ 8fe0c753f2/compiler/rustc_lint_defs/src/builtin.rs (L1986-L1994) ~~need a new example?~~
edit: It causes a test failure and needs to be changed anyway.

``@rustbot`` label: +T-libs-api

r? libs-api
This commit is contained in:
Matthias Krüger 2024-07-28 08:57:17 +02:00 committed by GitHub
commit 99204047c9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
18 changed files with 21 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compiler/rustc_codegen_cranelift/example/std_example.rs
View File

@ -3,7 +3,6 @@
coroutines, coroutines,
stmt_expr_attributes, stmt_expr_attributes,
coroutine_trait, coroutine_trait,
is_sorted,
repr_simd, repr_simd,
tuple_trait, tuple_trait,
unboxed_closures unboxed_closures

2
compiler/rustc_codegen_gcc/example/std_example.rs
View File

@ -1,5 +1,5 @@
#![allow(internal_features)] #![allow(internal_features)]
#![feature(core_intrinsics, coroutines, coroutine_trait, is_sorted, stmt_expr_attributes)] #![feature(core_intrinsics, coroutines, coroutine_trait, stmt_expr_attributes)]
#[cfg(feature="master")] #[cfg(feature="master")]
#[cfg(target_arch="x86_64")] #[cfg(target_arch="x86_64")]

1
compiler/rustc_hir_analysis/src/lib.rs
View File

@ -64,7 +64,6 @@
#![doc(rust_logo)] #![doc(rust_logo)]
#![feature(control_flow_enum)] #![feature(control_flow_enum)]
#![feature(if_let_guard)] #![feature(if_let_guard)]
#![feature(is_sorted)]
#![feature(iter_intersperse)] #![feature(iter_intersperse)]
#![feature(let_chains)] #![feature(let_chains)]
#![feature(never_type)] #![feature(never_type)]

12
compiler/rustc_lint_defs/src/builtin.rs
View File

@ -1984,14 +1984,18 @@
/// ///
/// ```rust /// ```rust
/// trait MyIterator : Iterator { /// trait MyIterator : Iterator {
/// // is_sorted is an unstable method that already exists on the Iterator trait /// // is_partitioned is an unstable method that already exists on the Iterator trait
/// fn is_sorted(self) -> bool where Self: Sized {true} /// fn is_partitioned<P>(self, predicate: P) -> bool
/// where
/// Self: Sized,
/// P: FnMut(Self::Item) -> bool,
/// {true}
/// } /// }
/// ///
/// impl<T: ?Sized> MyIterator for T where T: Iterator { } /// impl<T: ?Sized> MyIterator for T where T: Iterator { }
/// ///
/// let x = vec![1, 2, 3]; /// let x = vec![1, 2, 3];
/// let _ = x.iter().is_sorted(); /// let _ = x.iter().is_partitioned(|_| true);
/// ``` /// ```
/// ///
/// {{produces}} /// {{produces}}
@ -2007,7 +2011,7 @@
/// is an early-warning to let you know that there may be a collision in /// is an early-warning to let you know that there may be a collision in
/// the future. This can be avoided by adding type annotations to /// the future. This can be avoided by adding type annotations to
/// disambiguate which trait method you intend to call, such as /// disambiguate which trait method you intend to call, such as
/// `MyIterator::is_sorted(my_iter)` or renaming or removing the method. /// `MyIterator::is_partitioned(my_iter, my_predicate)` or renaming or removing the method.
/// ///
/// [nightly channel]: https://doc.rust-lang.org/book/appendix-07-nightly-rust.html /// [nightly channel]: https://doc.rust-lang.org/book/appendix-07-nightly-rust.html
/// [`feature` attribute]: https://doc.rust-lang.org/nightly/unstable-book/ /// [`feature` attribute]: https://doc.rust-lang.org/nightly/unstable-book/

1
compiler/rustc_mir_transform/src/lib.rs
View File

@ -6,7 +6,6 @@
#![feature(decl_macro)] #![feature(decl_macro)]
#![feature(if_let_guard)] #![feature(if_let_guard)]
#![feature(impl_trait_in_assoc_type)] #![feature(impl_trait_in_assoc_type)]
#![feature(is_sorted)]
#![feature(let_chains)] #![feature(let_chains)]
#![feature(map_try_insert)] #![feature(map_try_insert)]
#![feature(never_type)] #![feature(never_type)]

1
compiler/rustc_monomorphize/src/lib.rs
View File

@ -1,6 +1,5 @@
// tidy-alphabetical-start // tidy-alphabetical-start
#![feature(array_windows)] #![feature(array_windows)]
#![feature(is_sorted)]
// tidy-alphabetical-end // tidy-alphabetical-end
use rustc_hir::lang_items::LangItem; use rustc_hir::lang_items::LangItem;

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

@ -92,7 +92,6 @@
// tidy-alphabetical-start // tidy-alphabetical-start
#![cfg_attr(not(no_global_oom_handling), feature(const_alloc_error))] #![cfg_attr(not(no_global_oom_handling), feature(const_alloc_error))]
#![cfg_attr(not(no_global_oom_handling), feature(const_btree_len))] #![cfg_attr(not(no_global_oom_handling), feature(const_btree_len))]
#![cfg_attr(test, feature(is_sorted))]
#![cfg_attr(test, feature(new_uninit))] #![cfg_attr(test, feature(new_uninit))]
#![feature(alloc_layout_extra)] #![feature(alloc_layout_extra)]
#![feature(allocator_api)] #![feature(allocator_api)]

12
library/core/src/iter/traits/iterator.rs
View File

@ -3951,8 +3951,6 @@ fn ge<I>(self, other: I) -> bool
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(is_sorted)]
///
/// assert!([1, 2, 2, 9].iter().is_sorted()); /// assert!([1, 2, 2, 9].iter().is_sorted());
/// assert!(![1, 3, 2, 4].iter().is_sorted()); /// assert!(![1, 3, 2, 4].iter().is_sorted());
/// assert!([0].iter().is_sorted()); /// assert!([0].iter().is_sorted());
@ -3960,7 +3958,7 @@ fn ge<I>(self, other: I) -> bool
/// assert!(![0.0, 1.0, f32::NAN].iter().is_sorted()); /// assert!(![0.0, 1.0, f32::NAN].iter().is_sorted());
/// ``` /// ```
#[inline] #[inline]
#[unstable(feature = "is_sorted", reason = "new API", issue = "53485")] #[stable(feature = "is_sorted", since = "CURRENT_RUSTC_VERSION")]
#[rustc_do_not_const_check] #[rustc_do_not_const_check]
fn is_sorted(self) -> bool fn is_sorted(self) -> bool
where where
@ -3978,8 +3976,6 @@ fn is_sorted(self) -> bool
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(is_sorted)]
///
/// assert!([1, 2, 2, 9].iter().is_sorted_by(|a, b| a <= b)); /// assert!([1, 2, 2, 9].iter().is_sorted_by(|a, b| a <= b));
/// assert!(![1, 2, 2, 9].iter().is_sorted_by(|a, b| a < b)); /// assert!(![1, 2, 2, 9].iter().is_sorted_by(|a, b| a < b));
/// ///
@ -3989,7 +3985,7 @@ fn is_sorted(self) -> bool
/// assert!(std::iter::empty::<i32>().is_sorted_by(|a, b| false)); /// assert!(std::iter::empty::<i32>().is_sorted_by(|a, b| false));
/// assert!(std::iter::empty::<i32>().is_sorted_by(|a, b| true)); /// assert!(std::iter::empty::<i32>().is_sorted_by(|a, b| true));
/// ``` /// ```
#[unstable(feature = "is_sorted", reason = "new API", issue = "53485")] #[stable(feature = "is_sorted", since = "CURRENT_RUSTC_VERSION")]
#[rustc_do_not_const_check] #[rustc_do_not_const_check]
fn is_sorted_by<F>(mut self, compare: F) -> bool fn is_sorted_by<F>(mut self, compare: F) -> bool
where where
@ -4030,13 +4026,11 @@ fn check<'a, T>(
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(is_sorted)]
///
/// assert!(["c", "bb", "aaa"].iter().is_sorted_by_key(|s| s.len())); /// assert!(["c", "bb", "aaa"].iter().is_sorted_by_key(|s| s.len()));
/// assert!(![-2i32, -1, 0, 3].iter().is_sorted_by_key(|n| n.abs())); /// assert!(![-2i32, -1, 0, 3].iter().is_sorted_by_key(|n| n.abs()));
/// ``` /// ```
#[inline] #[inline]
#[unstable(feature = "is_sorted", reason = "new API", issue = "53485")] #[stable(feature = "is_sorted", since = "CURRENT_RUSTC_VERSION")]
#[rustc_do_not_const_check] #[rustc_do_not_const_check]
fn is_sorted_by_key<F, K>(self, f: F) -> bool fn is_sorted_by_key<F, K>(self, f: F) -> bool
where where

11
library/core/src/slice/mod.rs
View File

@ -4069,7 +4069,6 @@ pub fn as_simd_mut<const LANES: usize>(&mut self) -> (&mut [T], &mut [Simd<T, LA
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(is_sorted)]
/// let empty: [i32; 0] = []; /// let empty: [i32; 0] = [];
/// ///
/// assert!([1, 2, 2, 9].is_sorted()); /// assert!([1, 2, 2, 9].is_sorted());
@ -4079,7 +4078,7 @@ pub fn as_simd_mut<const LANES: usize>(&mut self) -> (&mut [T], &mut [Simd<T, LA
/// assert!(![0.0, 1.0, f32::NAN].is_sorted()); /// assert!(![0.0, 1.0, f32::NAN].is_sorted());
/// ``` /// ```
#[inline] #[inline]
#[unstable(feature = "is_sorted", reason = "new API", issue = "53485")] #[stable(feature = "is_sorted", since = "CURRENT_RUSTC_VERSION")]
#[must_use] #[must_use]
pub fn is_sorted(&self) -> bool pub fn is_sorted(&self) -> bool
where where
@ -4096,8 +4095,6 @@ pub fn is_sorted(&self) -> bool
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(is_sorted)]
///
/// assert!([1, 2, 2, 9].is_sorted_by(|a, b| a <= b)); /// assert!([1, 2, 2, 9].is_sorted_by(|a, b| a <= b));
/// assert!(![1, 2, 2, 9].is_sorted_by(|a, b| a < b)); /// assert!(![1, 2, 2, 9].is_sorted_by(|a, b| a < b));
/// ///
@ -4108,7 +4105,7 @@ pub fn is_sorted(&self) -> bool
/// assert!(empty.is_sorted_by(|a, b| false)); /// assert!(empty.is_sorted_by(|a, b| false));
/// assert!(empty.is_sorted_by(|a, b| true)); /// assert!(empty.is_sorted_by(|a, b| true));
/// ``` /// ```
#[unstable(feature = "is_sorted", reason = "new API", issue = "53485")] #[stable(feature = "is_sorted", since = "CURRENT_RUSTC_VERSION")]
#[must_use] #[must_use]
pub fn is_sorted_by<'a, F>(&'a self, mut compare: F) -> bool pub fn is_sorted_by<'a, F>(&'a self, mut compare: F) -> bool
where where
@ -4128,13 +4125,11 @@ pub fn is_sorted_by<'a, F>(&'a self, mut compare: F) -> bool
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(is_sorted)]
///
/// assert!(["c", "bb", "aaa"].is_sorted_by_key(|s| s.len())); /// assert!(["c", "bb", "aaa"].is_sorted_by_key(|s| s.len()));
/// assert!(![-2i32, -1, 0, 3].is_sorted_by_key(|n| n.abs())); /// assert!(![-2i32, -1, 0, 3].is_sorted_by_key(|n| n.abs()));
/// ``` /// ```
#[inline] #[inline]
#[unstable(feature = "is_sorted", reason = "new API", issue = "53485")] #[stable(feature = "is_sorted", since = "CURRENT_RUSTC_VERSION")]
#[must_use] #[must_use]
pub fn is_sorted_by_key<'a, F, K>(&'a self, f: F) -> bool pub fn is_sorted_by_key<'a, F, K>(&'a self, f: F) -> bool
where where

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

@ -44,7 +44,6 @@
#![feature(hasher_prefixfree_extras)] #![feature(hasher_prefixfree_extras)]
#![feature(hashmap_internals)] #![feature(hashmap_internals)]
#![feature(try_find)] #![feature(try_find)]
#![feature(is_sorted)]
#![feature(layout_for_ptr)] #![feature(layout_for_ptr)]
#![feature(pattern)] #![feature(pattern)]
#![feature(slice_take)] #![feature(slice_take)]

11
src/doc/unstable-book/src/library-features/is-sorted.md
View File

@ -1,11 +0,0 @@
# `is_sorted`
The tracking issue for this feature is: [#53485]
[#53485]: https://github.com/rust-lang/rust/issues/53485
------------------------
Add the methods `is_sorted`, `is_sorted_by` and `is_sorted_by_key` to `[T]`;
add the methods `is_sorted`, `is_sorted_by` and `is_sorted_by_key` to
`Iterator`.

1
src/tools/clippy/clippy_lints/src/lib.rs
View File

@ -5,7 +5,6 @@
#![feature(f128)] #![feature(f128)]
#![feature(f16)] #![feature(f16)]
#![feature(if_let_guard)] #![feature(if_let_guard)]
#![feature(is_sorted)]
#![feature(iter_intersperse)] #![feature(iter_intersperse)]
#![feature(iter_partition_in_place)] #![feature(iter_partition_in_place)]
#![feature(let_chains)] #![feature(let_chains)]

1
src/tools/clippy/tests/compile-test.rs
View File

@ -1,4 +1,3 @@
#![feature(is_sorted)]
#![cfg_attr(feature = "deny-warnings", deny(warnings))] #![cfg_attr(feature = "deny-warnings", deny(warnings))]
#![warn(rust_2018_idioms, unused_lifetimes)] #![warn(rust_2018_idioms, unused_lifetimes)]
#![allow(unused_extern_crates)] #![allow(unused_extern_crates)]

1
src/tools/clippy/tests/ui/unit_return_expecting_ord.rs
View File

@ -2,7 +2,6 @@
#![allow(clippy::needless_return)] #![allow(clippy::needless_return)]
#![allow(clippy::unused_unit)] #![allow(clippy::unused_unit)]
#![allow(clippy::useless_vec)] #![allow(clippy::useless_vec)]
#![feature(is_sorted)]
struct Struct { struct Struct {
field: isize, field: isize,

12
src/tools/clippy/tests/ui/unit_return_expecting_ord.stderr
View File

@ -1,11 +1,11 @@
error: this closure returns the unit type which also implements Ord error: this closure returns the unit type which also implements Ord
--> tests/ui/unit_return_expecting_ord.rs:19:25 --> tests/ui/unit_return_expecting_ord.rs:18:25
| |
LL | structs.sort_by_key(|s| { LL | structs.sort_by_key(|s| {
| ^^^ | ^^^
| |
help: probably caused by this trailing semicolon help: probably caused by this trailing semicolon
--> tests/ui/unit_return_expecting_ord.rs:21:24 --> tests/ui/unit_return_expecting_ord.rs:20:24
| |
LL | double(s.field); LL | double(s.field);
| ^ | ^
@ -13,25 +13,25 @@ LL | double(s.field);
= help: to override `-D warnings` add `#[allow(clippy::unit_return_expecting_ord)]` = help: to override `-D warnings` add `#[allow(clippy::unit_return_expecting_ord)]`
error: this closure returns the unit type which also implements PartialOrd error: this closure returns the unit type which also implements PartialOrd
--> tests/ui/unit_return_expecting_ord.rs:24:30 --> tests/ui/unit_return_expecting_ord.rs:23:30
| |
LL | structs.is_sorted_by_key(|s| { LL | structs.is_sorted_by_key(|s| {
| ^^^ | ^^^
| |
help: probably caused by this trailing semicolon help: probably caused by this trailing semicolon
--> tests/ui/unit_return_expecting_ord.rs:26:24 --> tests/ui/unit_return_expecting_ord.rs:25:24
| |
LL | double(s.field); LL | double(s.field);
| ^ | ^
error: this closure returns the unit type which also implements PartialOrd error: this closure returns the unit type which also implements PartialOrd
--> tests/ui/unit_return_expecting_ord.rs:28:30 --> tests/ui/unit_return_expecting_ord.rs:27:30
| |
LL | structs.is_sorted_by_key(|s| { LL | structs.is_sorted_by_key(|s| {
| ^^^ | ^^^
error: this closure returns the unit type which also implements Ord error: this closure returns the unit type which also implements Ord
--> tests/ui/unit_return_expecting_ord.rs:39:25 --> tests/ui/unit_return_expecting_ord.rs:38:25
| |
LL | structs.sort_by_key(|s| unit(s.field)); LL | structs.sort_by_key(|s| unit(s.field));
| ^^^ | ^^^

2
tests/ui/array-slice-vec/slice_is_sorted_by_borrow.rs
View File

@ -1,8 +1,6 @@
//@ check-pass //@ check-pass
// regression test for https://github.com/rust-lang/rust/issues/53485#issuecomment-885393452 // regression test for https://github.com/rust-lang/rust/issues/53485#issuecomment-885393452
#![feature(is_sorted)]
struct A { struct A {
name: String, name: String,
} }

13
tests/ui/feature-gates/feature-gate-is_sorted.rs
View File

@ -1,13 +0,0 @@
fn main() {
// Assert `Iterator` methods are unstable
assert!([1, 2, 2, 9].iter().is_sorted());
//~^ ERROR: use of unstable library feature 'is_sorted': new API
assert!(![-2i32, -1, 0, 3].iter().is_sorted_by_key(|n| n.abs()));
//~^ ERROR: use of unstable library feature 'is_sorted': new API
// Assert `[T]` methods are unstable
assert!([1, 2, 2, 9].is_sorted());
//~^ ERROR: use of unstable library feature 'is_sorted': new API
assert!(![-2i32, -1, 0, 3].is_sorted_by_key(|n| n.abs()));
//~^ ERROR: use of unstable library feature 'is_sorted': new API
}

43
tests/ui/feature-gates/feature-gate-is_sorted.stderr
View File

@ -1,43 +0,0 @@
error[E0658]: use of unstable library feature 'is_sorted': new API
--> $DIR/feature-gate-is_sorted.rs:3:33
|
LL | assert!([1, 2, 2, 9].iter().is_sorted());
| ^^^^^^^^^
|
= note: see issue #53485 <https://github.com/rust-lang/rust/issues/53485> for more information
= help: add `#![feature(is_sorted)]` to the crate attributes to enable
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
error[E0658]: use of unstable library feature 'is_sorted': new API
--> $DIR/feature-gate-is_sorted.rs:5:39
|
LL | assert!(![-2i32, -1, 0, 3].iter().is_sorted_by_key(|n| n.abs()));
| ^^^^^^^^^^^^^^^^
|
= note: see issue #53485 <https://github.com/rust-lang/rust/issues/53485> for more information
= help: add `#![feature(is_sorted)]` to the crate attributes to enable
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
error[E0658]: use of unstable library feature 'is_sorted': new API
--> $DIR/feature-gate-is_sorted.rs:9:26
|
LL | assert!([1, 2, 2, 9].is_sorted());
| ^^^^^^^^^
|
= note: see issue #53485 <https://github.com/rust-lang/rust/issues/53485> for more information
= help: add `#![feature(is_sorted)]` to the crate attributes to enable
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
error[E0658]: use of unstable library feature 'is_sorted': new API
--> $DIR/feature-gate-is_sorted.rs:11:32
|
LL | assert!(![-2i32, -1, 0, 3].is_sorted_by_key(|n| n.abs()));
| ^^^^^^^^^^^^^^^^
|
= note: see issue #53485 <https://github.com/rust-lang/rust/issues/53485> for more information
= help: add `#![feature(is_sorted)]` to the crate attributes to enable
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
error: aborting due to 4 previous errors
For more information about this error, try `rustc --explain E0658`.