scalar or vector: reexport all Scalar traits in lib.rs, make mods private

apart from `mod float`, which contains functionality

Author: Firestar99

crates/spirv-std/src/arch.rs

@@ -4,12 +4,8 @@
 //! These functions will typically map to a single instruction, and will perform
 //! no additional safety checks beyond type-checking.
 #[cfg(target_arch = "spirv")]
-use crate::integer::Integer;
-use crate::{
-    integer::{SignedInteger, UnsignedInteger},
-    scalar::Scalar,
-    vector::Vector,
-};
+use crate::Integer;
+use crate::{Scalar, SignedInteger, UnsignedInteger, Vector};
 #[cfg(target_arch = "spirv")]
 use core::arch::asm;
 use glam::UVec2;

crates/spirv-std/src/arch/atomics.rs

@@ -1,11 +1,7 @@
 #[cfg(target_arch = "spirv")]
 use core::arch::asm;
 
-use crate::{
-    float::Float,
-    integer::{Integer, SignedInteger, UnsignedInteger},
-    number::Number,
-};
+use crate::{Float, Integer, Number, SignedInteger, UnsignedInteger};
 
 /// Atomically load through `ptr` using the given `SEMANTICS`. All subparts of
 /// the value that is loaded are read atomically with respect to all other

crates/spirv-std/src/arch/subgroup.rs

@@ -1,10 +1,9 @@
+use crate::VectorOrScalar;
 #[cfg(target_arch = "spirv")]
 use crate::arch::barrier;
-use crate::float::Float;
-use crate::integer::{Integer, SignedInteger, UnsignedInteger};
 #[cfg(target_arch = "spirv")]
 use crate::memory::{Scope, Semantics};
-use crate::vector::VectorOrScalar;
+use crate::{Float, Integer, SignedInteger, UnsignedInteger};
 #[cfg(target_arch = "spirv")]
 use core::arch::asm;
 

crates/spirv-std/src/image.rs

@@ -1,24 +1,21 @@
 //! Image types
 
+pub use self::params::{ImageCoordinate, ImageCoordinateSubpassData, ImageSizeQuery, SampleType};
 #[cfg(target_arch = "spirv")]
-use crate::vector::VectorTruncateInto;
+use crate::VectorTruncateInto;
+pub use crate::macros::Image;
+use crate::{Float, Integer, Sampler, Vector};
 #[cfg(target_arch = "spirv")]
 use core::arch::asm;
-
-mod params;
-
-/// Contains extra image operands
-pub mod sample_with;
-
-pub use self::params::{ImageCoordinate, ImageCoordinateSubpassData, ImageSizeQuery, SampleType};
-pub use crate::macros::Image;
+use sample_with::{NoneTy, SampleParams, SomeTy};
 pub use spirv_std_types::image_params::{
     AccessQualifier, Arrayed, Dimensionality, ImageDepth, ImageFormat, Multisampled, Sampled,
 };
 
-use sample_with::{NoneTy, SampleParams, SomeTy};
+mod params;
 
-use crate::{Sampler, float::Float, integer::Integer, vector::Vector};
+/// Contains extra image operands
+pub mod sample_with;
 
 /// Re-export of primitive types to ensure the `Image` proc macro always points
 /// to the right type.

crates/spirv-std/src/image/params.rs

@@ -1,5 +1,5 @@
 use super::{Arrayed, Dimensionality, ImageFormat};
-use crate::{integer::Integer, scalar::Scalar, vector::Vector, vector::VectorTruncateInto};
+use crate::{Integer, Scalar, Vector, VectorTruncateInto};
 
 /// Marker trait for arguments that accept single scalar values or vectors
 /// of scalars. Defines 2-, 3- and 4-component vector types based on the sample type.

crates/spirv-std/src/lib.rs

@@ -94,24 +94,29 @@ pub mod byte_addressable_buffer;
 pub mod float;
 pub mod image;
 pub mod indirect_command;
-pub mod integer;
+mod integer;
 pub mod matrix;
 pub mod memory;
-pub mod number;
+mod number;
 pub mod ray_tracing;
 mod runtime_array;
 mod sampler;
-pub mod scalar;
+mod scalar;
 pub(crate) mod sealed;
 mod typed_buffer;
-pub mod vector;
+mod vector;
 
 pub use self::sampler::Sampler;
 pub use crate::macros::Image;
 pub use byte_addressable_buffer::ByteAddressableBuffer;
+pub use float::Float;
+pub use integer::*;
 pub use num_traits;
+pub use number::*;
 pub use runtime_array::*;
+pub use scalar::*;
 pub use typed_buffer::*;
+pub use vector::*;
 
 pub use glam;
 
@@ -136,11 +141,7 @@ pub fn debug_printf_assert_is_type<T>(ty: T) -> T {
 }
 
 #[doc(hidden)]
-pub fn debug_printf_assert_is_vector<
-    TY: crate::scalar::Scalar,
-    V: crate::vector::Vector<TY, SIZE>,
-    const SIZE: usize,
->(
+pub fn debug_printf_assert_is_vector<TY: Scalar, V: Vector<TY, SIZE>, const SIZE: usize>(
     vec: V,
 ) -> V {
     vec

crates/spirv-std/src/vector.rs

@@ -1,6 +1,6 @@
 //! Traits related to vectors.
 
-use crate::scalar::Scalar;
+use crate::Scalar;
 use core::num::NonZeroUsize;
 use glam::{Vec3Swizzles, Vec4Swizzles};
 

tests/compiletests/ui/arch/all.rs

@@ -1,8 +1,6 @@
 // build-pass
 
-use core::num::NonZeroUsize;
 use spirv_std::spirv;
-use spirv_std::{scalar::Scalar, vector::Vector, vector::VectorOrScalar};
 
 #[spirv(fragment)]
 pub fn main() {

tests/compiletests/ui/arch/any.rs

@@ -1,8 +1,6 @@
 // build-pass
 
-use core::num::NonZeroUsize;
 use spirv_std::spirv;
-use spirv_std::{scalar::Scalar, vector::Vector, vector::VectorOrScalar};
 
 #[spirv(fragment)]
 pub fn main() {

tests/compiletests/ui/arch/debug_printf_type_checking.stderr

@@ -75,7 +75,7 @@ LL |         debug_printf!("%f", 11_u32);
    |                             |
    |                             this argument influences the return type of `debug_printf_assert_is_type`
 note: function defined here
-  --> $SPIRV_STD_SRC/lib.rs:134:8
+  --> $SPIRV_STD_SRC/lib.rs:139:8
    |
 LL | pub fn debug_printf_assert_is_type<T>(ty: T) -> T {
    |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -103,7 +103,7 @@ LL |         debug_printf!("%u", 11.0_f32);
    |                             |
    |                             this argument influences the return type of `debug_printf_assert_is_type`
 note: function defined here
-  --> $SPIRV_STD_SRC/lib.rs:134:8
+  --> $SPIRV_STD_SRC/lib.rs:139:8
    |
 LL | pub fn debug_printf_assert_is_type<T>(ty: T) -> T {
    |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -131,13 +131,10 @@ LL |         debug_printf!("%v2f", 11.0);
              `IVec3` implements `Vector<i32, 3>`
            and 8 others
 note: required by a bound in `debug_printf_assert_is_vector`
-  --> $SPIRV_STD_SRC/lib.rs:141:8
+  --> $SPIRV_STD_SRC/lib.rs:144:53
    |
-LL | pub fn debug_printf_assert_is_vector<
-   |        ----------------------------- required by a bound in this function
-LL |     TY: crate::scalar::Scalar,
-LL |     V: crate::vector::Vector<TY, SIZE>,
-   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `debug_printf_assert_is_vector`
+LL | pub fn debug_printf_assert_is_vector<TY: Scalar, V: Vector<TY, SIZE>, const SIZE: usize>(
+   |                                                     ^^^^^^^^^^^^^^^^ required by this bound in `debug_printf_assert_is_vector`
    = note: this error originates in the macro `debug_printf` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0308]: mismatched types
@@ -157,7 +154,7 @@ LL |         debug_printf!("%f", Vec2::splat(33.3));
    |                             |
    |                             this argument influences the return type of `debug_printf_assert_is_type`
 note: function defined here
-  --> $SPIRV_STD_SRC/lib.rs:134:8
+  --> $SPIRV_STD_SRC/lib.rs:139:8
    |
 LL | pub fn debug_printf_assert_is_type<T>(ty: T) -> T {
    |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^