move mod: move arch::atomics to atomic, remove s to match std

Author: Firestar99

crates/spirv-std/src/arch.rs

@@ -9,10 +9,8 @@ use crate::{Scalar, SignedInteger, UnsignedInteger, Vector};
 #[cfg(target_arch = "spirv")]
 use core::arch::asm;
 
-mod atomics;
 mod barrier;
 
-pub use atomics::*;
 pub use barrier::*;
 
 /// Result is true if any component of `vector` is true, otherwise result is

crates/spirv-std/src/arch/atomics.rs crates/spirv-std/src/atomic.rscrates/spirv-std/src/arch/atomics.rs renamed to crates/spirv-std/src/atomic.rs

@@ -1,3 +1,5 @@
+//! Intrinsics for atomic operations
+
 #[cfg(target_arch = "spirv")]
 use core::arch::asm;
 

crates/spirv-std/src/lib.rs

@@ -92,6 +92,7 @@ pub use macros::spirv;
 pub use macros::{debug_printf, debug_printfln};
 
 pub mod arch;
+pub mod atomic;
 pub mod byte_addressable_buffer;
 pub mod debug_printf;
 pub mod float;

tests/compiletests/ui/arch/atomic_i_increment.rs

@@ -8,7 +8,7 @@ pub fn main(#[spirv(descriptor_set = 0, binding = 0, storage_buffer)] buffer: &m
     let reference = unsafe { buffer.index_unchecked_mut(0) };
 
     let old = unsafe {
-        spirv_std::arch::atomic_i_increment::<
+        spirv_std::atomic::atomic_i_increment::<
             _,
             { spirv_std::memory::Scope::Workgroup as u32 },
             { spirv_std::memory::Semantics::NONE.bits() as u32 },