Skip to content

Commit 0264e5a

Browse files
committed
Auto merge of rust-lang#118900 - workingjubilee:rollup-wkv9hq1, r=workingjubilee
Rollup of 10 pull requests Successful merges: - rust-lang#118858 (Remove dead codes in core) - rust-lang#118864 (Fix alignment passed down to LLVM for simd_masked_load) - rust-lang#118872 (Add rustX check to codeblock attributes lint) - rust-lang#118873 (fix `waker_getters` tracking issue number) - rust-lang#118884 (NFC: simplify merging of two vecs) - rust-lang#118885 (clippy::complexity fixes) - rust-lang#118886 (Clean up variables in `search.js`) - rust-lang#118887 (Typo) - rust-lang#118889 (more clippy::complexity fixes) - rust-lang#118891 (Actually parse async gen blocks correctly) r? `@ghost` `@rustbot` modify labels: rollup
2 parents a99042a + 12f558a commit 0264e5a

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

core/src/fmt/num.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ trait DisplayInt:
1515
fn zero() -> Self;
1616
fn from_u8(u: u8) -> Self;
1717
fn to_u8(&self) -> u8;
18-
fn to_u16(&self) -> u16;
18+
#[cfg(not(any(target_pointer_width = "64", target_arch = "wasm32")))]
1919
fn to_u32(&self) -> u32;
2020
fn to_u64(&self) -> u64;
2121
fn to_u128(&self) -> u128;
@@ -27,7 +27,7 @@ macro_rules! impl_int {
2727
fn zero() -> Self { 0 }
2828
fn from_u8(u: u8) -> Self { u as Self }
2929
fn to_u8(&self) -> u8 { *self as u8 }
30-
fn to_u16(&self) -> u16 { *self as u16 }
30+
#[cfg(not(any(target_pointer_width = "64", target_arch = "wasm32")))]
3131
fn to_u32(&self) -> u32 { *self as u32 }
3232
fn to_u64(&self) -> u64 { *self as u64 }
3333
fn to_u128(&self) -> u128 { *self as u128 }
@@ -40,7 +40,7 @@ macro_rules! impl_uint {
4040
fn zero() -> Self { 0 }
4141
fn from_u8(u: u8) -> Self { u as Self }
4242
fn to_u8(&self) -> u8 { *self as u8 }
43-
fn to_u16(&self) -> u16 { *self as u16 }
43+
#[cfg(not(any(target_pointer_width = "64", target_arch = "wasm32")))]
4444
fn to_u32(&self) -> u32 { *self as u32 }
4545
fn to_u64(&self) -> u64 { *self as u64 }
4646
fn to_u128(&self) -> u128 { *self as u128 }

core/src/task/wake.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@ impl RawWaker {
4848
/// Get the `data` pointer used to create this `RawWaker`.
4949
#[inline]
5050
#[must_use]
51-
#[unstable(feature = "waker_getters", issue = "87021")]
51+
#[unstable(feature = "waker_getters", issue = "96992")]
5252
pub fn data(&self) -> *const () {
5353
self.data
5454
}
5555

5656
/// Get the `vtable` pointer used to create this `RawWaker`.
5757
#[inline]
5858
#[must_use]
59-
#[unstable(feature = "waker_getters", issue = "87021")]
59+
#[unstable(feature = "waker_getters", issue = "96992")]
6060
pub fn vtable(&self) -> &'static RawWakerVTable {
6161
self.vtable
6262
}
@@ -371,7 +371,7 @@ impl Waker {
371371
/// Get a reference to the underlying [`RawWaker`].
372372
#[inline]
373373
#[must_use]
374-
#[unstable(feature = "waker_getters", issue = "87021")]
374+
#[unstable(feature = "waker_getters", issue = "96992")]
375375
pub fn as_raw(&self) -> &RawWaker {
376376
&self.waker
377377
}

0 commit comments

Comments
 (0)