tests: properly conditionalize tests that require allocator_api

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Author: bonzini

examples/linked_list.rs

@@ -1,4 +1,5 @@
-#![feature(allocator_api)]
+#![cfg_attr(feature = "alloc", feature(allocator_api))]
+
 use core::{
     cell::Cell,
     convert::Infallible,

examples/mutex.rs

@@ -1,4 +1,5 @@
-#![feature(allocator_api)]
+#![cfg_attr(feature = "alloc", feature(allocator_api))]
+
 use core::{
     cell::{Cell, UnsafeCell},
     marker::PhantomPinned,
@@ -161,8 +162,12 @@ impl WaitEntry {
     }
 }
 
+#[cfg(not(feature = "alloc"))]
+fn main() {}
+
 #[allow(dead_code)]
 #[cfg_attr(test, test)]
+#[cfg(feature = "alloc")]
 fn main() {
     let mtx: Pin<Arc<CMutex<usize>>> = Arc::pin_init(CMutex::new(0)).unwrap();
     let mut handles = vec![];

examples/pthread_mutex.rs

@@ -1,9 +1,10 @@
 // inspired by https://github.com/nbdd0121/pin-init/blob/trunk/examples/pthread_mutex.rs
-#![feature(allocator_api)]
+#![cfg_attr(feature = "alloc", feature(allocator_api))]
 #[cfg(not(windows))]
 mod pthread_mtx {
+    #[cfg(feature = "alloc")]
+    use core::alloc::AllocError;
     use core::{
-        alloc::AllocError,
         cell::UnsafeCell,
         marker::PhantomPinned,
         mem::MaybeUninit,
@@ -45,6 +46,8 @@ mod pthread_mtx {
             match e {}
         }
     }
+
+    #[cfg(feature = "alloc")]
     impl From<AllocError> for Error {
         fn from(_: AllocError) -> Self {
             Self::Alloc
@@ -129,7 +132,7 @@ mod pthread_mtx {
 
 #[cfg_attr(test, test)]
 fn main() {
-    #[cfg(not(windows))]
+    #[cfg(all(feature = "alloc", not(windows)))]
     {
         use core::pin::Pin;
         use pinned_init::*;

examples/static_init.rs

@@ -1,4 +1,4 @@
-#![feature(allocator_api)]
+#![cfg_attr(feature = "alloc", feature(allocator_api))]
 
 use core::{
     cell::{Cell, UnsafeCell},
@@ -77,6 +77,10 @@ unsafe impl PinInit<CMutex<usize>> for CountInit {
 
 pub static COUNT: StaticInit<CMutex<usize>, CountInit> = StaticInit::new(CountInit);
 
+#[cfg(not(feature = "alloc"))]
+fn main() {}
+
+#[cfg(feature = "alloc")]
 fn main() {
     let mtx: Pin<Arc<CMutex<usize>>> = Arc::pin_init(CMutex::new(0)).unwrap();
     let mut handles = vec![];

tests/alloc_fail.rs

@@ -1,14 +1,22 @@
-#![feature(allocator_api)]
+#![cfg_attr(feature = "alloc", feature(allocator_api))]
 
-use core::{alloc::AllocError, convert::Infallible};
+#[cfg(feature = "alloc")]
+use core::alloc::AllocError;
+
+use core::convert::Infallible;
 use pinned_init::*;
 use std::sync::Arc;
 
 #[path = "./ring_buf.rs"]
 mod ring_buf;
 use ring_buf::*;
 
-#[cfg(all(not(miri), not(NO_ALLOC_FAIL_TESTS), not(target_os = "macos")))]
+#[cfg(all(
+    feature = "alloc",
+    not(miri),
+    not(NO_ALLOC_FAIL_TESTS),
+    not(target_os = "macos")
+))]
 #[test]
 fn too_big_pinned() {
     // should be too big with current hardware.
@@ -23,7 +31,12 @@ fn too_big_pinned() {
     ));
 }
 
-#[cfg(all(not(miri), not(NO_ALLOC_FAIL_TESTS), not(target_os = "macos")))]
+#[cfg(all(
+    feature = "alloc",
+    not(miri),
+    not(NO_ALLOC_FAIL_TESTS),
+    not(target_os = "macos")
+))]
 #[test]
 fn too_big_in_place() {
     // should be too big with current hardware.

tests/ring_buf.rs

@@ -192,9 +192,11 @@ fn even_stack() {
     assert_eq!(val, Err(()));
 }
 
+#[cfg(feature = "alloc")]
 #[test]
 fn even_failing() {
     assert!(matches!(Box::try_pin_init(EvenU64::new2(3)), Err(Error)));
+    assert!(matches!(Box::try_init(EvenU64::new2(3)), Err(Error)));
     assert!(matches!(Arc::try_pin_init(EvenU64::new2(5)), Err(Error)));
     assert!(matches!(Box::try_init(EvenU64::new2(3)), Err(Error)));
     assert!(matches!(Arc::try_init(EvenU64::new2(5)), Err(Error)));
@@ -241,7 +243,7 @@ struct BigStruct {
     oth: MaybeUninit<u8>,
 }
 
-#[cfg(not(miri))]
+#[cfg(all(feature = "alloc", not(miri)))]
 #[test]
 fn big_struct() {
     let x = Arc::init(init!(BigStruct {
@@ -256,7 +258,7 @@ fn big_struct() {
     println!("{x:?}");
 }
 
-#[cfg(not(miri))]
+#[cfg(all(feature = "alloc", not(miri)))]
 #[test]
 fn with_big_struct() {
     let buf = Arc::pin_init(CMutex::new(RingBuffer::<BigStruct, 64>::new())).unwrap();