Fix cargo features

rust-lang · Aug 20, 2021 · 4c51420 · 4c51420
1 parent d428753
commit 4c51420
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 2 deletions.
diff --git a/crates/core_simd/src/lib.rs b/crates/core_simd/src/lib.rs
@@ -1,7 +1,6 @@
-#![no_std]
+#![cfg_attr(not(feature = "std"), no_std)]
 #![allow(incomplete_features)]
 #![feature(
-    const_evaluatable_checked,
     const_fn_trait_bound,
     const_generics,
     platform_intrinsics,
@@ -10,6 +9,10 @@
     staged_api,
     stdsimd
 )]
+#![cfg_attr(
+    feature = "const_evaluatable_checked",
+    feature(const_evaluatable_checked)
+)]
 #![warn(missing_docs)]
 #![unstable(feature = "portable_simd", issue = "86656")]
 //! Portable SIMD module.

diff --git a/crates/core_simd/src/masks.rs b/crates/core_simd/src/masks.rs
@@ -178,11 +178,13 @@ where
     }
 
     /// Convert this mask to a bitmask, with one bit set per lane.
+    #[cfg(feature = "const_evaluatable_checked")]
     pub fn to_bitmask(self) -> [u8; LaneCount::<LANES>::BITMASK_LEN] {
         self.0.to_bitmask()
     }
 
     /// Convert a bitmask to a mask.
+    #[cfg(feature = "const_evaluatable_checked")]
     pub fn from_bitmask(bitmask: [u8; LaneCount::<LANES>::BITMASK_LEN]) -> Self {
         Self(mask_impl::Mask::from_bitmask(bitmask))
     }

diff --git a/crates/core_simd/src/masks/bitmask.rs b/crates/core_simd/src/masks/bitmask.rs
@@ -119,12 +119,14 @@ where
         Self(core::mem::transmute_copy(&mask), PhantomData)
     }
 
+    #[cfg(feature = "const_evaluatable_checked")]
     #[inline]
     pub fn to_bitmask(self) -> [u8; LaneCount::<LANES>::BITMASK_LEN] {
         // Safety: these are the same type and we are laundering the generic
         unsafe { core::mem::transmute_copy(&self.0) }
     }
 
+    #[cfg(feature = "const_evaluatable_checked")]
     #[inline]
     pub fn from_bitmask(bitmask: [u8; LaneCount::<LANES>::BITMASK_LEN]) -> Self {
         // Safety: these are the same type and we are laundering the generic

diff --git a/crates/core_simd/src/masks/full_masks.rs b/crates/core_simd/src/masks/full_masks.rs
@@ -101,6 +101,7 @@ where
         unsafe { Mask(crate::intrinsics::simd_cast(self.0)) }
     }
 
+    #[cfg(feature = "const_evaluatable_checked")]
     #[inline]
     pub fn to_bitmask(self) -> [u8; LaneCount::<LANES>::BITMASK_LEN] {
         unsafe {
@@ -127,6 +128,7 @@ where
         }
     }
 
+    #[cfg(feature = "const_evaluatable_checked")]
     #[inline]
     pub fn from_bitmask(mut bitmask: [u8; LaneCount::<LANES>::BITMASK_LEN]) -> Self {
         unsafe {

diff --git a/crates/core_simd/tests/masks.rs b/crates/core_simd/tests/masks.rs
@@ -68,6 +68,7 @@ macro_rules! test_mask_api {
                 assert_eq!(core_simd::Mask::<$type, 8>::from_int(int), mask);
             }
 
+            #[cfg(feature = "const_evaluatable_checked")]
             #[test]
             fn roundtrip_bitmask_conversion() {
                 let values = [