compiletest: tool renaming adjustments

Author: Firestar99

tests/compiletests/ui/spirv-attr/invalid-target.rs

@@ -1,4 +1,4 @@
-// Tests that `#[rust_gpu::spirv(...)]` attributes cannot be applied to the wrong "targets"
+// Tests that `#[spirv(...)]` attributes cannot be applied to the wrong "targets"
 // (i.e. various kinds of definitions and other syntactic categories).
 
 // build-fail
@@ -10,16 +10,18 @@
     trait_alias
 )]
 
+use spirv_std::spirv;
+
 // NOTE(eddyb) in the interest of keeping this test manageable, only one of
-// each of the following categories of `#[rust_gpu::spirv(...)]` attributes is used:
+// each of the following categories of `#[spirv(...)]` attributes is used:
 // * entry: `vertex`
 // * storage class: `uniform`
 // * builtin: `position`
 
 // NOTE(eddyb) accounting for the number of errors this test actually produces:
 // * 437 errors, all "attribute is only valid on" (see `invalid-target.stderr`)
-// * 41 uses of `#[rust_gpu::spirv(...)]` in this test
-// * at most 11 attributes per `#[rust_gpu::spirv(...)]`, so an upper bound of `41*11 = 451`
+// * 41 uses of `#[spirv(...)]` in this test
+// * at most 11 attributes per `#[spirv(...)]`, so an upper bound of `41*11 = 451`
 // * the difference between 451 and 437 is 14, i.e. valid attributes, made up of:
 //   * 4 on `_Struct`
 //   * 4 on functions, i.e. 1 on each of:
@@ -29,9 +31,9 @@
 //     * `_fn`
 //   * 6 on `_entry_param`
 
-// NOTE(shesp) Directly using `#[rust_gpu::spirv(...)]` because macro attributes are invalid in most contexts
+// NOTE(shesp) Directly using `#[spirv(...)]` because macro attributes are invalid in most contexts
 
-#[rust_gpu::spirv(
+#[spirv(
     sampler, block, sampled_image, generic_image_type, // struct-only
     vertex, // fn-only
     uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
@@ -40,77 +42,77 @@ macro_rules! _macro {
     () => {};
 }
 
-#[rust_gpu::spirv(
+#[spirv(
     sampler, block, sampled_image, generic_image_type, // struct-only
     vertex, // fn-only
     uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
 )]
 extern crate spirv_std as _;
 
-#[rust_gpu::spirv(
+#[spirv(
     sampler, block, sampled_image, generic_image_type, // struct-only
     vertex, // fn-only
     uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
 )]
 use spirv_std as _;
 
-#[rust_gpu::spirv(
+#[spirv(
     sampler, block, sampled_image, generic_image_type, // struct-only
     vertex, // fn-only
     uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
 )]
 mod _mod {}
 
-#[rust_gpu::spirv(
+#[spirv(
     sampler, block, sampled_image, generic_image_type, // struct-only
     vertex, // fn-only
     uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
 )]
 extern "C" {
-    #[rust_gpu::spirv(
+    #[spirv(
         sampler, block, sampled_image, generic_image_type, // struct-only
         vertex, // fn-only
         uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
     )]
     type _ForeignTy;
 
-    #[rust_gpu::spirv(
+    #[spirv(
         sampler, block, sampled_image, generic_image_type, // struct-only
         vertex, // fn-only
         uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
     )]
     static _FOREIGN_STATIC: ();
 
-    #[rust_gpu::spirv(
+    #[spirv(
         sampler, block, sampled_image, generic_image_type, // struct-only
         vertex, // fn-only
         uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
     )]
     fn _foreign_fn();
 }
 
-#[rust_gpu::spirv(
+#[spirv(
     sampler, block, sampled_image, generic_image_type, // struct-only
     vertex, // fn-only
     uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
 )]
 static _STATIC: () = ();
 
-#[rust_gpu::spirv(
+#[spirv(
     sampler, block, sampled_image, generic_image_type, // struct-only
     vertex, // fn-only
     uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
 )]
 const _CONST: () = ();
 
-#[rust_gpu::spirv(
+#[spirv(
     sampler, block, sampled_image, generic_image_type, // struct-only
     vertex, // fn-only
     uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
 )]
 type _TyAlias = ();
 
-#[rust_gpu::spirv(
+#[spirv(
     sampler, block, sampled_image, generic_image_type, // struct-only
     vertex, // fn-only
     uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
@@ -121,19 +123,19 @@ fn _opaque_ty_definer() -> _OpaqueTy {
     ()
 }
 
-#[rust_gpu::spirv(
+#[spirv(
     sampler, block, sampled_image, generic_image_type, // struct-only
     vertex, // fn-only
     uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
 )]
 enum _Enum {
-    #[rust_gpu::spirv(
+    #[spirv(
         sampler, block, sampled_image, generic_image_type, // struct-only
         vertex, // fn-only
         uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
     )]
     _Variant {
-        #[rust_gpu::spirv(
+        #[spirv(
             sampler, block, sampled_image, generic_image_type, // struct-only
             vertex, // fn-only
             uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
@@ -142,148 +144,148 @@ enum _Enum {
     },
 }
 
-#[rust_gpu::spirv(
+#[spirv(
     sampler, block, sampled_image, generic_image_type, // struct-only
     vertex, // fn-only
     uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
 )]
 union _Union {
-    #[rust_gpu::spirv(
+    #[spirv(
         sampler, block, sampled_image, generic_image_type, // struct-only
         vertex, // fn-only
         uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
     )]
     _field: (),
 }
 
-#[rust_gpu::spirv(
+#[spirv(
     vertex, // fn-only
     uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
 )]
 struct _Struct {
-    #[rust_gpu::spirv(
+    #[spirv(
         sampler, block, sampled_image, generic_image_type, // struct-only
         vertex, // fn-only
         uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
     )]
     _field: (),
 }
 
-#[rust_gpu::spirv(
+#[spirv(
     sampler, block, sampled_image, generic_image_type, // struct-only
     vertex, // fn-only
     uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
 )]
 impl _Struct {
-    #[rust_gpu::spirv(
+    #[spirv(
         sampler, block, sampled_image, generic_image_type, // struct-only
         vertex, // fn-only
         uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
     )]
     const _INHERENT_ASSOC_CONST: () = ();
 
-    #[rust_gpu::spirv(
+    #[spirv(
         sampler, block, sampled_image, generic_image_type, // struct-only
         uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
     )]
     fn _inherent_method() {}
 }
 
-#[rust_gpu::spirv(
+#[spirv(
     sampler, block, sampled_image, generic_image_type, // struct-only
     vertex, // fn-only
     uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
 )]
 trait _TraitAlias = Copy;
 
-#[rust_gpu::spirv(
+#[spirv(
     sampler, block, sampled_image, generic_image_type, // struct-only
     vertex, // fn-only
     uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
 )]
 trait _Trait {
-    #[rust_gpu::spirv(
+    #[spirv(
         sampler, block, sampled_image, generic_image_type, // struct-only
         vertex, // fn-only
         uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
     )]
     type _AssocTy;
 
-    #[rust_gpu::spirv(
+    #[spirv(
         sampler, block, sampled_image, generic_image_type, // struct-only
         vertex, // fn-only
         uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
     )]
     const _TRAIT_ASSOC_CONST: ();
 
-    #[rust_gpu::spirv(
+    #[spirv(
         sampler, block, sampled_image, generic_image_type, // struct-only
         vertex, // fn-only
         uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
     )]
     fn _trait_method();
 
-    #[rust_gpu::spirv(
+    #[spirv(
         sampler, block, sampled_image, generic_image_type, // struct-only
         uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
     )]
     fn _trait_method_with_default() {}
 }
 
-#[rust_gpu::spirv(
+#[spirv(
     sampler, block, sampled_image, generic_image_type, // struct-only
     vertex, // fn-only
     uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
 )]
 impl _Trait for () {
-    #[rust_gpu::spirv(
+    #[spirv(
         sampler, block, sampled_image, generic_image_type, // struct-only
         vertex, // fn-only
         uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
     )]
     type _AssocTy = ();
 
-    #[rust_gpu::spirv(
+    #[spirv(
         sampler, block, sampled_image, generic_image_type, // struct-only
         vertex, // fn-only
         uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
     )]
     const _TRAIT_ASSOC_CONST: () = ();
 
-    #[rust_gpu::spirv(
+    #[spirv(
         sampler, block, sampled_image, generic_image_type, // struct-only
         uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
     )]
     fn _trait_method() {}
 }
 
-#[rust_gpu::spirv(
+#[spirv(
     sampler, block, sampled_image, generic_image_type, // struct-only
     uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
 )]
 fn _fn(
-    #[rust_gpu::spirv(
+    #[spirv(
         sampler, block, sampled_image, generic_image_type, // struct-only
         vertex, // fn-only
     )]
     _entry_param: (),
 ) {
-    #[rust_gpu::spirv(
+    #[spirv(
         sampler, block, sampled_image, generic_image_type, // struct-only
         vertex, // fn-only
         uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
     )]
     let _statement = ();
 
-    let _closure = #[rust_gpu::spirv(
+    let _closure = #[spirv(
             sampler, block, sampled_image, generic_image_type, // struct-only
             vertex, // fn-only
             uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
         )]
     || {};
 
     (
-        #[rust_gpu::spirv(
+        #[spirv(
             sampler, block, sampled_image, generic_image_type, // struct-only
             vertex, // fn-only
             uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
@@ -293,7 +295,7 @@ fn _fn(
     );
 
     match () {
-        #[rust_gpu::spirv(
+        #[spirv(
             sampler, block, sampled_image, generic_image_type, // struct-only
             vertex, // fn-only
             uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
@@ -303,17 +305,17 @@ fn _fn(
 }
 
 fn _fn_with_generics<
-    #[rust_gpu::spirv(
+    #[spirv(
         sampler, block, sampled_image, generic_image_type, // struct-only
         vertex, // fn-only
         uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
     )] '_lifetime_param,
-    #[rust_gpu::spirv(
+    #[spirv(
         sampler, block, sampled_image, generic_image_type, // struct-only
         vertex, // fn-only
         uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only
     )] _TyParam,
-    #[rust_gpu::spirv(
+    #[spirv(
         sampler, block, sampled_image, generic_image_type, // struct-only
         vertex, // fn-only
         uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only