Skip to content

Commit 90f0fff

Browse files
committed
Auto merge of #99462 - matthiaskrgr:rollup-ihhwaru, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #98028 (Add E0790 as more specific variant of E0283) - #99384 (use body's param-env when checking if type needs drop) - #99401 (Avoid `Symbol` to `&str` conversions) - #99419 (Stabilize `core::task::ready!`) - #99435 (Revert "Stabilize $$ in Rust 1.63.0") - #99438 (Improve suggestions for `NonZeroT` <- `T` coercion error) - #99441 (Update mdbook) - #99453 (:arrow_up: rust-analyzer) - #99457 (use `par_for_each_in` in `par_body_owners` and `collect_crate_mono_items`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents b025c70 + 15738ba commit 90f0fff

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

core/src/num/nonzero.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ macro_rules! nonzero_integers {
3939
#[repr(transparent)]
4040
#[rustc_layout_scalar_valid_range_start(1)]
4141
#[rustc_nonnull_optimization_guaranteed]
42+
#[rustc_diagnostic_item = stringify!($Ty)]
4243
pub struct $Ty($Int);
4344

4445
impl $Ty {

core/src/task/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ mod wake;
1111
pub use self::wake::{Context, RawWaker, RawWakerVTable, Waker};
1212

1313
mod ready;
14-
#[unstable(feature = "ready_macro", issue = "70922")]
14+
#[stable(feature = "ready_macro", since = "1.64.0")]
1515
pub use ready::ready;
1616
#[unstable(feature = "poll_ready", issue = "89780")]
1717
pub use ready::Ready;

core/src/task/ready.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ use core::task::Poll;
1313
/// # Examples
1414
///
1515
/// ```
16-
/// #![feature(ready_macro)]
17-
///
1816
/// use std::task::{ready, Context, Poll};
1917
/// use std::future::{self, Future};
2018
/// use std::pin::Pin;
@@ -34,7 +32,6 @@ use core::task::Poll;
3432
/// The `ready!` call expands to:
3533
///
3634
/// ```
37-
/// # #![feature(ready_macro)]
3835
/// # use std::task::{Context, Poll};
3936
/// # use std::future::{self, Future};
4037
/// # use std::pin::Pin;
@@ -53,7 +50,7 @@ use core::task::Poll;
5350
/// # Poll::Ready(())
5451
/// # }
5552
/// ```
56-
#[unstable(feature = "ready_macro", issue = "70922")]
53+
#[stable(feature = "ready_macro", since = "1.64.0")]
5754
#[rustc_macro_transparency = "semitransparent"]
5855
pub macro ready($e:expr) {
5956
match $e {

0 commit comments

Comments
 (0)