libc: uncomment items that were commented due to old ctest

Author: mbyx

src/new/linux_uapi/linux/can.rs

@@ -1,9 +1,6 @@
 //! Header: `uapi/linux/can.h`
 
-// FIXME(ctest): we shouldn't have to specify the path but garando doesn't find modules otherwise
-#[path = "can/j1939.rs"]
 pub(crate) mod j1939;
-#[path = "can/raw.rs"]
 pub(crate) mod raw;
 
 pub use j1939::*;

src/primitives.rs

@@ -99,6 +99,8 @@ cfg_if! {
             target_os = "watchos"
         ))
     ))] {
+        use core::mem::{align_of, size_of};
+
         // This introduces partial support for FFI with __int128 and
         // equivalent types on platforms where Rust's definition is validated
         // to match the standard C ABI of that platform.
@@ -143,34 +145,32 @@ cfg_if! {
         const _SIZE_128: usize = 16;
         const _ALIGN_128: usize = 16;
 
-        // FIXME(ctest): ctest doesn't handle `_` as an identifier so these tests are temporarily
-        // disabled.
-        // macro_rules! static_assert_eq {
-        //     ($a:expr, $b:expr) => {
-        //         const _: [(); $a] = [(); $b];
-        //     };
-        // }
+        macro_rules! static_assert_eq {
+            ($a:expr, $b:expr) => {
+                const _: [(); $a] = [(); $b];
+            };
+        }
+
+        // Since Rust doesn't officially guarantee that these types
+        // have compatible ABIs, we const assert that these values have the
+        // known size/align of the target platform's libc. If rustc ever
+        // tries to regress things, it will cause a compilation error.
         //
-        // // Since Rust doesn't officially guarantee that these types
-        // // have compatible ABIs, we const assert that these values have the
-        // // known size/align of the target platform's libc. If rustc ever
-        // // tries to regress things, it will cause a compilation error.
-        // //
-        // // This isn't a bullet-proof solution because e.g. it doesn't
-        // // catch the fact that llvm and gcc disagree on how x64 __int128
-        // // is actually *passed* on the stack (clang underaligns it for
-        // // the same reason that rustc *never* properly aligns it).
-        // static_assert_eq!(size_of::<__int128>(), _SIZE_128);
-        // static_assert_eq!(align_of::<__int128>(), _ALIGN_128);
-
-        // static_assert_eq!(size_of::<__uint128>(), _SIZE_128);
-        // static_assert_eq!(align_of::<__uint128>(), _ALIGN_128);
-
-        // static_assert_eq!(size_of::<__int128_t>(), _SIZE_128);
-        // static_assert_eq!(align_of::<__int128_t>(), _ALIGN_128);
-
-        // static_assert_eq!(size_of::<__uint128_t>(), _SIZE_128);
-        // static_assert_eq!(align_of::<__uint128_t>(), _ALIGN_128);
+        // This isn't a bullet-proof solution because e.g. it doesn't
+        // catch the fact that llvm and gcc disagree on how x64 __int128
+        // is actually *passed* on the stack (clang underaligns it for
+        // the same reason that rustc *never* properly aligns it).
+        static_assert_eq!(size_of::<__int128>(), _SIZE_128);
+        static_assert_eq!(align_of::<__int128>(), _ALIGN_128);
+
+        static_assert_eq!(size_of::<__uint128>(), _SIZE_128);
+        static_assert_eq!(align_of::<__uint128>(), _ALIGN_128);
+
+        static_assert_eq!(size_of::<__int128_t>(), _SIZE_128);
+        static_assert_eq!(align_of::<__int128_t>(), _ALIGN_128);
+
+        static_assert_eq!(size_of::<__uint128_t>(), _SIZE_128);
+        static_assert_eq!(align_of::<__uint128_t>(), _ALIGN_128);
     } else if #[cfg(all(
         target_arch = "aarch64",
         any(

src/unix/linux_like/mod.rs

@@ -1736,6 +1736,8 @@ cfg_if! {
 // https://github.com/search?q=repo%3Atorvalds%2Flinux+%22%23define+_IOC_NONE%22&type=code
 cfg_if! {
     if #[cfg(not(target_os = "emscripten"))] {
+        use core::debug_assert;
+
         const _IOC_NRBITS: u32 = 8;
         const _IOC_TYPEBITS: u32 = 8;
 
@@ -1780,13 +1782,10 @@ cfg_if! {
 
         /// Build an ioctl number, analogous to the C macro of the same name.
         const fn _IOC(dir: u32, ty: u32, nr: u32, size: usize) -> Ioctl {
-            // FIXME(ctest) the `garando_syntax` crate (used by ctest in the CI test suite)
-            // cannot currently parse these `debug_assert!`s
-            //
-            // debug_assert!(dir <= _IOC_DIRMASK);
-            // debug_assert!(ty <= _IOC_TYPEMASK);
-            // debug_assert!(nr <= _IOC_NRMASK);
-            // debug_assert!(size <= (_IOC_SIZEMASK as usize));
+            debug_assert!(dir <= _IOC_DIRMASK);
+            debug_assert!(ty <= _IOC_TYPEMASK);
+            debug_assert!(nr <= _IOC_NRMASK);
+            debug_assert!(size <= (_IOC_SIZEMASK as usize));
 
             ((dir << _IOC_DIRSHIFT)
                 | (ty << _IOC_TYPESHIFT)