Skip to content

Stabilize funnel_shifts (including const) #161015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tgross35 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Stabilize funnel_shifts (including const) #161015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions library/core/src/intrinsics/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2206,7 +2206,7 @@ pub const unsafe fn unchecked_mul<T: Copy>(x: T, y: T) -> T;
#[rustc_intrinsic_const_stable_indirect]
#[rustc_nounwind]
#[rustc_intrinsic]
#[rustc_allow_const_fn_unstable(const_trait_impl, funnel_shifts)]
#[rustc_allow_const_fn_unstable(const_trait_impl)]
#[miri::intrinsic_fallback_is_spec]
pub const fn rotate_left<T: [const] fallback::FunnelShift>(x: T, shift: u32) -> T {
// Make sure to call the intrinsic for `funnel_shl`, not the fallback impl.
Expand All @@ -2228,7 +2228,7 @@ pub const fn rotate_left<T: [const] fallback::FunnelShift>(x: T, shift: u32) ->
#[rustc_intrinsic_const_stable_indirect]
#[rustc_nounwind]
#[rustc_intrinsic]
#[rustc_allow_const_fn_unstable(const_trait_impl, funnel_shifts)]
#[rustc_allow_const_fn_unstable(const_trait_impl)]
#[miri::intrinsic_fallback_is_spec]
pub const fn rotate_right<T: [const] fallback::FunnelShift>(x: T, shift: u32) -> T {
// Make sure to call the intrinsic for `funnel_shr`, not the fallback impl.
Expand Down Expand Up @@ -2324,11 +2324,11 @@ pub const fn saturating_sub<T: Copy>(a: T, b: T) -> T;
///
/// Safe versions of this intrinsic are available on the integer primitives
/// via the `funnel_shl` method. For example, [`u32::funnel_shl`].
#[rustc_intrinsic_const_stable_indirect]
#[rustc_intrinsic]
#[rustc_nounwind]
#[rustc_const_unstable(feature = "funnel_shifts", issue = "145686")]
#[unstable(feature = "funnel_shifts", issue = "145686")]
#[track_caller]
#[rustc_allow_const_fn_unstable(const_trait_impl, core_intrinsics_fallbacks)]
#[miri::intrinsic_fallback_is_spec]
pub const unsafe fn unchecked_funnel_shl<T: [const] fallback::FunnelShift>(
Comment on lines +2327 to 2333

@tgross35 tgross35 Aug 13, 2026 •
edited by rustbot
Loading

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that const_trait_impl is only needed for the fallback. We could implement a version without it if needed.

The fallback traits are gated behind core_intrinsics_fallbacks, I'm not sure whether there's a cleaner way to do this.

View changes since the review

a: T,
Expand All @@ -2352,11 +2352,11 @@ pub const unsafe fn unchecked_funnel_shl<T: [const] fallback::FunnelShift>(
///
/// Safer versions of this intrinsic are available on the integer primitives
/// via the `funnel_shr` method. For example, [`u32::funnel_shr`]
#[rustc_intrinsic_const_stable_indirect]
#[rustc_intrinsic]
#[rustc_nounwind]
#[rustc_const_unstable(feature = "funnel_shifts", issue = "145686")]
#[unstable(feature = "funnel_shifts", issue = "145686")]
#[track_caller]
#[rustc_allow_const_fn_unstable(const_trait_impl, core_intrinsics_fallbacks)]
#[miri::intrinsic_fallback_is_spec]
pub const unsafe fn unchecked_funnel_shr<T: [const] fallback::FunnelShift>(
a: T,
Expand Down
1 change: 0 additions & 1 deletion library/core/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@
#![feature(final_associated_functions)]
#![feature(freeze_impls)]
#![feature(fundamental)]
#![feature(funnel_shifts)]
#![feature(impl_restriction)]
#![feature(intra_doc_pointers)]
#![feature(intrinsics)]
Expand Down
26 changes: 10 additions & 16 deletions library/core/src/num/uint_macros.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,8 +521,6 @@ macro_rules! uint_impl {
/// # Examples
///
/// ```
/// #![feature(funnel_shifts)]
///
#[doc = concat!("let a = ", $rot_op, "_", stringify!($SelfT), ";")]
#[doc = concat!("let b = ", $fsh_op, "_", stringify!($SelfT), ";")]
///
Expand All @@ -542,16 +540,14 @@ macro_rules! uint_impl {
/// rotating by an unbounded amount like [`rotate_left`](Self::rotate_left) does:
///
/// ```should_panic
/// #![feature(funnel_shifts)]
///
#[doc = concat!("let a = ", stringify!($SelfT), "::MAX;")]
/// // Okay
#[doc = concat!("let _ = a.rotate_left(", stringify!($SelfT), "::BITS);")]
/// // Panics
#[doc = concat!("let _ = a.funnel_shl(a, ", stringify!($SelfT), "::BITS);")]
/// ```
#[rustc_const_unstable(feature = "funnel_shifts", issue = "145686")]
#[unstable(feature = "funnel_shifts", issue = "145686")]
#[rustc_const_stable(feature = "funnel_shifts", since = "CURRENT_RUSTC_VERSION")]
#[stable(feature = "funnel_shifts", since = "CURRENT_RUSTC_VERSION")]
#[must_use = "this returns the result of the operation, without modifying the original"]
#[inline(always)]
pub const fn funnel_shl(self, right: Self, n: u32) -> Self {
Expand All @@ -577,8 +573,6 @@ macro_rules! uint_impl {
/// # Examples
///
/// ```
/// #![feature(funnel_shifts)]
///
#[doc = concat!("let a = ", $rot_op, "_", stringify!($SelfT), ";")]
#[doc = concat!("let b = ", $fsh_op, "_", stringify!($SelfT), ";")]
///
Expand All @@ -598,16 +592,14 @@ macro_rules! uint_impl {
/// rotating by an unbounded amount like [`rotate_right`](Self::rotate_right) does:
///
/// ```should_panic
/// #![feature(funnel_shifts)]
///
#[doc = concat!("let a = ", stringify!($SelfT), "::MAX;")]
/// // Okay
#[doc = concat!("let _ = a.rotate_right(", stringify!($SelfT), "::BITS);")]
/// // Panics
#[doc = concat!("let _ = a.funnel_shr(a, ", stringify!($SelfT), "::BITS);")]
/// ```
#[rustc_const_unstable(feature = "funnel_shifts", issue = "145686")]
#[unstable(feature = "funnel_shifts", issue = "145686")]
#[rustc_const_stable(feature = "funnel_shifts", since = "CURRENT_RUSTC_VERSION")]
#[stable(feature = "funnel_shifts", since = "CURRENT_RUSTC_VERSION")]
#[must_use = "this returns the result of the operation, without modifying the original"]
#[inline(always)]
pub const fn funnel_shr(self, right: Self, n: u32) -> Self {
Expand All @@ -624,8 +616,9 @@ macro_rules! uint_impl {
#[doc = concat!("`", stringify!($SelfT) , "::BITS`,")]
/// i.e. when [`funnel_shl`](Self::funnel_shl) would panic.
///
#[rustc_const_unstable(feature = "funnel_shifts", issue = "145686")]
#[unstable(feature = "funnel_shifts", issue = "145686")]
#[rustc_const_stable(feature = "funnel_shifts", since = "CURRENT_RUSTC_VERSION")]
#[stable(feature = "funnel_shifts", since = "CURRENT_RUSTC_VERSION")]
#[rustc_allow_const_fn_unstable(const_trait_impl)]
#[must_use = "this returns the result of the operation, without modifying the original"]
#[inline(always)]
#[track_caller]
Expand All @@ -650,8 +643,9 @@ macro_rules! uint_impl {
#[doc = concat!("`", stringify!($SelfT) , "::BITS`,")]
/// i.e. when [`funnel_shr`](Self::funnel_shr) would panic.
///
#[rustc_const_unstable(feature = "funnel_shifts", issue = "145686")]
#[unstable(feature = "funnel_shifts", issue = "145686")]
#[rustc_const_stable(feature = "funnel_shifts", since = "CURRENT_RUSTC_VERSION")]
#[stable(feature = "funnel_shifts", since = "CURRENT_RUSTC_VERSION")]
#[rustc_allow_const_fn_unstable(const_trait_impl)]
#[must_use = "this returns the result of the operation, without modifying the original"]
#[inline(always)]
#[track_caller]
Expand Down
1 change: 0 additions & 1 deletion library/coretests/tests/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
#![feature(fmt_internals)]
#![feature(formatting_options)]
#![feature(freeze)]
#![feature(funnel_shifts)]
#![feature(future_join)]
#![feature(generic_assert_internals)]
#![feature(hasher_prefixfree_extras)]
Expand Down
1 change: 0 additions & 1 deletion library/std/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,6 @@
#![feature(fmt_internals)]
#![feature(fn_ptr_trait)]
#![feature(formatting_options)]
#![feature(funnel_shifts)]
#![feature(generic_atomic)]
#![feature(hash_map_internals)]
#![feature(hash_map_macro)]
Expand Down
1 change: 0 additions & 1 deletion library/stdarch/crates/core_arch/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
x86_amx_intrinsics,
f16,
aarch64_unstable_target_feature,
funnel_shifts,
avx10_target_feature,
const_trait_impl,
const_cmp,
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri/tests/fail/intrinsics/funnel_shl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![feature(core_intrinsics, funnel_shifts)]
#![feature(core_intrinsics)]

fn main() {
unsafe {
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri/tests/fail/intrinsics/funnel_shr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![feature(core_intrinsics, funnel_shifts)]
#![feature(core_intrinsics)]

fn main() {
unsafe {
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri/tests/pass/intrinsics/integer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//@run-native
#![feature(core_intrinsics, funnel_shifts)]
#![feature(core_intrinsics)]
use std::intrinsics::*;

fn main() {
Expand Down
2 changes: 1 addition & 1 deletion tests/codegen-llvm/force-intrinsic-fallback.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//
//@ revisions: NORMAL FALLBACK
//@ [FALLBACK] compile-flags: -Zforce-intrinsic-fallback
#![feature(core_intrinsics, funnel_shifts)]
#![feature(core_intrinsics)]

// Check the effect of `-Zforce-intrinsic-fallback`.
//
Expand Down
Loading