format args decompiler: move support functions in spirv-std to mod debug_printf

Currently, every time `lib.rs` changes, there's a change in the debug printf compiletest stderr, which is causing a lot of churn.

Author: Firestar99

crates/spirv-std/macros/src/debug_printf.rs

@@ -205,10 +205,10 @@ pub fn debug_printf_inner(input: DebugPrintfInput) -> TokenStream {
 
         let assert_fn = match format_argument {
             FormatType::Scalar { ty } => {
-                quote::quote! { spirv_std::debug_printf_assert_is_type::<#ty> }
+                quote::quote! { spirv_std::debug_printf::assert_is_type::<#ty> }
             }
             FormatType::Vector { ty, width } => {
-                quote::quote! { spirv_std::debug_printf_assert_is_vector::<#ty, _, #width> }
+                quote::quote! { spirv_std::debug_printf::assert_is_vector::<#ty, _, #width> }
             }
         };
 

crates/spirv-std/src/debug_printf.rs

@@ -0,0 +1,13 @@
+//! support functions for debug printf
+
+use crate::{Scalar, Vector};
+
+#[doc(hidden)]
+pub fn assert_is_type<T>(ty: T) -> T {
+    ty
+}
+
+#[doc(hidden)]
+pub fn assert_is_vector<TY: Scalar, V: Vector<TY, SIZE>, const SIZE: usize>(vec: V) -> V {
+    vec
+}

crates/spirv-std/src/lib.rs

@@ -88,9 +88,11 @@
 #[macro_use]
 pub extern crate spirv_std_macros as macros;
 pub use macros::spirv;
+pub use macros::{debug_printf, debug_printfln};
 
 pub mod arch;
 pub mod byte_addressable_buffer;
+pub mod debug_printf;
 pub mod float;
 pub mod image;
 pub mod indirect_command;
@@ -130,15 +132,3 @@ extern "C" fn rust_eh_personality() {}
 #[doc(hidden)]
 /// [spirv_std_types]
 pub fn workaround_rustdoc_ice_84738() {}
-
-#[doc(hidden)]
-pub fn debug_printf_assert_is_type<T>(ty: T) -> T {
-    ty
-}
-
-#[doc(hidden)]
-pub fn debug_printf_assert_is_vector<TY: Scalar, V: Vector<TY, SIZE>, const SIZE: usize>(
-    vec: V,
-) -> V {
-    vec
-}

tests/compiletests/ui/arch/debug_printf_type_checking.stderr

@@ -73,12 +73,12 @@ help: the return type of this call is `u32` due to the type of the argument pass
 LL |         debug_printf!("%f", 11_u32);
    |         ^^^^^^^^^^^^^^^^^^^^------^
    |                             |
-   |                             this argument influences the return type of `debug_printf_assert_is_type`
+   |                             this argument influences the return type of `assert_is_type`
 note: function defined here
-  --> $SPIRV_STD_SRC/lib.rs:135:8
+  --> $SPIRV_STD_SRC/debug_printf.rs:6:8
    |
-LL | pub fn debug_printf_assert_is_type<T>(ty: T) -> T {
-   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | pub fn assert_is_type<T>(ty: T) -> T {
+   |        ^^^^^^^^^^^^^^
    = note: this error originates in the macro `debug_printf` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: change the type of the numeric literal from `u32` to `f32`
    |
@@ -101,12 +101,12 @@ help: the return type of this call is `f32` due to the type of the argument pass
 LL |         debug_printf!("%u", 11.0_f32);
    |         ^^^^^^^^^^^^^^^^^^^^--------^
    |                             |
-   |                             this argument influences the return type of `debug_printf_assert_is_type`
+   |                             this argument influences the return type of `assert_is_type`
 note: function defined here
-  --> $SPIRV_STD_SRC/lib.rs:135:8
+  --> $SPIRV_STD_SRC/debug_printf.rs:6:8
    |
-LL | pub fn debug_printf_assert_is_type<T>(ty: T) -> T {
-   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | pub fn assert_is_type<T>(ty: T) -> T {
+   |        ^^^^^^^^^^^^^^
    = note: this error originates in the macro `debug_printf` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: change the type of the numeric literal from `f32` to `u32`
    |
@@ -130,11 +130,11 @@ LL |         debug_printf!("%v2f", 11.0);
              `IVec2` implements `Vector<i32, 2>`
              `IVec3` implements `Vector<i32, 3>`
            and 8 others
-note: required by a bound in `debug_printf_assert_is_vector`
-  --> $SPIRV_STD_SRC/lib.rs:140:53
+note: required by a bound in `assert_is_vector`
+  --> $SPIRV_STD_SRC/debug_printf.rs:11:40
    |
-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`
+LL | pub fn assert_is_vector<TY: Scalar, V: Vector<TY, SIZE>, const SIZE: usize>(vec: V) -> V {
+   |                                        ^^^^^^^^^^^^^^^^ required by this bound in `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
@@ -152,12 +152,12 @@ help: the return type of this call is `Vec2` due to the type of the argument pas
 LL |         debug_printf!("%f", Vec2::splat(33.3));
    |         ^^^^^^^^^^^^^^^^^^^^-----------------^
    |                             |
-   |                             this argument influences the return type of `debug_printf_assert_is_type`
+   |                             this argument influences the return type of `assert_is_type`
 note: function defined here
-  --> $SPIRV_STD_SRC/lib.rs:135:8
+  --> $SPIRV_STD_SRC/debug_printf.rs:6:8
    |
-LL | pub fn debug_printf_assert_is_type<T>(ty: T) -> T {
-   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | pub fn assert_is_type<T>(ty: T) -> T {
+   |        ^^^^^^^^^^^^^^
    = note: this error originates in the macro `debug_printf` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 14 previous errors