Snap for 6439596 from 55ae73b19d05d518d0eb7c23b4609b420f8e6909 to qt-aml-tzdata-releaseq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11q_tzdata_aml_297100000android12-mainline-tzdata-releaseandroid10-mainline-tzdata-releaseandroid10-android13-mainline-tzdata-release

Change-Id: Iadd06c0aa17af406a891bad776abfeb838e4bd80

424 files changed, 542 insertions, 463 deletions

diff --git a/Android.bp b/Android.bp
index c8fe151..2bc5269 100644
--- a/Android.bp
+++ b/Android.bp
@@ -194,6 +194,24 @@ cc_binary_host {
     },
 }
 
+cc_binary_host {
+    name: "lld",
+    srcs: ["lld_main.cpp"],
+    ldflags: ["-static"],
+    stl: "libc++_static",
+    target: {
+        darwin: {
+            enabled: false,
+        },
+        linux: {
+            enabled: false,
+        },
+        windows: {
+            enabled: true,
+        },
+    },
+}
+
 subdirs = [
     "BitWriter_2_9",
     "BitWriter_2_9_func",
diff --git a/README.html b/README.html
index d17c23b..6cc0dd7 100644
--- a/README.html
+++ b/README.html
@@ -373,7 +373,7 @@ $ out/host/linux-x86/bin/llvm-rs-cc \
   -MD \
   -I frameworks/base/libs/rs/script_api/include \
   -I external/clang/lib/Headers \
-  frameworks/base/libs/rs/java/Fountain/src/com/android/fountain/fountain.rscript
+  frameworks/base/libs/rs/java/Fountain/src/com/android/fountain/fountain.rs
 </pre>
 <p>This command will generate:</p>
 <ul class="simple">
@@ -384,8 +384,8 @@ $ out/host/linux-x86/bin/llvm-rs-cc \
 <p>The <strong>Script*.java</strong> files above will be documented below.</p>
 </div>
 <div class="section" id="example-program-fountain-rs">
-<h1>Example Program: fountain.rscript</h1>
-<p>fountain.rscript is in the Renderscript language, which is based on the standard
+<h1>Example Program: fountain.rs</h1>
+<p>fountain.rs is in the Renderscript language, which is based on the standard
 C99. However, llvm-rs-cc goes beyond &quot;clang -std=c99&quot; and provides the
 following important features:</p>
 </div>
@@ -398,7 +398,7 @@ developers can invoke those APIs.</p>
 <p>To do that, a Renderscript programmer should specify the package name, so
 that llvm-rs-cc knows the package expression and hence the directory
 for outputting ScriptC_[SCRIPT_NAME].java.</p>
-<p>In fountain.rscript, we have:</p>
+<p>In fountain.rs, we have:</p>
 <pre class="literal-block">
 #pragma rs java_package_name(com.android.fountain)
 </pre>
@@ -435,7 +435,7 @@ to the functions and global variables within a script. In summary,
 global variables and functions within a script that are not declared
 static will generate get, set, or invoke methods.  This provides a way
 to set the data within a script and call its functions.</p>
-<p>Take the addParticles function in fountain.rscript as an example:</p>
+<p>Take the addParticles function in fountain.rs as an example:</p>
 <pre class="literal-block">
 void addParticles(int rate, float x, float y, int index, bool newColor) {
   ...
@@ -451,7 +451,7 @@ void invoke_addParticles(int rate, float x, float y,
 </div>
 <div class="section" id="export-user-defined-structs">
 <h1>3. Export User-Defined Structs</h1>
-<p>In fountain.rscript, we have:</p>
+<p>In fountain.rs, we have:</p>
 <pre class="literal-block">
 typedef struct __attribute__((packed, aligned(4))) Point {
   float2 delta;
diff --git a/README.rst b/README.rst
index 48651a4..7eab8af 100644
--- a/README.rst
+++ b/README.rst
@@ -77,7 +77,7 @@ log::
     -MD \
     -I frameworks/base/libs/rs/script_api/include \
     -I external/clang/lib/Headers \
-    frameworks/base/libs/rs/java/Fountain/src/com/android/fountain/fountain.rscript
+    frameworks/base/libs/rs/java/Fountain/src/com/android/fountain/fountain.rs
 
 This command will generate:
 
@@ -90,10 +90,10 @@ This command will generate:
 The **Script\*.java** files above will be documented below.
 
 
-Example Program: fountain.rscript
+Example Program: fountain.rs
 ----------------------------
 
-fountain.rscript is in the Renderscript language, which is based on the standard
+fountain.rs is in the Renderscript language, which is based on the standard
 C99. However, llvm-rs-cc goes beyond "clang -std=c99" and provides the
 following important features:
 
@@ -109,7 +109,7 @@ following important features:
   that llvm-rs-cc knows the package expression and hence the directory
   for outputting ScriptC_[SCRIPT_NAME].java.
 
-  In fountain.rscript, we have::
+  In fountain.rs, we have::
 
     #pragma rs java_package_name(com.android.fountain)
 
@@ -149,7 +149,7 @@ global variables and functions within a script that are not declared
 static will generate get, set, or invoke methods.  This provides a way
 to set the data within a script and call its functions.
 
-Take the addParticles function in fountain.rscript as an example::
+Take the addParticles function in fountain.rs as an example::
 
   void addParticles(int rate, float x, float y, int index, bool newColor) {
     ...
@@ -166,7 +166,7 @@ llvm-rs-cc will genearte ScriptC_fountain.java as follows::
 3. Export User-Defined Structs
 ------------------------------
 
-In fountain.rscript, we have::
+In fountain.rs, we have::
 
   typedef struct __attribute__((packed, aligned(4))) Point {
     float2 delta;
diff --git a/lit-tests/P_alloc_in_struct/alloc_in_struct.rscript b/lit-tests/P_alloc_in_struct/alloc_in_struct.rs
index 24742fb..24742fb 100644
--- a/lit-tests/P_alloc_in_struct/alloc_in_struct.rscript
+++ b/lit-tests/P_alloc_in_struct/alloc_in_struct.rs
diff --git a/lit-tests/P_array_init/array_init.rscript b/lit-tests/P_array_init/array_init.rs
index 789b27f..789b27f 100644
--- a/lit-tests/P_array_init/array_init.rscript
+++ b/lit-tests/P_array_init/array_init.rs
diff --git a/lit-tests/P_compute/compute.rscript b/lit-tests/P_compute/compute.rs
index 49405b8..49405b8 100644
--- a/lit-tests/P_compute/compute.rscript
+++ b/lit-tests/P_compute/compute.rs
diff --git a/lit-tests/P_ref_count/func_params.rscript b/lit-tests/P_ref_count/func_params.rs
index 56597ee..56597ee 100644
--- a/lit-tests/P_ref_count/func_params.rscript
+++ b/lit-tests/P_ref_count/func_params.rs
diff --git a/lit-tests/P_ref_count/ref_count.rscript b/lit-tests/P_ref_count/ref_count.rs
index 7f6dae8..7f6dae8 100644
--- a/lit-tests/P_ref_count/ref_count.rscript
+++ b/lit-tests/P_ref_count/ref_count.rs
diff --git a/lit-tests/P_ref_count/ref_count2.rscript b/lit-tests/P_ref_count/ref_count2.rs
index 8ac2d81..8ac2d81 100644
--- a/lit-tests/P_ref_count/ref_count2.rscript
+++ b/lit-tests/P_ref_count/ref_count2.rs
diff --git a/lit-tests/debug/debug_disabled.rscript b/lit-tests/debug/debug_disabled.rs
index d3ddd57..d3ddd57 100644
--- a/lit-tests/debug/debug_disabled.rscript
+++ b/lit-tests/debug/debug_disabled.rs
diff --git a/lit-tests/debug/debug_enabled.rscript b/lit-tests/debug/debug_enabled.rs
index 7f2856a..7f2856a 100644
--- a/lit-tests/debug/debug_enabled.rscript
+++ b/lit-tests/debug/debug_enabled.rs
diff --git a/lit-tests/opt/locals_opt_0.rscript b/lit-tests/opt/locals_opt_0.rs
index 1c1f7de..1c1f7de 100644
--- a/lit-tests/opt/locals_opt_0.rscript
+++ b/lit-tests/opt/locals_opt_0.rs
diff --git a/lit-tests/opt/locals_opt_3.rscript b/lit-tests/opt/locals_opt_3.rs
index e90a538..e90a538 100644
--- a/lit-tests/opt/locals_opt_3.rscript
+++ b/lit-tests/opt/locals_opt_3.rs
diff --git a/lit-tests/opt/locals_opt_default.rscript b/lit-tests/opt/locals_opt_default.rs
index f491956..f491956 100644
--- a/lit-tests/opt/locals_opt_default.rscript
+++ b/lit-tests/opt/locals_opt_default.rs
diff --git a/lit-tests/padding/bitfield.rscript b/lit-tests/padding/bitfield.rs
index 2975c6b..2975c6b 100644
--- a/lit-tests/padding/bitfield.rscript
+++ b/lit-tests/padding/bitfield.rs
diff --git a/lit-tests/padding/more_structs.rscript b/lit-tests/padding/more_structs.rs
index aabbc91..aabbc91 100644
--- a/lit-tests/padding/more_structs.rscript
+++ b/lit-tests/padding/more_structs.rs
diff --git a/lit-tests/padding/small_struct.rscript b/lit-tests/padding/small_struct.rs
index 95057f7..95057f7 100644
--- a/lit-tests/padding/small_struct.rscript
+++ b/lit-tests/padding/small_struct.rs
diff --git a/lit-tests/padding/small_struct_2.rscript b/lit-tests/padding/small_struct_2.rs
index b622cc5..b622cc5 100644
--- a/lit-tests/padding/small_struct_2.rscript
+++ b/lit-tests/padding/small_struct_2.rs
diff --git a/lld_main.cpp b/lld_main.cpp
new file mode 100644
index 0000000..dc095bd
--- /dev/null
+++ b/lld_main.cpp
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2020, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <cstdio>
+#include <cstdlib>
+#include <string>
+#include <vector>
+#include <unistd.h>
+
+int main(int argc, const char **argv) {
+  // Create a copy of argv strings that we can modify, and then eventually
+  // const_cast away the const-ness of the buffers to call execv().
+  std::vector<std::unique_ptr<std::string>> argv_strings;
+  std::vector<const char *> argv_chars;
+
+  // Replace lld.exe with lld-bin\lld.exe instead on Windows.
+  argv_strings.push_back(std::make_unique<std::string>(argv[0]));
+  size_t idx = argv_strings[0]->rfind("lld.exe");
+  argv_strings[0]->insert(idx, "lld-bin\\");
+  argv_chars.push_back(argv_strings[0]->c_str());
+
+  // Make a copy of every other argv entry, and map a pointer to the C string
+  // buffer as argv_chars for use with execv() later.
+  for (int i = 1; i < argc; ++i) {
+    argv_strings.push_back(std::make_unique<std::string>(argv[i]));
+    argv_chars.push_back(argv_strings[i]->c_str());
+  }
+
+  // execv() expects a nullptr to terminate the argument list for argv.
+  argv_chars.push_back(nullptr);
+
+  // We cast away the const-ness of the char buffers, but it should be safe,
+  // since we own these strings.
+  int status = execv(argv_chars[0], const_cast<char **>(argv_chars.data()));
+
+  // We shouldn't get here unless we failed to execute the new binary.
+  if (status != 0) {
+    std::string command;
+    bool first = true;
+    for (auto arg : argv_chars) {
+      if (arg) {
+        if (!first) {
+          command.append(" ");
+        } else {
+          first = false;
+        }
+        command.append(arg);
+      }
+    }
+    fprintf(stderr, "Failed to execute command: %s\n", command.c_str());
+  }
+  return status;
+}
diff --git a/llvm-rs-cc.cpp b/llvm-rs-cc.cpp
index a51e672..7870fe5 100644
--- a/llvm-rs-cc.cpp
+++ b/llvm-rs-cc.cpp
@@ -218,11 +218,6 @@ static void LLVMErrorHandler(void *UserData, const std::string &Message,
   exit(1);
 }
 
-// TODO(b/37755219): detect leaks
-extern "C" const char *__asan_default_options() {
-    return "detect_leaks=0";
-}
-
 int main(int argc, const char **argv) {
   llvm::llvm_shutdown_obj Y; // Call llvm_shutdown() on exit.
   LLVMInitializeARMTargetInfo();
diff --git a/tests/F_Werror/Werror.rscript b/tests/F_Werror/Werror.rs
index f069d88..f069d88 100644
--- a/tests/F_Werror/Werror.rscript
+++ b/tests/F_Werror/Werror.rs
diff --git a/tests/F_Werror/stderr.txt.expect b/tests/F_Werror/stderr.txt.expect
index 4569c10..b58dd9f 100644
--- a/tests/F_Werror/stderr.txt.expect
+++ b/tests/F_Werror/stderr.txt.expect
@@ -1 +1 @@
-Werror.rscript:6:1: error: control reaches end of non-void function
+Werror.rs:6:1: error: control reaches end of non-void function
diff --git a/tests/F_anon_struct/anon_struct.rscript b/tests/F_anon_struct/anon_struct.rs
index 46bd8cb..46bd8cb 100644
--- a/tests/F_anon_struct/anon_struct.rscript
+++ b/tests/F_anon_struct/anon_struct.rs
diff --git a/tests/F_anon_struct/stderr.txt.expect b/tests/F_anon_struct/stderr.txt.expect
index f3bc663..efc6f94 100644
--- a/tests/F_anon_struct/stderr.txt.expect
+++ b/tests/F_anon_struct/stderr.txt.expect
@@ -1 +1 @@
-anon_struct.rscript:4:1: error: anonymous structures cannot be exported
+anon_struct.rs:4:1: error: anonymous structures cannot be exported
diff --git a/tests/F_anon_struct_kernel_sig/anon_struct_kernel_sig.rscript b/tests/F_anon_struct_kernel_sig/anon_struct_kernel_sig.rs
index 028a328..028a328 100644
--- a/tests/F_anon_struct_kernel_sig/anon_struct_kernel_sig.rscript
+++ b/tests/F_anon_struct_kernel_sig/anon_struct_kernel_sig.rs
diff --git a/tests/F_anon_struct_kernel_sig/stderr.txt.expect b/tests/F_anon_struct_kernel_sig/stderr.txt.expect
index e613db5..276aaaf 100644
--- a/tests/F_anon_struct_kernel_sig/stderr.txt.expect
+++ b/tests/F_anon_struct_kernel_sig/stderr.txt.expect
@@ -1 +1 @@
-anon_struct_kernel_sig.rscript:4:9: error: anonymous structures cannot be exported
+anon_struct_kernel_sig.rs:4:9: error: anonymous structures cannot be exported
diff --git a/tests/F_anon_struct_typedef/anon_struct_typedef.rscript b/tests/F_anon_struct_typedef/anon_struct_typedef.rs
index dcd12f4..dcd12f4 100644
--- a/tests/F_anon_struct_typedef/anon_struct_typedef.rscript
+++ b/tests/F_anon_struct_typedef/anon_struct_typedef.rs
diff --git a/tests/F_anon_struct_typedef/stderr.txt.expect b/tests/F_anon_struct_typedef/stderr.txt.expect
index ac34039..88df47d 100644
--- a/tests/F_anon_struct_typedef/stderr.txt.expect
+++ b/tests/F_anon_struct_typedef/stderr.txt.expect
@@ -1 +1 @@
-anon_struct_typedef.rscript:4:9: error: anonymous structures cannot be exported
+anon_struct_typedef.rs:4:9: error: anonymous structures cannot be exported
diff --git a/tests/F_anon_struct_usrdata/anon_struct_usrdata.rscript b/tests/F_anon_struct_usrdata/anon_struct_usrdata.rs
index 1aca542..1aca542 100644
--- a/tests/F_anon_struct_usrdata/anon_struct_usrdata.rscript
+++ b/tests/F_anon_struct_usrdata/anon_struct_usrdata.rs
diff --git a/tests/F_anon_struct_usrdata/stderr.txt.expect b/tests/F_anon_struct_usrdata/stderr.txt.expect
index 1ced3a5..036c53a 100644
--- a/tests/F_anon_struct_usrdata/stderr.txt.expect
+++ b/tests/F_anon_struct_usrdata/stderr.txt.expect
@@ -1 +1 @@
-anon_struct_usrdata.rscript:4:9: error: anonymous structures cannot be exported
+anon_struct_usrdata.rs:4:9: error: anonymous structures cannot be exported
diff --git a/tests/F_bad_pragmas/bad_pragmas.rscript b/tests/F_bad_pragmas/bad_pragmas.rs
index 2ccd9a9..2ccd9a9 100644
--- a/tests/F_bad_pragmas/bad_pragmas.rscript
+++ b/tests/F_bad_pragmas/bad_pragmas.rs
diff --git a/tests/F_bad_pragmas/stderr.txt.expect b/tests/F_bad_pragmas/stderr.txt.expect
index e215ee7..cc2e564 100644
--- a/tests/F_bad_pragmas/stderr.txt.expect
+++ b/tests/F_bad_pragmas/stderr.txt.expect
@@ -1,7 +1,7 @@
-bad_pragmas.rscript:5:9: error: unknown pragma ignored
-bad_pragmas.rscript:6:9: error: unknown pragma ignored
-bad_pragmas.rscript:7:9: error: unknown pragma ignored
-bad_pragmas.rscript:8:8: error: unknown pragma ignored
-bad_pragmas.rscript:9:9: error: unknown pragma ignored
-bad_pragmas.rscript:10:9: error: unknown pragma ignored
-bad_pragmas.rscript:11:9: error: unknown pragma ignored
+bad_pragmas.rs:5:9: error: unknown pragma ignored
+bad_pragmas.rs:6:9: error: unknown pragma ignored
+bad_pragmas.rs:7:9: error: unknown pragma ignored
+bad_pragmas.rs:8:8: error: unknown pragma ignored
+bad_pragmas.rs:9:9: error: unknown pragma ignored
+bad_pragmas.rs:10:9: error: unknown pragma ignored
+bad_pragmas.rs:11:9: error: unknown pragma ignored
diff --git a/tests/F_bad_version_pragma/bad_version_pragma.rscript b/tests/F_bad_version_pragma/bad_version_pragma.rs
index 10bdf7e..10bdf7e 100644
--- a/tests/F_bad_version_pragma/bad_version_pragma.rscript
+++ b/tests/F_bad_version_pragma/bad_version_pragma.rs
diff --git a/tests/F_bad_version_pragma/stderr.txt.expect b/tests/F_bad_version_pragma/stderr.txt.expect
index c768616..68fc9ac 100644
--- a/tests/F_bad_version_pragma/stderr.txt.expect
+++ b/tests/F_bad_version_pragma/stderr.txt.expect
@@ -1,4 +1,4 @@
-bad_version_pragma.rscript:1:17: error: pragma for version in source file must be set to 1
-bad_version_pragma.rscript:2:16: error: pragma for version in source file must be set to 1
-bad_version_pragma.rscript:3:18: error: expected a ')'
-bad_version_pragma.rscript:4:18: error: invalid digit 'a' in decimal constant
+bad_version_pragma.rs:1:17: error: pragma for version in source file must be set to 1
+bad_version_pragma.rs:2:16: error: pragma for version in source file must be set to 1
+bad_version_pragma.rs:3:18: error: expected a ')'
+bad_version_pragma.rs:4:18: error: invalid digit 'a' in decimal constant
diff --git a/tests/F_const_array_arg/const_array_arg.rscript b/tests/F_const_array_arg/const_array_arg.rs
index 0cbb776..0cbb776 100644
--- a/tests/F_const_array_arg/const_array_arg.rscript
+++ b/tests/F_const_array_arg/const_array_arg.rs
diff --git a/tests/F_const_array_arg/stderr.txt.expect b/tests/F_const_array_arg/stderr.txt.expect
index b294bed..9b7ad1d 100644
--- a/tests/F_const_array_arg/stderr.txt.expect
+++ b/tests/F_const_array_arg/stderr.txt.expect
@@ -1 +1 @@
-const_array_arg.rscript:4:10: error: exported function parameters may not have array type: 'float [3]'
+const_array_arg.rs:4:10: error: exported function parameters may not have array type: 'float [3]'
diff --git a/tests/F_ctxt_wrong_api/ctxt_wrong_api.rscript b/tests/F_ctxt_wrong_api/ctxt_wrong_api.rs
index cabf40e..cabf40e 100644
--- a/tests/F_ctxt_wrong_api/ctxt_wrong_api.rscript
+++ b/tests/F_ctxt_wrong_api/ctxt_wrong_api.rs
diff --git a/tests/F_ctxt_wrong_api/stderr.txt.expect b/tests/F_ctxt_wrong_api/stderr.txt.expect
index e357f6c..1ab01a2 100644
--- a/tests/F_ctxt_wrong_api/stderr.txt.expect
+++ b/tests/F_ctxt_wrong_api/stderr.txt.expect
@@ -1 +1 @@
-ctxt_wrong_api.rscript:5:28: error: unknown type name 'rs_kernel_context'
+ctxt_wrong_api.rs:5:28: error: unknown type name 'rs_kernel_context'
diff --git a/tests/F_ctxt_wrong_name/context.rscript b/tests/F_ctxt_wrong_name/context.rs
index d39fbed..d39fbed 100644
--- a/tests/F_ctxt_wrong_name/context.rscript
+++ b/tests/F_ctxt_wrong_name/context.rs
diff --git a/tests/F_ctxt_wrong_name/stderr.txt.expect b/tests/F_ctxt_wrong_name/stderr.txt.expect
index fa24b6d..b102ee6 100644
--- a/tests/F_ctxt_wrong_name/stderr.txt.expect
+++ b/tests/F_ctxt_wrong_name/stderr.txt.expect
@@ -1,2 +1,2 @@
-context.rscript:5:57: error: The special parameter of type 'rs_kernel_context' must be called 'context' instead of 'ct'.
-context.rscript:5:57: error: In compute kernel bad(), special parameter 'context' must be defined before special parameter 'x'.
+context.rs:5:57: error: The special parameter of type 'rs_kernel_context' must be called 'context' instead of 'ct'.
+context.rs:5:57: error: In compute kernel bad(), special parameter 'context' must be defined before special parameter 'x'.
diff --git a/tests/F_ctxt_wrong_place/ctxt_wrong_place.rscript b/tests/F_ctxt_wrong_place/ctxt_wrong_place.rs
index 29298ff..29298ff 100644
--- a/tests/F_ctxt_wrong_place/ctxt_wrong_place.rscript
+++ b/tests/F_ctxt_wrong_place/ctxt_wrong_place.rs
diff --git a/tests/F_ctxt_wrong_place/stderr.txt.expect b/tests/F_ctxt_wrong_place/stderr.txt.expect
index 1761192..fc2a67d 100644
--- a/tests/F_ctxt_wrong_place/stderr.txt.expect
+++ b/tests/F_ctxt_wrong_place/stderr.txt.expect
@@ -1 +1 @@
-ctxt_wrong_place.rscript:9:57: error: In compute kernel bad(), special parameter 'context' must be defined before special parameter 'x'.
+ctxt_wrong_place.rs:9:57: error: In compute kernel bad(), special parameter 'context' must be defined before special parameter 'x'.
diff --git a/tests/F_ctxt_wrong_type/ctxt_wrong_type.rscript b/tests/F_ctxt_wrong_type/ctxt_wrong_type.rs
index 11d2433..11d2433 100644
--- a/tests/F_ctxt_wrong_type/ctxt_wrong_type.rscript
+++ b/tests/F_ctxt_wrong_type/ctxt_wrong_type.rs
diff --git a/tests/F_ctxt_wrong_type/stderr.txt.expect b/tests/F_ctxt_wrong_type/stderr.txt.expect
index 4ec6467..ff2d98c 100644
--- a/tests/F_ctxt_wrong_type/stderr.txt.expect
+++ b/tests/F_ctxt_wrong_type/stderr.txt.expect
@@ -1 +1 @@
-ctxt_wrong_type.rscript:13:53: error: Special parameter 'context' must be of type 'rs_kernel_context'. It is of type 'const rs_kernel_context *'.
+ctxt_wrong_type.rs:13:53: error: Special parameter 'context' must be of type 'rs_kernel_context'. It is of type 'const rs_kernel_context *'.
diff --git a/tests/F_extern_const/extern_const.rscript b/tests/F_extern_const/extern_const.rs
index bf630de..bf630de 100644
--- a/tests/F_extern_const/extern_const.rscript
+++ b/tests/F_extern_const/extern_const.rs
diff --git a/tests/F_extern_const/stderr.txt.expect b/tests/F_extern_const/stderr.txt.expect
index 157fd75..567c9a5 100644
--- a/tests/F_extern_const/stderr.txt.expect
+++ b/tests/F_extern_const/stderr.txt.expect
@@ -1 +1 @@
-extern_const.rscript:4:18: error: invalid declaration of uninitialized constant variable 'extern_const_int'
+extern_const.rs:4:18: error: invalid declaration of uninitialized constant variable 'extern_const_int'
diff --git a/tests/F_float3_array/float3_array.rscript b/tests/F_float3_array/float3_array.rs
index b928569..b928569 100644
--- a/tests/F_float3_array/float3_array.rscript
+++ b/tests/F_float3_array/float3_array.rs
diff --git a/tests/F_float3_array/stderr.txt.expect b/tests/F_float3_array/stderr.txt.expect
index fa27c92..c07208c 100644
--- a/tests/F_float3_array/stderr.txt.expect
+++ b/tests/F_float3_array/stderr.txt.expect
@@ -1 +1 @@
-float3_array.rscript:4:8: error: arrays of width 3 vector types cannot be exported: 'f'
+float3_array.rs:4:8: error: arrays of width 3 vector types cannot be exported: 'f'
diff --git a/tests/F_float3_v13/float3_v13.rscript b/tests/F_float3_v13/float3_v13.rs
index 6957222..6957222 100644
--- a/tests/F_float3_v13/float3_v13.rscript
+++ b/tests/F_float3_v13/float3_v13.rs
diff --git a/tests/F_float3_v13/stderr.txt.expect b/tests/F_float3_v13/stderr.txt.expect
index 5cbf82f..6d84d10 100644
--- a/tests/F_float3_v13/stderr.txt.expect
+++ b/tests/F_float3_v13/stderr.txt.expect
@@ -1 +1 @@
-float3_v13.rscript:9:10: error: structs containing vectors of dimension 3 cannot be exported at this API level: 'myStruct'
+float3_v13.rs:9:10: error: structs containing vectors of dimension 3 cannot be exported at this API level: 'myStruct'
diff --git a/tests/F_foreach_forward_reference/foreach_forward_reference.rscript b/tests/F_foreach_forward_reference/foreach_forward_reference.rs
index 904f6e9..904f6e9 100644
--- a/tests/F_foreach_forward_reference/foreach_forward_reference.rscript
+++ b/tests/F_foreach_forward_reference/foreach_forward_reference.rs
diff --git a/tests/F_foreach_forward_reference/stderr.txt.expect b/tests/F_foreach_forward_reference/stderr.txt.expect
index 48e338e..8e214b1 100644
--- a/tests/F_foreach_forward_reference/stderr.txt.expect
+++ b/tests/F_foreach_forward_reference/stderr.txt.expect
@@ -1,2 +1,2 @@
-foreach_forward_reference.rscript:6:13: error: use of undeclared identifier 'goo'; did you mean 'goto'?
-foreach_forward_reference.rscript:6:13: error: expected expression
+foreach_forward_reference.rs:6:13: error: use of undeclared identifier 'goo'; did you mean 'goto'?
+foreach_forward_reference.rs:6:13: error: expected expression
diff --git a/tests/F_foreach_from_kernel/foreach_from_kernel.rscript b/tests/F_foreach_from_kernel/foreach_from_kernel.rs
index 911170c..911170c 100644
--- a/tests/F_foreach_from_kernel/foreach_from_kernel.rscript
+++ b/tests/F_foreach_from_kernel/foreach_from_kernel.rs
diff --git a/tests/F_foreach_from_kernel/stderr.txt.expect b/tests/F_foreach_from_kernel/stderr.txt.expect
index 9465fbd..d9b82b0 100644
--- a/tests/F_foreach_from_kernel/stderr.txt.expect
+++ b/tests/F_foreach_from_kernel/stderr.txt.expect
@@ -1 +1 @@
-foreach_from_kernel.rscript:13:3: error: Invalid kernel launch call made from inside another kernel.
+foreach_from_kernel.rs:13:3: error: Invalid kernel launch call made from inside another kernel.
diff --git a/tests/F_foreach_non_kernel/foreach_non_kernel.rscript b/tests/F_foreach_non_kernel/foreach_non_kernel.rs
index dafce3c..dafce3c 100644
--- a/tests/F_foreach_non_kernel/foreach_non_kernel.rscript
+++ b/tests/F_foreach_non_kernel/foreach_non_kernel.rs
diff --git a/tests/F_foreach_non_kernel/stderr.txt.expect b/tests/F_foreach_non_kernel/stderr.txt.expect
index 83efdf1..5ec8b50 100644
--- a/tests/F_foreach_non_kernel/stderr.txt.expect
+++ b/tests/F_foreach_non_kernel/stderr.txt.expect
@@ -1,2 +1,2 @@
-foreach_non_kernel.rscript:14:3: error: rsForEach applied to function oldFoo defined without "kernel" attribute
-foreach_non_kernel.rscript:15:3: error: rsForEach applied to function foo defined without "kernel" attribute
+foreach_non_kernel.rs:14:3: error: rsForEach applied to function oldFoo defined without "kernel" attribute
+foreach_non_kernel.rs:15:3: error: rsForEach applied to function foo defined without "kernel" attribute
diff --git a/tests/F_foreach_unexpected_allocs/foreach_unexpected_allocs.rscript b/tests/F_foreach_unexpected_allocs/foreach_unexpected_allocs.rs
index c77b820..c77b820 100644
--- a/tests/F_foreach_unexpected_allocs/foreach_unexpected_allocs.rscript
+++ b/tests/F_foreach_unexpected_allocs/foreach_unexpected_allocs.rs
diff --git a/tests/F_foreach_unexpected_allocs/stderr.txt.expect b/tests/F_foreach_unexpected_allocs/stderr.txt.expect
index ddde50a..0f5b389 100644
--- a/tests/F_foreach_unexpected_allocs/stderr.txt.expect
+++ b/tests/F_foreach_unexpected_allocs/stderr.txt.expect
@@ -1,2 +1,2 @@
-foreach_unexpected_allocs.rscript:10:3: error: Number of input and output allocations unexpected for kernel function foo
-foreach_unexpected_allocs.rscript:11:3: error: Number of input and output allocations unexpected for kernel function foo
+foreach_unexpected_allocs.rs:10:3: error: Number of input and output allocations unexpected for kernel function foo
+foreach_unexpected_allocs.rs:11:3: error: Number of input and output allocations unexpected for kernel function foo
diff --git a/tests/F_foreach_unexpected_kernel_arg/foreach_unexpected_kernel_arg.rscript b/tests/F_foreach_unexpected_kernel_arg/foreach_unexpected_kernel_arg.rs
index 338d7f2..338d7f2 100644
--- a/tests/F_foreach_unexpected_kernel_arg/foreach_unexpected_kernel_arg.rscript
+++ b/tests/F_foreach_unexpected_kernel_arg/foreach_unexpected_kernel_arg.rs
diff --git a/tests/F_foreach_unexpected_kernel_arg/stderr.txt.expect b/tests/F_foreach_unexpected_kernel_arg/stderr.txt.expect
index e401c09..880117e 100644
--- a/tests/F_foreach_unexpected_kernel_arg/stderr.txt.expect
+++ b/tests/F_foreach_unexpected_kernel_arg/stderr.txt.expect
@@ -1,4 +1,4 @@
-foreach_unexpected_kernel_arg.rscript:11:13: error: Invalid kernel launch call. Expects a function designator for the first argument.
-foreach_unexpected_kernel_arg.rscript:12:13: error: Invalid kernel launch call. Expects a function designator for the first argument.
-foreach_unexpected_kernel_arg.rscript:13:24: error: Invalid kernel launch call. Expects a function designator for the first argument.
-foreach_unexpected_kernel_arg.rscript:14:24: error: Invalid kernel launch call. Expects a function designator for the first argument.
+foreach_unexpected_kernel_arg.rs:11:13: error: Invalid kernel launch call. Expects a function designator for the first argument.
+foreach_unexpected_kernel_arg.rs:12:13: error: Invalid kernel launch call. Expects a function designator for the first argument.
+foreach_unexpected_kernel_arg.rs:13:24: error: Invalid kernel launch call. Expects a function designator for the first argument.
+foreach_unexpected_kernel_arg.rs:14:24: error: Invalid kernel launch call. Expects a function designator for the first argument.
diff --git a/tests/F_fp16_wrong_api/fp16_wrong_api.rscript b/tests/F_fp16_wrong_api/fp16_wrong_api.rs
index f51b242..f51b242 100644
--- a/tests/F_fp16_wrong_api/fp16_wrong_api.rscript
+++ b/tests/F_fp16_wrong_api/fp16_wrong_api.rs
diff --git a/tests/F_fp16_wrong_api/stderr.txt.expect b/tests/F_fp16_wrong_api/stderr.txt.expect
index 9b48f78..9764b12 100644
--- a/tests/F_fp16_wrong_api/stderr.txt.expect
+++ b/tests/F_fp16_wrong_api/stderr.txt.expect
@@ -1,2 +1,2 @@
-fp16_wrong_api.rscript:5:18: error: function return value cannot have __fp16 type; did you forget * ?
-fp16_wrong_api.rscript:5:29: error: parameters cannot have __fp16 type; did you forget * ?
+fp16_wrong_api.rs:5:18: error: function return value cannot have __fp16 type; did you forget * ?
+fp16_wrong_api.rs:5:29: error: parameters cannot have __fp16 type; did you forget * ?
diff --git a/tests/F_global_init/global_init.rscript b/tests/F_global_init/global_init.rs
index 8d35184..8d35184 100644
--- a/tests/F_global_init/global_init.rscript
+++ b/tests/F_global_init/global_init.rs
diff --git a/tests/F_global_init/stderr.txt.expect b/tests/F_global_init/stderr.txt.expect
index 7de0c78..19360f4 100644
--- a/tests/F_global_init/stderr.txt.expect
+++ b/tests/F_global_init/stderr.txt.expect
@@ -1 +1 @@
-global_init.rscript:19:10: error: Reflection of initializer to variable 'myS' (of type 's') is unsupported currently.
+global_init.rs:19:10: error: Reflection of initializer to variable 'myS' (of type 's') is unsupported currently.
diff --git a/tests/F_incompatible_handles/incompatible_handles.rscript b/tests/F_incompatible_handles/incompatible_handles.rs
index 13f24fd..13f24fd 100644
--- a/tests/F_incompatible_handles/incompatible_handles.rscript
+++ b/tests/F_incompatible_handles/incompatible_handles.rs
diff --git a/tests/F_incompatible_handles/stderr.txt.expect b/tests/F_incompatible_handles/stderr.txt.expect
index b258d00..a0cb2f3 100644
--- a/tests/F_incompatible_handles/stderr.txt.expect
+++ b/tests/F_incompatible_handles/stderr.txt.expect
@@ -1 +1 @@
-incompatible_handles.rscript:7:5: error: assigning to 'rs_allocation' (aka 'struct rs_allocation') from incompatible type 'rs_element' (aka 'struct rs_element')
+incompatible_handles.rs:7:5: error: assigning to 'rs_allocation' (aka 'struct rs_allocation') from incompatible type 'rs_element' (aka 'struct rs_element')
diff --git a/tests/F_init_nonvoid/init_nonvoid.rscript b/tests/F_init_nonvoid/init_nonvoid.rs
index 7a1295c..7a1295c 100644
--- a/tests/F_init_nonvoid/init_nonvoid.rscript
+++ b/tests/F_init_nonvoid/init_nonvoid.rs
diff --git a/tests/F_init_nonvoid/stderr.txt.expect b/tests/F_init_nonvoid/stderr.txt.expect
index ea1194c..c47c6b6 100644
--- a/tests/F_init_nonvoid/stderr.txt.expect
+++ b/tests/F_init_nonvoid/stderr.txt.expect
@@ -1 +1 @@
-init_nonvoid.rscript:4:5: error: init(void) is required to have a void return type
+init_nonvoid.rs:4:5: error: init(void) is required to have a void return type
diff --git a/tests/F_init_params/init_params.rscript b/tests/F_init_params/init_params.rs
index 1438c45..1438c45 100644
--- a/tests/F_init_params/init_params.rscript
+++ b/tests/F_init_params/init_params.rs
diff --git a/tests/F_init_params/stderr.txt.expect b/tests/F_init_params/stderr.txt.expect
index 1502c14..7f2e8d0 100644
--- a/tests/F_init_params/stderr.txt.expect
+++ b/tests/F_init_params/stderr.txt.expect
@@ -1 +1 @@
-init_params.rscript:4:6: error: init(void) is required to have no parameters
+init_params.rs:4:6: error: init(void) is required to have no parameters
diff --git a/tests/F_int_ptr_ptr/int_ptr_ptr.rscript b/tests/F_int_ptr_ptr/int_ptr_ptr.rs
index 8ab7bb8..8ab7bb8 100644
--- a/tests/F_int_ptr_ptr/int_ptr_ptr.rscript
+++ b/tests/F_int_ptr_ptr/int_ptr_ptr.rs
diff --git a/tests/F_int_ptr_ptr/stderr.txt.expect b/tests/F_int_ptr_ptr/stderr.txt.expect
index 023f23f..5a6da69 100644
--- a/tests/F_int_ptr_ptr/stderr.txt.expect
+++ b/tests/F_int_ptr_ptr/stderr.txt.expect
@@ -1 +1 @@
-int_ptr_ptr.rscript:4:7: error: multiple levels of pointers cannot be exported: 'myPtr'
+int_ptr_ptr.rs:4:7: error: multiple levels of pointers cannot be exported: 'myPtr'
diff --git a/tests/F_invoke_return/invoke_return.rscript b/tests/F_invoke_return/invoke_return.rs
index 906b1f0..906b1f0 100644
--- a/tests/F_invoke_return/invoke_return.rscript
+++ b/tests/F_invoke_return/invoke_return.rs
diff --git a/tests/F_invoke_return/stderr.txt.expect b/tests/F_invoke_return/stderr.txt.expect
index 73d6b76..abfd902 100644
--- a/tests/F_invoke_return/stderr.txt.expect
+++ b/tests/F_invoke_return/stderr.txt.expect
@@ -1 +1 @@
-invoke_return.rscript:4:5: error: invokable non-static functions are required to return void
+invoke_return.rs:4:5: error: invokable non-static functions are required to return void
diff --git a/tests/F_kernel_16/kernel_16.rscript b/tests/F_kernel_16/kernel_16.rs
index 77bd718..77bd718 100644
--- a/tests/F_kernel_16/kernel_16.rscript
+++ b/tests/F_kernel_16/kernel_16.rs
diff --git a/tests/F_kernel_16/stderr.txt.expect b/tests/F_kernel_16/stderr.txt.expect
index 8571c16..ef61120 100644
--- a/tests/F_kernel_16/stderr.txt.expect
+++ b/tests/F_kernel_16/stderr.txt.expect
@@ -1 +1 @@
-kernel_16.rscript:5:16: error: Compute kernel root() targeting SDK levels 11-16 may not use pass-by-value with __attribute__((kernel))
+kernel_16.rs:5:16: error: Compute kernel root() targeting SDK levels 11-16 may not use pass-by-value with __attribute__((kernel))
diff --git a/tests/F_kernel_badattr/kernel_badattr.rscript b/tests/F_kernel_badattr/kernel_badattr.rs
index ef43d44..ef43d44 100644
--- a/tests/F_kernel_badattr/kernel_badattr.rscript
+++ b/tests/F_kernel_badattr/kernel_badattr.rs
diff --git a/tests/F_kernel_badattr/stderr.txt.expect b/tests/F_kernel_badattr/stderr.txt.expect
index 946ce1d..cbbb736 100644
--- a/tests/F_kernel_badattr/stderr.txt.expect
+++ b/tests/F_kernel_badattr/stderr.txt.expect
@@ -1,4 +1,4 @@
-kernel_badattr.rscript:4:20: error: 'kernel' attribute takes no arguments
-kernel_badattr.rscript:8:20: error: 'kernel' attribute takes no arguments
-kernel_badattr.rscript:12:20: error: 'kernel' attribute takes no arguments
-kernel_badattr.rscript:16:20: error: 'kernel' attribute takes no arguments
+kernel_badattr.rs:4:20: error: 'kernel' attribute takes no arguments
+kernel_badattr.rs:8:20: error: 'kernel' attribute takes no arguments
+kernel_badattr.rs:12:20: error: 'kernel' attribute takes no arguments
+kernel_badattr.rs:16:20: error: 'kernel' attribute takes no arguments
diff --git a/tests/F_kernel_badsig/kernel_badsig.rscript b/tests/F_kernel_badsig/kernel_badsig.rs
index 394e9c9..394e9c9 100644
--- a/tests/F_kernel_badsig/kernel_badsig.rscript
+++ b/tests/F_kernel_badsig/kernel_badsig.rs
diff --git a/tests/F_kernel_badsig/stderr.txt.expect b/tests/F_kernel_badsig/stderr.txt.expect
index b226f2b..ca771ad 100644
--- a/tests/F_kernel_badsig/stderr.txt.expect
+++ b/tests/F_kernel_badsig/stderr.txt.expect
@@ -1 +1 @@
-kernel_badsig.rscript:5:16: error: Compute kernel root() targeting SDK levels 11-22 must have at least one input parameter or a non-void return type
+kernel_badsig.rs:5:16: error: Compute kernel root() targeting SDK levels 11-22 must have at least one input parameter or a non-void return type
diff --git a/tests/F_kernel_noattr/kernel_noattr.rscript b/tests/F_kernel_noattr/kernel_noattr.rs
index 27c5dcd..27c5dcd 100644
--- a/tests/F_kernel_noattr/kernel_noattr.rscript
+++ b/tests/F_kernel_noattr/kernel_noattr.rs
diff --git a/tests/F_kernel_noattr/stderr.txt.expect b/tests/F_kernel_noattr/stderr.txt.expect
index 2c0a825..d8e054f 100644
--- a/tests/F_kernel_noattr/stderr.txt.expect
+++ b/tests/F_kernel_noattr/stderr.txt.expect
@@ -1,4 +1,4 @@
-kernel_noattr.rscript:4:5: error: Compute kernel root() is required to return a void type
-kernel_noattr.rscript:4:5: error: Compute kernel root() must have at least one parameter for in or out
-kernel_noattr.rscript:11:5: error: invokable non-static functions are required to return void
-kernel_noattr.rscript:15:5: error: invokable non-static functions are required to return void
+kernel_noattr.rs:4:5: error: Compute kernel root() is required to return a void type
+kernel_noattr.rs:4:5: error: Compute kernel root() must have at least one parameter for in or out
+kernel_noattr.rs:11:5: error: invokable non-static functions are required to return void
+kernel_noattr.rs:15:5: error: invokable non-static functions are required to return void
diff --git a/tests/F_kernel_ptr_param/kernel_ptr_param.rscript b/tests/F_kernel_ptr_param/kernel_ptr_param.rs
index fc89717..fc89717 100644
--- a/tests/F_kernel_ptr_param/kernel_ptr_param.rscript
+++ b/tests/F_kernel_ptr_param/kernel_ptr_param.rs
diff --git a/tests/F_kernel_ptr_param/stderr.txt.expect b/tests/F_kernel_ptr_param/stderr.txt.expect
index abdbc4f..706d437 100644
--- a/tests/F_kernel_ptr_param/stderr.txt.expect
+++ b/tests/F_kernel_ptr_param/stderr.txt.expect
@@ -1,2 +1,2 @@
-kernel_ptr_param.rscript:4:26: error: Compute kernel root() cannot have parameter 'i' of pointer type: 'int *'
-kernel_ptr_param.rscript:7:30: error: Compute kernel voidptr() cannot have parameter 'v' of pointer type: 'void *'
+kernel_ptr_param.rs:4:26: error: Compute kernel root() cannot have parameter 'i' of pointer type: 'int *'
+kernel_ptr_param.rs:7:30: error: Compute kernel voidptr() cannot have parameter 'v' of pointer type: 'void *'
diff --git a/tests/F_kernel_ptr_ret_val/kernel_ptr_ret_val.rscript b/tests/F_kernel_ptr_ret_val/kernel_ptr_ret_val.rs
index 82fbd2e..82fbd2e 100644
--- a/tests/F_kernel_ptr_ret_val/kernel_ptr_ret_val.rscript
+++ b/tests/F_kernel_ptr_ret_val/kernel_ptr_ret_val.rs
diff --git a/tests/F_kernel_ptr_ret_val/stderr.txt.expect b/tests/F_kernel_ptr_ret_val/stderr.txt.expect
index 9d7ca1c..7567c1d 100644
--- a/tests/F_kernel_ptr_ret_val/stderr.txt.expect
+++ b/tests/F_kernel_ptr_ret_val/stderr.txt.expect
@@ -1 +1 @@
-kernel_ptr_ret_val.rscript:4:1: error: Compute kernel root() cannot return a pointer type: 'int *'
+kernel_ptr_ret_val.rs:4:1: error: Compute kernel root() cannot return a pointer type: 'int *'
diff --git a/tests/F_kernel_static/kernel_static.rscript b/tests/F_kernel_static/kernel_static.rs
index c160cd9..c160cd9 100644
--- a/tests/F_kernel_static/kernel_static.rscript
+++ b/tests/F_kernel_static/kernel_static.rs
diff --git a/tests/F_kernel_static/stderr.txt.expect b/tests/F_kernel_static/stderr.txt.expect
index 56d97e0..695fbb8 100644
--- a/tests/F_kernel_static/stderr.txt.expect
+++ b/tests/F_kernel_static/stderr.txt.expect
@@ -1,2 +1,2 @@
-kernel_static.rscript:14:14: error: Non-const static variables are not allowed in kernels: 'i'
-kernel_static.rscript:18:22: error: Invalid use of attribute kernel with static function declaration: static_kernel
+kernel_static.rs:14:14: error: Non-const static variables are not allowed in kernels: 'i'
+kernel_static.rs:18:22: error: Invalid use of attribute kernel with static function declaration: static_kernel
diff --git a/tests/F_large_array/large_array.rscript b/tests/F_large_array/large_array.rs
index db53e2e..db53e2e 100644
--- a/tests/F_large_array/large_array.rscript
+++ b/tests/F_large_array/large_array.rs
diff --git a/tests/F_large_array/stderr.txt.expect b/tests/F_large_array/stderr.txt.expect
index c14f783..e6c5dd1 100644
--- a/tests/F_large_array/stderr.txt.expect
+++ b/tests/F_large_array/stderr.txt.expect
@@ -1 +1 @@
-large_array.rscript:5:15: error: array is too large (4294967296 elements)
+large_array.rs:5:15: error: array is too large (4294967296 elements)
diff --git a/tests/F_mix_vector/mix_vector.rscript b/tests/F_mix_vector/mix_vector.rs
index 2311479..2311479 100644
--- a/tests/F_mix_vector/mix_vector.rscript
+++ b/tests/F_mix_vector/mix_vector.rs
diff --git a/tests/F_mix_vector/stderr.txt.expect b/tests/F_mix_vector/stderr.txt.expect
index baf3eb5..a4af2cc 100644
--- a/tests/F_mix_vector/stderr.txt.expect
+++ b/tests/F_mix_vector/stderr.txt.expect
@@ -1,3 +1,3 @@
-mix_vector.rscript:6:13: error: illegal vector component name 'g'
-mix_vector.rscript:7:13: error: illegal vector component name 'y'
-mix_vector.rscript:8:7: error: illegal vector component name 'r'
+mix_vector.rs:6:13: error: illegal vector component name 'g'
+mix_vector.rs:7:13: error: illegal vector component name 'y'
+mix_vector.rs:8:7: error: illegal vector component name 'r'
diff --git a/tests/F_multi_export_errors/multi_export_errors.rscript b/tests/F_multi_export_errors/multi_export_errors.rs
index 020fa14..020fa14 100644
--- a/tests/F_multi_export_errors/multi_export_errors.rscript
+++ b/tests/F_multi_export_errors/multi_export_errors.rs
diff --git a/tests/F_multi_export_errors/stderr.txt.expect b/tests/F_multi_export_errors/stderr.txt.expect
index 5d0d1c4..a39a137 100644
--- a/tests/F_multi_export_errors/stderr.txt.expect
+++ b/tests/F_multi_export_errors/stderr.txt.expect
@@ -1,3 +1,3 @@
-multi_export_errors.rscript:4:5: error: init(void) is required to have a void return type
-multi_export_errors.rscript:8:6: error: root() is required to return an int for graphics usage
-multi_export_errors.rscript:11:5: error: invokable non-static functions are required to return void
+multi_export_errors.rs:4:5: error: init(void) is required to have a void return type
+multi_export_errors.rs:8:6: error: root() is required to return an int for graphics usage
+multi_export_errors.rs:11:5: error: invokable non-static functions are required to return void
diff --git a/tests/F_multi_in_target_version/multi_in_target_version.rscript b/tests/F_multi_in_target_version/multi_in_target_version.rs
index 429bf5b..429bf5b 100644
--- a/tests/F_multi_in_target_version/multi_in_target_version.rscript
+++ b/tests/F_multi_in_target_version/multi_in_target_version.rs
diff --git a/tests/F_multi_in_target_version/stderr.txt.expect b/tests/F_multi_in_target_version/stderr.txt.expect
index f75c658..49af40d 100644
--- a/tests/F_multi_in_target_version/stderr.txt.expect
+++ b/tests/F_multi_in_target_version/stderr.txt.expect
@@ -1 +1 @@
-multi_in_target_version.rscript:5:43: error: Invalid parameter 'in1' for compute kernel root(). Kernels targeting SDK levels 11-22 may not use multiple input parameters.
+multi_in_target_version.rs:5:43: error: Invalid parameter 'in1' for compute kernel root(). Kernels targeting SDK levels 11-22 may not use multiple input parameters.
diff --git a/tests/F_multidim_array/multidim_array.rscript b/tests/F_multidim_array/multidim_array.rs
index cf967e0..cf967e0 100644
--- a/tests/F_multidim_array/multidim_array.rscript
+++ b/tests/F_multidim_array/multidim_array.rs
diff --git a/tests/F_multidim_array/stderr.txt.expect b/tests/F_multidim_array/stderr.txt.expect
index f28e59f..fdafe4a 100644
--- a/tests/F_multidim_array/stderr.txt.expect
+++ b/tests/F_multidim_array/stderr.txt.expect
@@ -1 +1 @@
-multidim_array.rscript:4:5: error: multidimensional arrays cannot be exported: 'arr'
+multidim_array.rs:4:5: error: multidimensional arrays cannot be exported: 'arr'
diff --git a/tests/F_no_java_package_name/no_java_package_name.rscript b/tests/F_no_java_package_name/no_java_package_name.rs
index bfa6f9d..bfa6f9d 100644
--- a/tests/F_no_java_package_name/no_java_package_name.rscript
+++ b/tests/F_no_java_package_name/no_java_package_name.rs
diff --git a/tests/F_no_java_package_name/stderr.txt.expect b/tests/F_no_java_package_name/stderr.txt.expect
index 19381c1..c554bc6 100644
--- a/tests/F_no_java_package_name/stderr.txt.expect
+++ b/tests/F_no_java_package_name/stderr.txt.expect
@@ -1 +1 @@
-no_java_package_name.rscript:7:1: error: missing "#pragma rs java_package_name(com.foo.bar)" in source file
+no_java_package_name.rs:7:1: error: missing "#pragma rs java_package_name(com.foo.bar)" in source file
diff --git a/tests/F_no_pragma/first.rscript b/tests/F_no_pragma/first.rs
index a53bf90..a53bf90 100644
--- a/tests/F_no_pragma/first.rscript
+++ b/tests/F_no_pragma/first.rs
diff --git a/tests/F_no_pragma/second.rscript b/tests/F_no_pragma/second.rs
index a746ce1..a746ce1 100644
--- a/tests/F_no_pragma/second.rscript
+++ b/tests/F_no_pragma/second.rs
diff --git a/tests/F_no_pragma/stderr.txt.expect b/tests/F_no_pragma/stderr.txt.expect
index 01bb8f4..87440ca 100644
--- a/tests/F_no_pragma/stderr.txt.expect
+++ b/tests/F_no_pragma/stderr.txt.expect
@@ -1 +1 @@
-second.rscript:3:1: error: missing "#pragma rs java_package_name(com.foo.bar)" in source file
+second.rs:3:1: error: missing "#pragma rs java_package_name(com.foo.bar)" in source file
diff --git a/tests/F_no_version_pragma/no_version_pragma.rscript b/tests/F_no_version_pragma/no_version_pragma.rs
index 9b928ce..9b928ce 100644
--- a/tests/F_no_version_pragma/no_version_pragma.rscript
+++ b/tests/F_no_version_pragma/no_version_pragma.rs
diff --git a/tests/F_no_version_pragma/stderr.txt.expect b/tests/F_no_version_pragma/stderr.txt.expect
index f41d537..cdfa917 100644
--- a/tests/F_no_version_pragma/stderr.txt.expect
+++ b/tests/F_no_version_pragma/stderr.txt.expect
@@ -1 +1 @@
-no_version_pragma.rscript:2:1: error: missing pragma for version in source file
+no_version_pragma.rs:2:1: error: missing pragma for version in source file
diff --git a/tests/F_odr_nested_records_1/odr1.rscript b/tests/F_odr_nested_records_1/odr1.rs
index a7370f4..a7370f4 100644
--- a/tests/F_odr_nested_records_1/odr1.rscript
+++ b/tests/F_odr_nested_records_1/odr1.rs
diff --git a/tests/F_odr_nested_records_1/odr2.rscript b/tests/F_odr_nested_records_1/odr2.rs
index 51cc0aa..51cc0aa 100644
--- a/tests/F_odr_nested_records_1/odr2.rscript
+++ b/tests/F_odr_nested_records_1/odr2.rs
diff --git a/tests/F_odr_nested_records_1/stderr.txt.expect b/tests/F_odr_nested_records_1/stderr.txt.expect
index 8426714..9735a8f 100644
--- a/tests/F_odr_nested_records_1/stderr.txt.expect
+++ b/tests/F_odr_nested_records_1/stderr.txt.expect
@@ -1 +1 @@
-error: type 'Outer' in different translation unit (odr2.rscript v.s. odr1.rscript) has incompatible type definition
+error: type 'Outer' in different translation unit (odr2.rs v.s. odr1.rs) has incompatible type definition
diff --git a/tests/F_odr_nested_records_2/odr1.rscript b/tests/F_odr_nested_records_2/odr1.rs
index 3a0ef61..3a0ef61 100644
--- a/tests/F_odr_nested_records_2/odr1.rscript
+++ b/tests/F_odr_nested_records_2/odr1.rs
diff --git a/tests/F_odr_nested_records_2/odr2.rscript b/tests/F_odr_nested_records_2/odr2.rs
index 94780ed..94780ed 100644
--- a/tests/F_odr_nested_records_2/odr2.rscript
+++ b/tests/F_odr_nested_records_2/odr2.rs
diff --git a/tests/F_odr_nested_records_2/stderr.txt.expect b/tests/F_odr_nested_records_2/stderr.txt.expect
index 00da8eb..0b27d31 100644
--- a/tests/F_odr_nested_records_2/stderr.txt.expect
+++ b/tests/F_odr_nested_records_2/stderr.txt.expect
@@ -1 +1 @@
-error: type 'Inner' in different translation unit (odr2.rscript v.s. odr1.rscript) has incompatible type definition
+error: type 'Inner' in different translation unit (odr2.rs v.s. odr1.rs) has incompatible type definition
diff --git a/tests/F_odr_nested_records_3/odr1.rscript b/tests/F_odr_nested_records_3/odr1.rs
index 8fcafb3..8fcafb3 100644
--- a/tests/F_odr_nested_records_3/odr1.rscript
+++ b/tests/F_odr_nested_records_3/odr1.rs
diff --git a/tests/F_odr_nested_records_3/odr2.rscript b/tests/F_odr_nested_records_3/odr2.rs
index ac852b5..ac852b5 100644
--- a/tests/F_odr_nested_records_3/odr2.rscript
+++ b/tests/F_odr_nested_records_3/odr2.rs
diff --git a/tests/F_odr_nested_records_3/stderr.txt.expect b/tests/F_odr_nested_records_3/stderr.txt.expect
index 00da8eb..0b27d31 100644
--- a/tests/F_odr_nested_records_3/stderr.txt.expect
+++ b/tests/F_odr_nested_records_3/stderr.txt.expect
@@ -1 +1 @@
-error: type 'Inner' in different translation unit (odr2.rscript v.s. odr1.rscript) has incompatible type definition
+error: type 'Inner' in different translation unit (odr2.rs v.s. odr1.rs) has incompatible type definition
diff --git a/tests/F_odr_nested_records_4/odr1.rscript b/tests/F_odr_nested_records_4/odr1.rs
index cc1034a..cc1034a 100644
--- a/tests/F_odr_nested_records_4/odr1.rscript
+++ b/tests/F_odr_nested_records_4/odr1.rs
diff --git a/tests/F_odr_nested_records_4/odr2.rscript b/tests/F_odr_nested_records_4/odr2.rs
index f313e42..f313e42 100644
--- a/tests/F_odr_nested_records_4/odr2.rscript
+++ b/tests/F_odr_nested_records_4/odr2.rs
diff --git a/tests/F_odr_nested_records_4/stderr.txt.expect b/tests/F_odr_nested_records_4/stderr.txt.expect
index 3da3e3b..4eaeb72 100644
--- a/tests/F_odr_nested_records_4/stderr.txt.expect
+++ b/tests/F_odr_nested_records_4/stderr.txt.expect
@@ -1 +1 @@
-error: type 'Middle' in different translation unit (odr2.rscript v.s. odr1.rscript) has incompatible type definition
+error: type 'Middle' in different translation unit (odr2.rs v.s. odr1.rs) has incompatible type definition
diff --git a/tests/F_odr_nested_records_5/odr1.rscript b/tests/F_odr_nested_records_5/odr1.rs
index d986772..d986772 100644
--- a/tests/F_odr_nested_records_5/odr1.rscript
+++ b/tests/F_odr_nested_records_5/odr1.rs
diff --git a/tests/F_odr_nested_records_5/odr2.rscript b/tests/F_odr_nested_records_5/odr2.rs
index ed95b19..ed95b19 100644
--- a/tests/F_odr_nested_records_5/odr2.rscript
+++ b/tests/F_odr_nested_records_5/odr2.rs
diff --git a/tests/F_odr_nested_records_5/stderr.txt.expect b/tests/F_odr_nested_records_5/stderr.txt.expect
index 00da8eb..0b27d31 100644
--- a/tests/F_odr_nested_records_5/stderr.txt.expect
+++ b/tests/F_odr_nested_records_5/stderr.txt.expect
@@ -1 +1 @@
-error: type 'Inner' in different translation unit (odr2.rscript v.s. odr1.rscript) has incompatible type definition
+error: type 'Inner' in different translation unit (odr2.rs v.s. odr1.rs) has incompatible type definition
diff --git a/tests/F_odr_nested_records_6/odr1.rscript b/tests/F_odr_nested_records_6/odr1.rs
index 0598b12..0598b12 100644
--- a/tests/F_odr_nested_records_6/odr1.rscript
+++ b/tests/F_odr_nested_records_6/odr1.rs
diff --git a/tests/F_odr_nested_records_6/odr2.rscript b/tests/F_odr_nested_records_6/odr2.rs
index 8f7e85d..8f7e85d 100644
--- a/tests/F_odr_nested_records_6/odr2.rscript
+++ b/tests/F_odr_nested_records_6/odr2.rs
diff --git a/tests/F_odr_nested_records_6/stderr.txt.expect b/tests/F_odr_nested_records_6/stderr.txt.expect
index 00da8eb..0b27d31 100644
--- a/tests/F_odr_nested_records_6/stderr.txt.expect
+++ b/tests/F_odr_nested_records_6/stderr.txt.expect
@@ -1 +1 @@
-error: type 'Inner' in different translation unit (odr2.rscript v.s. odr1.rscript) has incompatible type definition
+error: type 'Inner' in different translation unit (odr2.rs v.s. odr1.rs) has incompatible type definition
diff --git a/tests/F_odr_nested_records_7/odr1.rscript b/tests/F_odr_nested_records_7/odr1.rs
index 70b07a3..70b07a3 100644
--- a/tests/F_odr_nested_records_7/odr1.rscript
+++ b/tests/F_odr_nested_records_7/odr1.rs
diff --git a/tests/F_odr_nested_records_7/odr2.rscript b/tests/F_odr_nested_records_7/odr2.rs
index 4ea0c2a..4ea0c2a 100644
--- a/tests/F_odr_nested_records_7/odr2.rscript
+++ b/tests/F_odr_nested_records_7/odr2.rs
diff --git a/tests/F_odr_nested_records_7/stderr.txt.expect b/tests/F_odr_nested_records_7/stderr.txt.expect
index 8426714..9735a8f 100644
--- a/tests/F_odr_nested_records_7/stderr.txt.expect
+++ b/tests/F_odr_nested_records_7/stderr.txt.expect
@@ -1 +1 @@
-error: type 'Outer' in different translation unit (odr2.rscript v.s. odr1.rscript) has incompatible type definition
+error: type 'Outer' in different translation unit (odr2.rs v.s. odr1.rs) has incompatible type definition
diff --git a/tests/F_odr_nested_records_8/odr1.rscript b/tests/F_odr_nested_records_8/odr1.rs
index 3abe25b..3abe25b 100644
--- a/tests/F_odr_nested_records_8/odr1.rscript
+++ b/tests/F_odr_nested_records_8/odr1.rs
diff --git a/tests/F_odr_nested_records_8/odr2.rscript b/tests/F_odr_nested_records_8/odr2.rs
index fe56776..fe56776 100644
--- a/tests/F_odr_nested_records_8/odr2.rscript
+++ b/tests/F_odr_nested_records_8/odr2.rs
diff --git a/tests/F_odr_nested_records_8/stderr.txt.expect b/tests/F_odr_nested_records_8/stderr.txt.expect
index 8426714..9735a8f 100644
--- a/tests/F_odr_nested_records_8/stderr.txt.expect
+++ b/tests/F_odr_nested_records_8/stderr.txt.expect
@@ -1 +1 @@
-error: type 'Outer' in different translation unit (odr2.rscript v.s. odr1.rscript) has incompatible type definition
+error: type 'Outer' in different translation unit (odr2.rs v.s. odr1.rs) has incompatible type definition
diff --git a/tests/F_odr_nested_records_9/odr1.rscript b/tests/F_odr_nested_records_9/odr1.rs
index c458978..c458978 100644
--- a/tests/F_odr_nested_records_9/odr1.rscript
+++ b/tests/F_odr_nested_records_9/odr1.rs
diff --git a/tests/F_odr_nested_records_9/odr2.rscript b/tests/F_odr_nested_records_9/odr2.rs
index be9efc9..be9efc9 100644
--- a/tests/F_odr_nested_records_9/odr2.rscript
+++ b/tests/F_odr_nested_records_9/odr2.rs
diff --git a/tests/F_odr_nested_records_9/stderr.txt.expect b/tests/F_odr_nested_records_9/stderr.txt.expect
index 00da8eb..0b27d31 100644
--- a/tests/F_odr_nested_records_9/stderr.txt.expect
+++ b/tests/F_odr_nested_records_9/stderr.txt.expect
@@ -1 +1 @@
-error: type 'Inner' in different translation unit (odr2.rscript v.s. odr1.rscript) has incompatible type definition
+error: type 'Inner' in different translation unit (odr2.rs v.s. odr1.rs) has incompatible type definition
diff --git a/tests/F_one_definition_rule1/def1.rscript b/tests/F_one_definition_rule1/def1.rs
index 7b0b225..7b0b225 100644
--- a/tests/F_one_definition_rule1/def1.rscript
+++ b/tests/F_one_definition_rule1/def1.rs
diff --git a/tests/F_one_definition_rule1/def2.rscript b/tests/F_one_definition_rule1/def2.rs
index f770a5e..f770a5e 100644
--- a/tests/F_one_definition_rule1/def2.rscript
+++ b/tests/F_one_definition_rule1/def2.rs
diff --git a/tests/F_one_definition_rule1/stderr.txt.expect b/tests/F_one_definition_rule1/stderr.txt.expect
index c493a59..326c544 100644
--- a/tests/F_one_definition_rule1/stderr.txt.expect
+++ b/tests/F_one_definition_rule1/stderr.txt.expect
@@ -1 +1 @@
-error: type 'DifferentDefinition1' in different translation unit (def2.rscript v.s. def1.rscript) has incompatible type definition
+error: type 'DifferentDefinition1' in different translation unit (def2.rs v.s. def1.rs) has incompatible type definition
diff --git a/tests/F_one_definition_rule2/def1.rscript b/tests/F_one_definition_rule2/def1.rs
index 7c8cd97..7c8cd97 100644
--- a/tests/F_one_definition_rule2/def1.rscript
+++ b/tests/F_one_definition_rule2/def1.rs
diff --git a/tests/F_one_definition_rule2/def2.rscript b/tests/F_one_definition_rule2/def2.rs
index 1d64772..1d64772 100644
--- a/tests/F_one_definition_rule2/def2.rscript
+++ b/tests/F_one_definition_rule2/def2.rs
diff --git a/tests/F_one_definition_rule2/stderr.txt.expect b/tests/F_one_definition_rule2/stderr.txt.expect
index 82c01a6..a5f7a4f 100644
--- a/tests/F_one_definition_rule2/stderr.txt.expect
+++ b/tests/F_one_definition_rule2/stderr.txt.expect
@@ -1 +1 @@
-error: type 'DifferentDefinition2' in different translation unit (def2.rscript v.s. def1.rscript) has incompatible type definition
+error: type 'DifferentDefinition2' in different translation unit (def2.rs v.s. def1.rs) has incompatible type definition
diff --git a/tests/F_one_definition_rule3/def1.rscript b/tests/F_one_definition_rule3/def1.rs
index 8a8d15b..8a8d15b 100644
--- a/tests/F_one_definition_rule3/def1.rscript
+++ b/tests/F_one_definition_rule3/def1.rs
diff --git a/tests/F_one_definition_rule3/def2.rscript b/tests/F_one_definition_rule3/def2.rs
index b574be3..b574be3 100644
--- a/tests/F_one_definition_rule3/def2.rscript
+++ b/tests/F_one_definition_rule3/def2.rs
diff --git a/tests/F_one_definition_rule3/stderr.txt.expect b/tests/F_one_definition_rule3/stderr.txt.expect
index 7505662..b9c9894 100644
--- a/tests/F_one_definition_rule3/stderr.txt.expect
+++ b/tests/F_one_definition_rule3/stderr.txt.expect
@@ -1 +1 @@
-error: type 'DifferentDefinition3' in different translation unit (def2.rscript v.s. def1.rscript) has incompatible type definition
+error: type 'DifferentDefinition3' in different translation unit (def2.rs v.s. def1.rs) has incompatible type definition
diff --git a/tests/F_one_definition_rule4/def1.rscript b/tests/F_one_definition_rule4/def1.rs
index 52b6395..52b6395 100644
--- a/tests/F_one_definition_rule4/def1.rscript
+++ b/tests/F_one_definition_rule4/def1.rs
diff --git a/tests/F_one_definition_rule4/def2.rscript b/tests/F_one_definition_rule4/def2.rs
index 54157b3..54157b3 100644
--- a/tests/F_one_definition_rule4/def2.rscript
+++ b/tests/F_one_definition_rule4/def2.rs
diff --git a/tests/F_one_definition_rule4/stderr.txt.expect b/tests/F_one_definition_rule4/stderr.txt.expect
index 74d3ab1..93a3add 100644
--- a/tests/F_one_definition_rule4/stderr.txt.expect
+++ b/tests/F_one_definition_rule4/stderr.txt.expect
@@ -1 +1 @@
-error: type 'DifferentDefinition4' in different translation unit (def2.rscript v.s. def1.rscript) has incompatible type definition
+error: type 'DifferentDefinition4' in different translation unit (def2.rs v.s. def1.rs) has incompatible type definition
diff --git a/tests/F_one_definition_rule5/def1.rscript b/tests/F_one_definition_rule5/def1.rs
index 203cdbe..203cdbe 100644
--- a/tests/F_one_definition_rule5/def1.rscript
+++ b/tests/F_one_definition_rule5/def1.rs
diff --git a/tests/F_one_definition_rule5/def2.rscript b/tests/F_one_definition_rule5/def2.rs
index 02a76b4..02a76b4 100644
--- a/tests/F_one_definition_rule5/def2.rscript
+++ b/tests/F_one_definition_rule5/def2.rs
diff --git a/tests/F_one_definition_rule5/stderr.txt.expect b/tests/F_one_definition_rule5/stderr.txt.expect
index 7e16847..ca39889 100644
--- a/tests/F_one_definition_rule5/stderr.txt.expect
+++ b/tests/F_one_definition_rule5/stderr.txt.expect
@@ -1 +1 @@
-error: type 'DifferentDefinition5' in different translation unit (def2.rscript v.s. def1.rscript) has incompatible type definition
+error: type 'DifferentDefinition5' in different translation unit (def2.rs v.s. def1.rs) has incompatible type definition
diff --git a/tests/F_one_definition_rule6/def1.rscript b/tests/F_one_definition_rule6/def1.rs
index 2bc8b04..2bc8b04 100644
--- a/tests/F_one_definition_rule6/def1.rscript
+++ b/tests/F_one_definition_rule6/def1.rs
diff --git a/tests/F_one_definition_rule6/def2.rscript b/tests/F_one_definition_rule6/def2.rs
index 7d46c56..7d46c56 100644
--- a/tests/F_one_definition_rule6/def2.rscript
+++ b/tests/F_one_definition_rule6/def2.rs
diff --git a/tests/F_one_definition_rule6/stderr.txt.expect b/tests/F_one_definition_rule6/stderr.txt.expect
index d61eb94..a127b1a 100644
--- a/tests/F_one_definition_rule6/stderr.txt.expect
+++ b/tests/F_one_definition_rule6/stderr.txt.expect
@@ -1 +1 @@
-error: type 'DifferentDefinition6' in different translation unit (def2.rscript v.s. def1.rscript) has incompatible type definition
+error: type 'DifferentDefinition6' in different translation unit (def2.rs v.s. def1.rs) has incompatible type definition
diff --git a/tests/F_one_definition_rule7/def1.rscript b/tests/F_one_definition_rule7/def1.rs
index 1edda16..1edda16 100644
--- a/tests/F_one_definition_rule7/def1.rscript
+++ b/tests/F_one_definition_rule7/def1.rs
diff --git a/tests/F_one_definition_rule7/def2.rscript b/tests/F_one_definition_rule7/def2.rs
index e071fb5..e071fb5 100644
--- a/tests/F_one_definition_rule7/def2.rscript
+++ b/tests/F_one_definition_rule7/def2.rs
diff --git a/tests/F_one_definition_rule7/stderr.txt.expect b/tests/F_one_definition_rule7/stderr.txt.expect
index 23c4be7..805d342 100644
--- a/tests/F_one_definition_rule7/stderr.txt.expect
+++ b/tests/F_one_definition_rule7/stderr.txt.expect
@@ -1 +1 @@
-error: type 'DifferentDefinition7' in different translation unit (def2.rscript v.s. def1.rscript) has incompatible type definition
+error: type 'DifferentDefinition7' in different translation unit (def2.rs v.s. def1.rs) has incompatible type definition
diff --git a/tests/F_one_definition_rule8/def1.rscript b/tests/F_one_definition_rule8/def1.rs
index 60f6447..60f6447 100644
--- a/tests/F_one_definition_rule8/def1.rscript
+++ b/tests/F_one_definition_rule8/def1.rs
diff --git a/tests/F_one_definition_rule8/def2.rscript b/tests/F_one_definition_rule8/def2.rs
index 8ab9fc2..8ab9fc2 100644
--- a/tests/F_one_definition_rule8/def2.rscript
+++ b/tests/F_one_definition_rule8/def2.rs
diff --git a/tests/F_one_definition_rule8/stderr.txt.expect b/tests/F_one_definition_rule8/stderr.txt.expect
index 23c4be7..805d342 100644
--- a/tests/F_one_definition_rule8/stderr.txt.expect
+++ b/tests/F_one_definition_rule8/stderr.txt.expect
@@ -1 +1 @@
-error: type 'DifferentDefinition7' in different translation unit (def2.rscript v.s. def1.rscript) has incompatible type definition
+error: type 'DifferentDefinition7' in different translation unit (def2.rs v.s. def1.rs) has incompatible type definition
diff --git a/tests/F_ptr_in_struct/ptr_in_struct.rscript b/tests/F_ptr_in_struct/ptr_in_struct.rs
index 943270b..943270b 100644
--- a/tests/F_ptr_in_struct/ptr_in_struct.rscript
+++ b/tests/F_ptr_in_struct/ptr_in_struct.rs
diff --git a/tests/F_ptr_in_struct/stderr.txt.expect b/tests/F_ptr_in_struct/stderr.txt.expect
index 62f49c4..c47d706 100644
--- a/tests/F_ptr_in_struct/stderr.txt.expect
+++ b/tests/F_ptr_in_struct/stderr.txt.expect
@@ -1,2 +1,2 @@
-ptr_in_struct.rscript:4:8: error: structures containing pointers cannot be used as the type of an exported global variable or the parameter to an exported function: 's'
-ptr_in_struct.rscript:10:8: error: structures containing pointers cannot be used as the type of an exported global variable or the parameter to an exported function: 'voidStruct'
+ptr_in_struct.rs:4:8: error: structures containing pointers cannot be used as the type of an exported global variable or the parameter to an exported function: 's'
+ptr_in_struct.rs:10:8: error: structures containing pointers cannot be used as the type of an exported global variable or the parameter to an exported function: 'voidStruct'
diff --git a/tests/F_ptr_in_struct_for_call/ptr_in_struct_for_call.rscript b/tests/F_ptr_in_struct_for_call/ptr_in_struct_for_call.rs
index eed9697..eed9697 100644
--- a/tests/F_ptr_in_struct_for_call/ptr_in_struct_for_call.rscript
+++ b/tests/F_ptr_in_struct_for_call/ptr_in_struct_for_call.rs
diff --git a/tests/F_ptr_in_struct_for_call/stderr.txt.expect b/tests/F_ptr_in_struct_for_call/stderr.txt.expect
index 3b11d9c..26fda00 100644
--- a/tests/F_ptr_in_struct_for_call/stderr.txt.expect
+++ b/tests/F_ptr_in_struct_for_call/stderr.txt.expect
@@ -1 +1 @@
-ptr_in_struct_for_call.rscript:8:24: error: structures containing pointers cannot be used as the type of an exported global variable or the parameter to an exported function: 'usr'
+ptr_in_struct_for_call.rs:8:24: error: structures containing pointers cannot be used as the type of an exported global variable or the parameter to an exported function: 'usr'
diff --git a/tests/F_ptr_to_array/ptr_to_array.rscript b/tests/F_ptr_to_array/ptr_to_array.rs
index 9f8bdf4..9f8bdf4 100644
--- a/tests/F_ptr_to_array/ptr_to_array.rscript
+++ b/tests/F_ptr_to_array/ptr_to_array.rs
diff --git a/tests/F_ptr_to_array/stderr.txt.expect b/tests/F_ptr_to_array/stderr.txt.expect
index 605ea05..8a3ecfa 100644
--- a/tests/F_ptr_to_array/stderr.txt.expect
+++ b/tests/F_ptr_to_array/stderr.txt.expect
@@ -1 +1 @@
-ptr_to_array.rscript:4:7: error: pointers to arrays cannot be exported: 'arrayptr'
+ptr_to_array.rs:4:7: error: pointers to arrays cannot be exported: 'arrayptr'
diff --git a/tests/F_ptr_to_fn_noproto/ptr_to_fn_noproto.rscript b/tests/F_ptr_to_fn_noproto/ptr_to_fn_noproto.rs
index b5fcdb0..b5fcdb0 100644
--- a/tests/F_ptr_to_fn_noproto/ptr_to_fn_noproto.rscript
+++ b/tests/F_ptr_to_fn_noproto/ptr_to_fn_noproto.rs
diff --git a/tests/F_ptr_to_fn_noproto/stderr.txt.expect b/tests/F_ptr_to_fn_noproto/stderr.txt.expect
index dde8e0b..eddb4dc 100644
--- a/tests/F_ptr_to_fn_noproto/stderr.txt.expect
+++ b/tests/F_ptr_to_fn_noproto/stderr.txt.expect
@@ -1 +1 @@
-ptr_to_fn_noproto.rscript:4:7: error: function types cannot be exported: 'fnptr'
+ptr_to_fn_noproto.rs:4:7: error: function types cannot be exported: 'fnptr'
diff --git a/tests/F_ptr_to_fn_proto/ptr_to_fn_proto.rscript b/tests/F_ptr_to_fn_proto/ptr_to_fn_proto.rs
index d816717..d816717 100644
--- a/tests/F_ptr_to_fn_proto/ptr_to_fn_proto.rscript
+++ b/tests/F_ptr_to_fn_proto/ptr_to_fn_proto.rs
diff --git a/tests/F_ptr_to_fn_proto/stderr.txt.expect b/tests/F_ptr_to_fn_proto/stderr.txt.expect
index 2ee7b90..9d2fd1f 100644
--- a/tests/F_ptr_to_fn_proto/stderr.txt.expect
+++ b/tests/F_ptr_to_fn_proto/stderr.txt.expect
@@ -1 +1 @@
-ptr_to_fn_proto.rscript:4:7: error: function types cannot be exported: 'fnptr'
+ptr_to_fn_proto.rs:4:7: error: function types cannot be exported: 'fnptr'
diff --git a/tests/F_reduce_general_bad_accumulator/reduce_general_bad_accumulator.rscript b/tests/F_reduce_general_bad_accumulator/reduce_general_bad_accumulator.rs
index 5c16ad3..5c16ad3 100644
--- a/tests/F_reduce_general_bad_accumulator/reduce_general_bad_accumulator.rscript
+++ b/tests/F_reduce_general_bad_accumulator/reduce_general_bad_accumulator.rs
diff --git a/tests/F_reduce_general_bad_accumulator/stderr.txt.expect b/tests/F_reduce_general_bad_accumulator/stderr.txt.expect
index 2d7be5b..356155a 100644
--- a/tests/F_reduce_general_bad_accumulator/stderr.txt.expect
+++ b/tests/F_reduce_general_bad_accumulator/stderr.txt.expect
@@ -1,13 +1,13 @@
-reduce_general_bad_accumulator.rscript:44:34: warning: 'const' qualifier on function type 'Fn' (aka 'void (void)') has unspecified behavior
-reduce_general_bad_accumulator.rscript:48:29: warning: 'const' qualifier on function type 'Fn' (aka 'void (void)') has unspecified behavior
-reduce_general_bad_accumulator.rscript:14:13: error: accumulator AccumIntA() for '#pragma rs reduce(redIntA)' (reduce_general_bad_accumulator.rscript:13:12) parameter 'accum' (type 'int (*)[]') must not be pointer to incomplete type
-reduce_general_bad_accumulator.rscript:14:13: error: accumulator AccumIntA() for '#pragma rs reduce(redIntAOut)' (reduce_general_bad_accumulator.rscript:18:12) parameter 'accum' (type 'int (*)[]') must not be pointer to incomplete type
-reduce_general_bad_accumulator.rscript:28:13: error: accumulator AccumStructIncomplete() for '#pragma rs reduce(redStructIncomplete)' (reduce_general_bad_accumulator.rscript:27:12) parameter 'accum' (type 'struct Incomplete *') must not be pointer to incomplete type
-reduce_general_bad_accumulator.rscript:28:13: error: accumulator AccumStructIncomplete() for '#pragma rs reduce(redStructIncompleteOut)' (reduce_general_bad_accumulator.rscript:32:12) parameter 'accum' (type 'struct Incomplete *') must not be pointer to incomplete type
-reduce_general_bad_accumulator.rscript:43:13: error: accumulator AccumFn() for '#pragma rs reduce(redFn)' (reduce_general_bad_accumulator.rscript:42:12) parameter 'accum' (type 'void (*)(void)') must not be pointer to function type
-reduce_general_bad_accumulator.rscript:44:44: error: combiner CombineFn() for '#pragma rs reduce(redFn)' (reduce_general_bad_accumulator.rscript:42:12) parameter 'other' (type 'Fn *') must point to const-qualified type
-reduce_general_bad_accumulator.rscript:43:13: error: accumulator AccumFn() for '#pragma rs reduce(redFnOut)' (reduce_general_bad_accumulator.rscript:47:12) parameter 'accum' (type 'void (*)(void)') must not be pointer to function type
-reduce_general_bad_accumulator.rscript:44:44: error: combiner CombineFn() for '#pragma rs reduce(redFnOut)' (reduce_general_bad_accumulator.rscript:47:12) parameter 'other' (type 'Fn *') must point to const-qualified type
-reduce_general_bad_accumulator.rscript:48:39: error: outconverter OutFn() for '#pragma rs reduce(redFnOut)' (reduce_general_bad_accumulator.rscript:47:12) parameter 'val' (type 'Fn *') must point to const-qualified type
-reduce_general_bad_accumulator.rscript:55:13: error: accumulator AccumObj() for '#pragma rs reduce(redObj)' (reduce_general_bad_accumulator.rscript:54:12) parameter 'accum' (type 'struct rs_element *') must not be pointer to data containing an object type
-reduce_general_bad_accumulator.rscript:55:13: error: accumulator AccumObj() for '#pragma rs reduce(redObjOut)' (reduce_general_bad_accumulator.rscript:59:12) parameter 'accum' (type 'struct rs_element *') must not be pointer to data containing an object type
+reduce_general_bad_accumulator.rs:44:34: warning: 'const' qualifier on function type 'Fn' (aka 'void (void)') has unspecified behavior
+reduce_general_bad_accumulator.rs:48:29: warning: 'const' qualifier on function type 'Fn' (aka 'void (void)') has unspecified behavior
+reduce_general_bad_accumulator.rs:14:13: error: accumulator AccumIntA() for '#pragma rs reduce(redIntA)' (reduce_general_bad_accumulator.rs:13:12) parameter 'accum' (type 'int (*)[]') must not be pointer to incomplete type
+reduce_general_bad_accumulator.rs:14:13: error: accumulator AccumIntA() for '#pragma rs reduce(redIntAOut)' (reduce_general_bad_accumulator.rs:18:12) parameter 'accum' (type 'int (*)[]') must not be pointer to incomplete type
+reduce_general_bad_accumulator.rs:28:13: error: accumulator AccumStructIncomplete() for '#pragma rs reduce(redStructIncomplete)' (reduce_general_bad_accumulator.rs:27:12) parameter 'accum' (type 'struct Incomplete *') must not be pointer to incomplete type
+reduce_general_bad_accumulator.rs:28:13: error: accumulator AccumStructIncomplete() for '#pragma rs reduce(redStructIncompleteOut)' (reduce_general_bad_accumulator.rs:32:12) parameter 'accum' (type 'struct Incomplete *') must not be pointer to incomplete type
+reduce_general_bad_accumulator.rs:43:13: error: accumulator AccumFn() for '#pragma rs reduce(redFn)' (reduce_general_bad_accumulator.rs:42:12) parameter 'accum' (type 'void (*)(void)') must not be pointer to function type
+reduce_general_bad_accumulator.rs:44:44: error: combiner CombineFn() for '#pragma rs reduce(redFn)' (reduce_general_bad_accumulator.rs:42:12) parameter 'other' (type 'Fn *') must point to const-qualified type
+reduce_general_bad_accumulator.rs:43:13: error: accumulator AccumFn() for '#pragma rs reduce(redFnOut)' (reduce_general_bad_accumulator.rs:47:12) parameter 'accum' (type 'void (*)(void)') must not be pointer to function type
+reduce_general_bad_accumulator.rs:44:44: error: combiner CombineFn() for '#pragma rs reduce(redFnOut)' (reduce_general_bad_accumulator.rs:47:12) parameter 'other' (type 'Fn *') must point to const-qualified type
+reduce_general_bad_accumulator.rs:48:39: error: outconverter OutFn() for '#pragma rs reduce(redFnOut)' (reduce_general_bad_accumulator.rs:47:12) parameter 'val' (type 'Fn *') must point to const-qualified type
+reduce_general_bad_accumulator.rs:55:13: error: accumulator AccumObj() for '#pragma rs reduce(redObj)' (reduce_general_bad_accumulator.rs:54:12) parameter 'accum' (type 'struct rs_element *') must not be pointer to data containing an object type
+reduce_general_bad_accumulator.rs:55:13: error: accumulator AccumObj() for '#pragma rs reduce(redObjOut)' (reduce_general_bad_accumulator.rs:59:12) parameter 'accum' (type 'struct rs_element *') must not be pointer to data containing an object type
diff --git a/tests/F_reduce_general_bad_function/reduce_general_bad_function.rscript b/tests/F_reduce_general_bad_function/reduce_general_bad_function.rs
index b59800a..b59800a 100644
--- a/tests/F_reduce_general_bad_function/reduce_general_bad_function.rscript
+++ b/tests/F_reduce_general_bad_function/reduce_general_bad_function.rs
diff --git a/tests/F_reduce_general_bad_function/stderr.txt.expect b/tests/F_reduce_general_bad_function/stderr.txt.expect
index caa5652..1e65259 100644
--- a/tests/F_reduce_general_bad_function/stderr.txt.expect
+++ b/tests/F_reduce_general_bad_function/stderr.txt.expect
@@ -1,51 +1,51 @@
-reduce_general_bad_function.rscript:18:13: error: initializer init0() for '#pragma rs reduce(init0)' (reduce_general_bad_function.rscript:17:12) must take exactly 1 parameter (found 0)
-reduce_general_bad_function.rscript:22:13: error: initializer init2() for '#pragma rs reduce(init2)' (reduce_general_bad_function.rscript:21:12) must take exactly 1 parameter (found 2)
-reduce_general_bad_function.rscript:26:13: error: initializer init_special1() for '#pragma rs reduce(init_special1)' (reduce_general_bad_function.rscript:25:12) cannot take special parameter 'x'
-reduce_general_bad_function.rscript:30:13: error: initializer init2_special1() for '#pragma rs reduce(init2_special1)' (reduce_general_bad_function.rscript:29:12) must take exactly 1 parameter (found 2)
-reduce_general_bad_function.rscript:34:13: error: initializer init2_special0() for '#pragma rs reduce(init2_special0)' (reduce_general_bad_function.rscript:33:12) must take exactly 1 parameter (found 2)
-reduce_general_bad_function.rscript:38:13: error: initializer init_noptr() for '#pragma rs reduce(init_noptr)' (reduce_general_bad_function.rscript:37:12) parameter 'a' must be of pointer type not 'int'
-reduce_general_bad_function.rscript:45:12: error: duplicate function definition for 'initializer(init_dup)' for '#pragma rs reduce(init_dup)' (reduce_general_bad_function.rscript:46:43, reduce_general_bad_function.rscript:47:43)
-reduce_general_bad_function.rscript:50:12: error: could not find function definition for 'initializer(init_missing)' for '#pragma rs reduce(init_missing)'
-reduce_general_bad_function.rscript:54:6: error: initializer init_nonstatic() for '#pragma rs reduce(init_nonstatic)' (reduce_general_bad_function.rscript:53:12) must be static
-reduce_general_bad_function.rscript:58:12: error: initializer init_nonvoid() for '#pragma rs reduce(init_nonvoid)' (reduce_general_bad_function.rscript:57:12) must return void not 'int'
-reduce_general_bad_function.rscript:62:35: error: initializer init_const() for '#pragma rs reduce(init_const)' (reduce_general_bad_function.rscript:61:12) parameter 'accum' (type 'const int *') must not point to const-qualified type
-reduce_general_bad_function.rscript:74:13: error: accumulator accum0() for '#pragma rs reduce(accum0)' (reduce_general_bad_function.rscript:73:12) must take at least 2 parameters
-reduce_general_bad_function.rscript:78:13: error: accumulator accum1() for '#pragma rs reduce(accum1)' (reduce_general_bad_function.rscript:77:12) must take at least 2 parameters
-reduce_general_bad_function.rscript:82:13: error: accumulator accum_noptr() for '#pragma rs reduce(accum_noptr)' (reduce_general_bad_function.rscript:81:12) parameter 'accum' must be of pointer type not 'int'
-reduce_general_bad_function.rscript:87:13: error: accumulator avi_accum() for '#pragma rs reduce(accum_vs_init)' (reduce_general_bad_function.rscript:85:12) parameter 'accum' (type 'double *') and initializer avi_init() parameter 'accum' (type 'int *') must be pointers to the same type
-reduce_general_bad_function.rscript:91:13: error: accumulator accum_special() for '#pragma rs reduce(accum_special)' (reduce_general_bad_function.rscript:90:12) must have at least 1 input ('x' is a special parameter)
-reduce_general_bad_function.rscript:95:41: error: accumulator accum_ptr() for '#pragma rs reduce(accum_ptr)' (reduce_general_bad_function.rscript:94:12) parameter 'val' (type 'char *') must not be a pointer
-reduce_general_bad_function.rscript:101:45: error: accumulator accum_arr() for '#pragma rs reduce(accum_arr)' (reduce_general_bad_function.rscript:99:12) parameter 'val' (type 'char *') must not be a pointer
-reduce_general_bad_function.rscript:106:55: error: accumulator accum_obj() for '#pragma rs reduce(accum_obj)' (reduce_general_bad_function.rscript:105:12) parameter 'elem' (type 'struct rs_element') must not contain an object type
-reduce_general_bad_function.rscript:114:12: error: duplicate function definition for 'accumulator(accum_dup)' for '#pragma rs reduce(accum_dup)' (reduce_general_bad_function.rscript:115:43, reduce_general_bad_function.rscript:116:43)
-reduce_general_bad_function.rscript:119:12: error: could not find function definition for 'accumulator(accum_missing)' for '#pragma rs reduce(accum_missing)'
-reduce_general_bad_function.rscript:123:6: error: accumulator accum_nonstatic() for '#pragma rs reduce(accum_nonstatic)' (reduce_general_bad_function.rscript:122:12) must be static
-reduce_general_bad_function.rscript:127:12: error: accumulator accum_nonvoid() for '#pragma rs reduce(accum_nonvoid)' (reduce_general_bad_function.rscript:126:12) must return void not 'int'
-reduce_general_bad_function.rscript:131:36: error: accumulator accum_const() for '#pragma rs reduce(accum_const)' (reduce_general_bad_function.rscript:130:12) parameter 'accum' (type 'const int *') must not point to const-qualified type
-reduce_general_bad_function.rscript:143:13: error: combiner comb0() for '#pragma rs reduce(comb0)' (reduce_general_bad_function.rscript:142:12) must take exactly 2 parameters (found 0)
-reduce_general_bad_function.rscript:147:13: error: combiner comb1() for '#pragma rs reduce(comb1)' (reduce_general_bad_function.rscript:146:12) must take exactly 2 parameters (found 1)
-reduce_general_bad_function.rscript:151:13: error: combiner comb3() for '#pragma rs reduce(comb3)' (reduce_general_bad_function.rscript:150:12) must take exactly 2 parameters (found 3)
-reduce_general_bad_function.rscript:156:13: error: combiner cva_comb() for '#pragma rs reduce(comb_vs_accum)' (reduce_general_bad_function.rscript:154:12) parameter 'accum' (type 'unsigned int *') and accumulator cva_accum() parameter 'accum' (type 'int *') must be pointers to the same type
-reduce_general_bad_function.rscript:156:13: error: combiner cva_comb() for '#pragma rs reduce(comb_vs_accum)' (reduce_general_bad_function.rscript:154:12) parameter 'other' (type 'const unsigned int *') and accumulator cva_accum() parameter 'accum' (type 'int *') must be pointers to the same type
-reduce_general_bad_function.rscript:160:13: error: accumulator accum_2in() for '#pragma rs reduce(accum_2in)' (reduce_general_bad_function.rscript:159:12) must have exactly 1 input and no special parameters in order for the combiner to be omitted
-reduce_general_bad_function.rscript:164:13: error: accumulator accum_special_1in() for '#pragma rs reduce(accum_special_1in)' (reduce_general_bad_function.rscript:163:12) must have exactly 1 input and no special parameters in order for the combiner to be omitted
-reduce_general_bad_function.rscript:168:13: error: accumulator accum_types() for '#pragma rs reduce(accum_types)' (reduce_general_bad_function.rscript:167:12) parameter 'accum' (type 'int *') must be pointer to the type of parameter 'val' (type 'unsigned int') in order for the combiner to be omitted
-reduce_general_bad_function.rscript:175:12: error: duplicate function definition for 'combiner(comb_dup)' for '#pragma rs reduce(comb_dup)' (reduce_general_bad_function.rscript:176:43, reduce_general_bad_function.rscript:177:43)
-reduce_general_bad_function.rscript:180:12: error: could not find function definition for 'combiner(comb_missing)' for '#pragma rs reduce(comb_missing)'
-reduce_general_bad_function.rscript:184:6: error: combiner comb_nonstatic() for '#pragma rs reduce(comb_nonstatic)' (reduce_general_bad_function.rscript:183:12) must be static
-reduce_general_bad_function.rscript:188:12: error: combiner comb_nonvoid() for '#pragma rs reduce(comb_nonvoid)' (reduce_general_bad_function.rscript:187:12) must return void not 'int'
-reduce_general_bad_function.rscript:192:35: error: combiner comb_const() for '#pragma rs reduce(comb_const)' (reduce_general_bad_function.rscript:191:12) parameter 'accum' (type 'const int *') must not point to const-qualified type
-reduce_general_bad_function.rscript:192:47: error: combiner comb_const() for '#pragma rs reduce(comb_const)' (reduce_general_bad_function.rscript:191:12) parameter 'other' (type 'int *') must point to const-qualified type
-reduce_general_bad_function.rscript:204:13: error: outconverter out0() for '#pragma rs reduce(out0)' (reduce_general_bad_function.rscript:203:12) must take exactly 2 parameters (found 0)
-reduce_general_bad_function.rscript:208:13: error: outconverter out1() for '#pragma rs reduce(out1)' (reduce_general_bad_function.rscript:207:12) must take exactly 2 parameters (found 1)
-reduce_general_bad_function.rscript:212:13: error: outconverter out3() for '#pragma rs reduce(out3)' (reduce_general_bad_function.rscript:211:12) must take exactly 2 parameters (found 3)
-reduce_general_bad_function.rscript:216:13: error: outconverter out_special() for '#pragma rs reduce(out_special)' (reduce_general_bad_function.rscript:215:12) cannot take special parameter 'y'
-reduce_general_bad_function.rscript:220:13: error: outconverter out_ptr1() for '#pragma rs reduce(out_ptr1)' (reduce_general_bad_function.rscript:219:12) parameter 'out' must be of pointer type not 'int'
-reduce_general_bad_function.rscript:224:13: error: outconverter out_ptr2() for '#pragma rs reduce(out_ptr2)' (reduce_general_bad_function.rscript:223:12) parameter 'val' must be of pointer type not 'const int'
-reduce_general_bad_function.rscript:228:13: error: outconverter ova_out() for '#pragma rs reduce(out_vs_accum)' (reduce_general_bad_function.rscript:227:12) parameter 'val' (type 'const double *') and accumulator AccumInt() parameter 'accum' (type 'int *') must be pointers to the same type
-reduce_general_bad_function.rscript:235:12: error: duplicate function definition for 'outconverter(out_dup)' for '#pragma rs reduce(out_dup)' (reduce_general_bad_function.rscript:236:43, reduce_general_bad_function.rscript:237:43)
-reduce_general_bad_function.rscript:240:12: error: could not find function definition for 'outconverter(out_missing)' for '#pragma rs reduce(out_missing)'
-reduce_general_bad_function.rscript:244:6: error: outconverter out_nonstatic() for '#pragma rs reduce(out_nonstatic)' (reduce_general_bad_function.rscript:243:12) must be static
-reduce_general_bad_function.rscript:248:12: error: outconverter out_nonvoid() for '#pragma rs reduce(out_nonvoid)' (reduce_general_bad_function.rscript:247:12) must return void not 'int'
-reduce_general_bad_function.rscript:252:34: error: outconverter out_const() for '#pragma rs reduce(out_const)' (reduce_general_bad_function.rscript:251:12) parameter 'out' (type 'const int *') must not point to const-qualified type
-reduce_general_bad_function.rscript:252:44: error: outconverter out_const() for '#pragma rs reduce(out_const)' (reduce_general_bad_function.rscript:251:12) parameter 'val' (type 'int *') must point to const-qualified type
+reduce_general_bad_function.rs:18:13: error: initializer init0() for '#pragma rs reduce(init0)' (reduce_general_bad_function.rs:17:12) must take exactly 1 parameter (found 0)
+reduce_general_bad_function.rs:22:13: error: initializer init2() for '#pragma rs reduce(init2)' (reduce_general_bad_function.rs:21:12) must take exactly 1 parameter (found 2)
+reduce_general_bad_function.rs:26:13: error: initializer init_special1() for '#pragma rs reduce(init_special1)' (reduce_general_bad_function.rs:25:12) cannot take special parameter 'x'
+reduce_general_bad_function.rs:30:13: error: initializer init2_special1() for '#pragma rs reduce(init2_special1)' (reduce_general_bad_function.rs:29:12) must take exactly 1 parameter (found 2)
+reduce_general_bad_function.rs:34:13: error: initializer init2_special0() for '#pragma rs reduce(init2_special0)' (reduce_general_bad_function.rs:33:12) must take exactly 1 parameter (found 2)
+reduce_general_bad_function.rs:38:13: error: initializer init_noptr() for '#pragma rs reduce(init_noptr)' (reduce_general_bad_function.rs:37:12) parameter 'a' must be of pointer type not 'int'
+reduce_general_bad_function.rs:45:12: error: duplicate function definition for 'initializer(init_dup)' for '#pragma rs reduce(init_dup)' (reduce_general_bad_function.rs:46:43, reduce_general_bad_function.rs:47:43)
+reduce_general_bad_function.rs:50:12: error: could not find function definition for 'initializer(init_missing)' for '#pragma rs reduce(init_missing)'
+reduce_general_bad_function.rs:54:6: error: initializer init_nonstatic() for '#pragma rs reduce(init_nonstatic)' (reduce_general_bad_function.rs:53:12) must be static
+reduce_general_bad_function.rs:58:12: error: initializer init_nonvoid() for '#pragma rs reduce(init_nonvoid)' (reduce_general_bad_function.rs:57:12) must return void not 'int'
+reduce_general_bad_function.rs:62:35: error: initializer init_const() for '#pragma rs reduce(init_const)' (reduce_general_bad_function.rs:61:12) parameter 'accum' (type 'const int *') must not point to const-qualified type
+reduce_general_bad_function.rs:74:13: error: accumulator accum0() for '#pragma rs reduce(accum0)' (reduce_general_bad_function.rs:73:12) must take at least 2 parameters
+reduce_general_bad_function.rs:78:13: error: accumulator accum1() for '#pragma rs reduce(accum1)' (reduce_general_bad_function.rs:77:12) must take at least 2 parameters
+reduce_general_bad_function.rs:82:13: error: accumulator accum_noptr() for '#pragma rs reduce(accum_noptr)' (reduce_general_bad_function.rs:81:12) parameter 'accum' must be of pointer type not 'int'
+reduce_general_bad_function.rs:87:13: error: accumulator avi_accum() for '#pragma rs reduce(accum_vs_init)' (reduce_general_bad_function.rs:85:12) parameter 'accum' (type 'double *') and initializer avi_init() parameter 'accum' (type 'int *') must be pointers to the same type
+reduce_general_bad_function.rs:91:13: error: accumulator accum_special() for '#pragma rs reduce(accum_special)' (reduce_general_bad_function.rs:90:12) must have at least 1 input ('x' is a special parameter)
+reduce_general_bad_function.rs:95:41: error: accumulator accum_ptr() for '#pragma rs reduce(accum_ptr)' (reduce_general_bad_function.rs:94:12) parameter 'val' (type 'char *') must not be a pointer
+reduce_general_bad_function.rs:101:45: error: accumulator accum_arr() for '#pragma rs reduce(accum_arr)' (reduce_general_bad_function.rs:99:12) parameter 'val' (type 'char *') must not be a pointer
+reduce_general_bad_function.rs:106:55: error: accumulator accum_obj() for '#pragma rs reduce(accum_obj)' (reduce_general_bad_function.rs:105:12) parameter 'elem' (type 'struct rs_element') must not contain an object type
+reduce_general_bad_function.rs:114:12: error: duplicate function definition for 'accumulator(accum_dup)' for '#pragma rs reduce(accum_dup)' (reduce_general_bad_function.rs:115:43, reduce_general_bad_function.rs:116:43)
+reduce_general_bad_function.rs:119:12: error: could not find function definition for 'accumulator(accum_missing)' for '#pragma rs reduce(accum_missing)'
+reduce_general_bad_function.rs:123:6: error: accumulator accum_nonstatic() for '#pragma rs reduce(accum_nonstatic)' (reduce_general_bad_function.rs:122:12) must be static
+reduce_general_bad_function.rs:127:12: error: accumulator accum_nonvoid() for '#pragma rs reduce(accum_nonvoid)' (reduce_general_bad_function.rs:126:12) must return void not 'int'
+reduce_general_bad_function.rs:131:36: error: accumulator accum_const() for '#pragma rs reduce(accum_const)' (reduce_general_bad_function.rs:130:12) parameter 'accum' (type 'const int *') must not point to const-qualified type
+reduce_general_bad_function.rs:143:13: error: combiner comb0() for '#pragma rs reduce(comb0)' (reduce_general_bad_function.rs:142:12) must take exactly 2 parameters (found 0)
+reduce_general_bad_function.rs:147:13: error: combiner comb1() for '#pragma rs reduce(comb1)' (reduce_general_bad_function.rs:146:12) must take exactly 2 parameters (found 1)
+reduce_general_bad_function.rs:151:13: error: combiner comb3() for '#pragma rs reduce(comb3)' (reduce_general_bad_function.rs:150:12) must take exactly 2 parameters (found 3)
+reduce_general_bad_function.rs:156:13: error: combiner cva_comb() for '#pragma rs reduce(comb_vs_accum)' (reduce_general_bad_function.rs:154:12) parameter 'accum' (type 'unsigned int *') and accumulator cva_accum() parameter 'accum' (type 'int *') must be pointers to the same type
+reduce_general_bad_function.rs:156:13: error: combiner cva_comb() for '#pragma rs reduce(comb_vs_accum)' (reduce_general_bad_function.rs:154:12) parameter 'other' (type 'const unsigned int *') and accumulator cva_accum() parameter 'accum' (type 'int *') must be pointers to the same type
+reduce_general_bad_function.rs:160:13: error: accumulator accum_2in() for '#pragma rs reduce(accum_2in)' (reduce_general_bad_function.rs:159:12) must have exactly 1 input and no special parameters in order for the combiner to be omitted
+reduce_general_bad_function.rs:164:13: error: accumulator accum_special_1in() for '#pragma rs reduce(accum_special_1in)' (reduce_general_bad_function.rs:163:12) must have exactly 1 input and no special parameters in order for the combiner to be omitted
+reduce_general_bad_function.rs:168:13: error: accumulator accum_types() for '#pragma rs reduce(accum_types)' (reduce_general_bad_function.rs:167:12) parameter 'accum' (type 'int *') must be pointer to the type of parameter 'val' (type 'unsigned int') in order for the combiner to be omitted
+reduce_general_bad_function.rs:175:12: error: duplicate function definition for 'combiner(comb_dup)' for '#pragma rs reduce(comb_dup)' (reduce_general_bad_function.rs:176:43, reduce_general_bad_function.rs:177:43)
+reduce_general_bad_function.rs:180:12: error: could not find function definition for 'combiner(comb_missing)' for '#pragma rs reduce(comb_missing)'
+reduce_general_bad_function.rs:184:6: error: combiner comb_nonstatic() for '#pragma rs reduce(comb_nonstatic)' (reduce_general_bad_function.rs:183:12) must be static
+reduce_general_bad_function.rs:188:12: error: combiner comb_nonvoid() for '#pragma rs reduce(comb_nonvoid)' (reduce_general_bad_function.rs:187:12) must return void not 'int'
+reduce_general_bad_function.rs:192:35: error: combiner comb_const() for '#pragma rs reduce(comb_const)' (reduce_general_bad_function.rs:191:12) parameter 'accum' (type 'const int *') must not point to const-qualified type
+reduce_general_bad_function.rs:192:47: error: combiner comb_const() for '#pragma rs reduce(comb_const)' (reduce_general_bad_function.rs:191:12) parameter 'other' (type 'int *') must point to const-qualified type
+reduce_general_bad_function.rs:204:13: error: outconverter out0() for '#pragma rs reduce(out0)' (reduce_general_bad_function.rs:203:12) must take exactly 2 parameters (found 0)
+reduce_general_bad_function.rs:208:13: error: outconverter out1() for '#pragma rs reduce(out1)' (reduce_general_bad_function.rs:207:12) must take exactly 2 parameters (found 1)
+reduce_general_bad_function.rs:212:13: error: outconverter out3() for '#pragma rs reduce(out3)' (reduce_general_bad_function.rs:211:12) must take exactly 2 parameters (found 3)
+reduce_general_bad_function.rs:216:13: error: outconverter out_special() for '#pragma rs reduce(out_special)' (reduce_general_bad_function.rs:215:12) cannot take special parameter 'y'
+reduce_general_bad_function.rs:220:13: error: outconverter out_ptr1() for '#pragma rs reduce(out_ptr1)' (reduce_general_bad_function.rs:219:12) parameter 'out' must be of pointer type not 'int'
+reduce_general_bad_function.rs:224:13: error: outconverter out_ptr2() for '#pragma rs reduce(out_ptr2)' (reduce_general_bad_function.rs:223:12) parameter 'val' must be of pointer type not 'const int'
+reduce_general_bad_function.rs:228:13: error: outconverter ova_out() for '#pragma rs reduce(out_vs_accum)' (reduce_general_bad_function.rs:227:12) parameter 'val' (type 'const double *') and accumulator AccumInt() parameter 'accum' (type 'int *') must be pointers to the same type
+reduce_general_bad_function.rs:235:12: error: duplicate function definition for 'outconverter(out_dup)' for '#pragma rs reduce(out_dup)' (reduce_general_bad_function.rs:236:43, reduce_general_bad_function.rs:237:43)
+reduce_general_bad_function.rs:240:12: error: could not find function definition for 'outconverter(out_missing)' for '#pragma rs reduce(out_missing)'
+reduce_general_bad_function.rs:244:6: error: outconverter out_nonstatic() for '#pragma rs reduce(out_nonstatic)' (reduce_general_bad_function.rs:243:12) must be static
+reduce_general_bad_function.rs:248:12: error: outconverter out_nonvoid() for '#pragma rs reduce(out_nonvoid)' (reduce_general_bad_function.rs:247:12) must return void not 'int'
+reduce_general_bad_function.rs:252:34: error: outconverter out_const() for '#pragma rs reduce(out_const)' (reduce_general_bad_function.rs:251:12) parameter 'out' (type 'const int *') must not point to const-qualified type
+reduce_general_bad_function.rs:252:44: error: outconverter out_const() for '#pragma rs reduce(out_const)' (reduce_general_bad_function.rs:251:12) parameter 'val' (type 'int *') must point to const-qualified type
diff --git a/tests/F_reduce_general_bad_halter/reduce_general_bad_halter.rscript b/tests/F_reduce_general_bad_halter/reduce_general_bad_halter.rs
index b7de60c..b7de60c 100644
--- a/tests/F_reduce_general_bad_halter/reduce_general_bad_halter.rscript
+++ b/tests/F_reduce_general_bad_halter/reduce_general_bad_halter.rs
diff --git a/tests/F_reduce_general_bad_halter/stderr.txt.expect b/tests/F_reduce_general_bad_halter/stderr.txt.expect
index 40d1264..d96207e 100644
--- a/tests/F_reduce_general_bad_halter/stderr.txt.expect
+++ b/tests/F_reduce_general_bad_halter/stderr.txt.expect
@@ -1,10 +1,10 @@
-reduce_general_bad_halter.rscript:18:13: error: halter halt_void() for '#pragma rs reduce(halt_void)' (reduce_general_bad_halter.rscript:17:12) must return bool not 'void'
-reduce_general_bad_halter.rscript:22:12: error: halter halt_int() for '#pragma rs reduce(halt_int)' (reduce_general_bad_halter.rscript:21:12) must return bool not 'int'
-reduce_general_bad_halter.rscript:26:13: error: halter halt0() for '#pragma rs reduce(halt0)' (reduce_general_bad_halter.rscript:25:12) must take exactly 1 parameter (found 0)
-reduce_general_bad_halter.rscript:30:13: error: halter halt2() for '#pragma rs reduce(halt2)' (reduce_general_bad_halter.rscript:29:12) must take exactly 1 parameter (found 2)
-reduce_general_bad_halter.rscript:34:13: error: halter halt_special() for '#pragma rs reduce(halt_special)' (reduce_general_bad_halter.rscript:33:12) cannot take special parameter 'context'
-reduce_general_bad_halter.rscript:38:13: error: halter hva_halt() for '#pragma rs reduce(halt_vs_accum)' (reduce_general_bad_halter.rscript:37:12) parameter 'accum' (type 'const unsigned int *') and accumulator AccumInt() parameter 'accum' (type 'int *') must be pointers to the same type
-reduce_general_bad_halter.rscript:45:12: error: duplicate function definition for 'halter(halt_dup)' for '#pragma rs reduce(halt_dup)' (reduce_general_bad_halter.rscript:46:43, reduce_general_bad_halter.rscript:47:43)
-reduce_general_bad_halter.rscript:50:12: error: could not find function definition for 'halter(halt_missing)' for '#pragma rs reduce(halt_missing)'
-reduce_general_bad_halter.rscript:54:6: error: halter halt_nonstatic() for '#pragma rs reduce(halt_nonstatic)' (reduce_general_bad_halter.rscript:53:12) must be static
-reduce_general_bad_halter.rscript:58:29: error: halter halt_const() for '#pragma rs reduce(halt_const)' (reduce_general_bad_halter.rscript:57:12) parameter 'accum' (type 'int *') must point to const-qualified type
+reduce_general_bad_halter.rs:18:13: error: halter halt_void() for '#pragma rs reduce(halt_void)' (reduce_general_bad_halter.rs:17:12) must return bool not 'void'
+reduce_general_bad_halter.rs:22:12: error: halter halt_int() for '#pragma rs reduce(halt_int)' (reduce_general_bad_halter.rs:21:12) must return bool not 'int'
+reduce_general_bad_halter.rs:26:13: error: halter halt0() for '#pragma rs reduce(halt0)' (reduce_general_bad_halter.rs:25:12) must take exactly 1 parameter (found 0)
+reduce_general_bad_halter.rs:30:13: error: halter halt2() for '#pragma rs reduce(halt2)' (reduce_general_bad_halter.rs:29:12) must take exactly 1 parameter (found 2)
+reduce_general_bad_halter.rs:34:13: error: halter halt_special() for '#pragma rs reduce(halt_special)' (reduce_general_bad_halter.rs:33:12) cannot take special parameter 'context'
+reduce_general_bad_halter.rs:38:13: error: halter hva_halt() for '#pragma rs reduce(halt_vs_accum)' (reduce_general_bad_halter.rs:37:12) parameter 'accum' (type 'const unsigned int *') and accumulator AccumInt() parameter 'accum' (type 'int *') must be pointers to the same type
+reduce_general_bad_halter.rs:45:12: error: duplicate function definition for 'halter(halt_dup)' for '#pragma rs reduce(halt_dup)' (reduce_general_bad_halter.rs:46:43, reduce_general_bad_halter.rs:47:43)
+reduce_general_bad_halter.rs:50:12: error: could not find function definition for 'halter(halt_missing)' for '#pragma rs reduce(halt_missing)'
+reduce_general_bad_halter.rs:54:6: error: halter halt_nonstatic() for '#pragma rs reduce(halt_nonstatic)' (reduce_general_bad_halter.rs:53:12) must be static
+reduce_general_bad_halter.rs:58:29: error: halter halt_const() for '#pragma rs reduce(halt_const)' (reduce_general_bad_halter.rs:57:12) parameter 'accum' (type 'int *') must point to const-qualified type
diff --git a/tests/F_reduce_general_bad_result/reduce_general_bad_result.rscript b/tests/F_reduce_general_bad_result/reduce_general_bad_result.rs
index e403f6e..e403f6e 100644
--- a/tests/F_reduce_general_bad_result/reduce_general_bad_result.rscript
+++ b/tests/F_reduce_general_bad_result/reduce_general_bad_result.rs
diff --git a/tests/F_reduce_general_bad_result/stderr.txt.expect b/tests/F_reduce_general_bad_result/stderr.txt.expect
index 890a7b4..686ca1d 100644
--- a/tests/F_reduce_general_bad_result/stderr.txt.expect
+++ b/tests/F_reduce_general_bad_result/stderr.txt.expect
@@ -1,29 +1,29 @@
-reduce_general_bad_result.rscript:22:36: error: multidimensional arrays cannot be exported: 'accum'
-reduce_general_bad_result.rscript:32:39: error: multidimensional arrays cannot be exported: 'out'
-reduce_general_bad_result.rscript:36:7: error: unions cannot be exported: 'UnionShortDouble'
-reduce_general_bad_result.rscript:46:7: error: unions cannot be exported: 'UnionLongFloat'
-reduce_general_bad_result.rscript:72:7: error: unions cannot be exported: 'UnionIntFloat'
-reduce_general_bad_result.rscript:84:7: error: unions cannot be exported: 'UnionCharLong'
-reduce_general_bad_result.rscript:113:7: error: bit fields are not able to be exported: 'Bits1.b'
-reduce_general_bad_result.rscript:122:7: error: bit fields are not able to be exported: 'Bits111.e'
-reduce_general_bad_result.rscript:146:7: error: bit fields are not able to be exported: 'Bits2.b'
-reduce_general_bad_result.rscript:157:7: error: bit fields are not able to be exported: 'Bits222.e'
-reduce_general_bad_result.rscript:183:36: error: accumulator AccumMat() for '#pragma rs reduce(redMat)' (reduce_general_bad_result.rscript:182:12) parameter 'accum' (type 'rs_matrix2x2 *') must not point to a matrix type unless outconverter is provided
-reduce_general_bad_result.rscript:191:39: error: outconverter OutMatBreak() for '#pragma rs reduce(redMatOutBreak)' (reduce_general_bad_result.rscript:190:12) parameter 'out' (type 'rs_matrix2x2 *') must not point to a matrix type
-reduce_general_bad_result.rscript:199:43: error: accumulator AccumMatArray() for '#pragma rs reduce(redMatArray)' (reduce_general_bad_result.rscript:198:12) parameter 'accum' (type 'rs_matrix2x2 (*)[10]') must not point to an array of matrix type unless outconverter is provided
-reduce_general_bad_result.rscript:209:46: error: outconverter OutMatArrayBreak() for '#pragma rs reduce(redMatArrayOutBreak)' (reduce_general_bad_result.rscript:208:12) parameter 'out' (type 'rs_matrix2x2 (*)[10]') must not point to an array of matrix type
-reduce_general_bad_result.rscript:215:37: error: outconverter OutAlloc() for '#pragma rs reduce(redAlloc)' (reduce_general_bad_result.rscript:214:12) parameter 'out' (type 'struct rs_allocation *') must not point to data containing an object type
-reduce_general_bad_result.rscript:224:39: error: outconverter OutAllocArray() for '#pragma rs reduce(redAllocArray)' (reduce_general_bad_result.rscript:222:12) parameter 'out' (type 'struct rs_allocation (*)[10]') must not point to data containing an object type
-reduce_general_bad_result.rscript:236:45: error: outconverter OutStructObj() for '#pragma rs reduce(redStructObj)' (reduce_general_bad_result.rscript:234:12) parameter 'out' (type 'struct StructObj1 *') must not point to data containing an object type
-reduce_general_bad_result.rscript:250:48: error: outconverter OutStructObjArray() for '#pragma rs reduce(redStructObjArray)' (reduce_general_bad_result.rscript:247:12) parameter 'out' (type 'struct StructObj2 (*)[10]') must not point to data containing an object type
-reduce_general_bad_result.rscript:258:27: error: accumulator AccumPtr() for '#pragma rs reduce(redPtr)' (reduce_general_bad_result.rscript:257:12) parameter 'accum' (type 'char **') must not point to a pointer unless outconverter is provided
-reduce_general_bad_result.rscript:268:30: error: outconverter OutPtrBreak() for '#pragma rs reduce(redPtrOutBreak)' (reduce_general_bad_result.rscript:267:12) parameter 'out' (type 'char **') must not point to a pointer
-reduce_general_bad_result.rscript:276:28: error: structures containing pointers cannot be used as the type of an exported global variable or the parameter to an exported function: 'accum'
-reduce_general_bad_result.rscript:286:31: error: structures containing pointers cannot be used as the type of an exported global variable or the parameter to an exported function: 'out'
-reduce_general_bad_result.rscript:310:28: error: structures containing pointers cannot be used as the type of an exported global variable or the parameter to an exported function: 'accum'
-reduce_general_bad_result.rscript:322:31: error: structures containing pointers cannot be used as the type of an exported global variable or the parameter to an exported function: 'out'
-reduce_general_bad_result.rscript:349:33: error: structures containing pointers cannot be used as the type of an exported global variable or the parameter to an exported function: 'accum'
-reduce_general_bad_result.rscript:362:36: error: structures containing pointers cannot be used as the type of an exported global variable or the parameter to an exported function: 'out'
-reduce_general_bad_result.rscript:373:23: error: function types cannot be exported: 'out'
-reduce_general_bad_result.rscript:384:52: error: outconverter OutStructIncomplete() for '#pragma rs reduce(redStructIncomplete)' (reduce_general_bad_result.rscript:383:12) parameter 'out' (type 'struct Incomplete *') must not point to an incomplete type
-reduce_general_bad_result.rscript:395:38: error: outconverter OutArrayIncomplete() for '#pragma rs reduce(redArrayIncomplete)' (reduce_general_bad_result.rscript:394:12) parameter 'out' (type 'int (*)[]') must not point to an incomplete type
+reduce_general_bad_result.rs:22:36: error: multidimensional arrays cannot be exported: 'accum'
+reduce_general_bad_result.rs:32:39: error: multidimensional arrays cannot be exported: 'out'
+reduce_general_bad_result.rs:36:7: error: unions cannot be exported: 'UnionShortDouble'
+reduce_general_bad_result.rs:46:7: error: unions cannot be exported: 'UnionLongFloat'
+reduce_general_bad_result.rs:72:7: error: unions cannot be exported: 'UnionIntFloat'
+reduce_general_bad_result.rs:84:7: error: unions cannot be exported: 'UnionCharLong'
+reduce_general_bad_result.rs:113:7: error: bit fields are not able to be exported: 'Bits1.b'
+reduce_general_bad_result.rs:122:7: error: bit fields are not able to be exported: 'Bits111.e'
+reduce_general_bad_result.rs:146:7: error: bit fields are not able to be exported: 'Bits2.b'
+reduce_general_bad_result.rs:157:7: error: bit fields are not able to be exported: 'Bits222.e'
+reduce_general_bad_result.rs:183:36: error: accumulator AccumMat() for '#pragma rs reduce(redMat)' (reduce_general_bad_result.rs:182:12) parameter 'accum' (type 'rs_matrix2x2 *') must not point to a matrix type unless outconverter is provided
+reduce_general_bad_result.rs:191:39: error: outconverter OutMatBreak() for '#pragma rs reduce(redMatOutBreak)' (reduce_general_bad_result.rs:190:12) parameter 'out' (type 'rs_matrix2x2 *') must not point to a matrix type
+reduce_general_bad_result.rs:199:43: error: accumulator AccumMatArray() for '#pragma rs reduce(redMatArray)' (reduce_general_bad_result.rs:198:12) parameter 'accum' (type 'rs_matrix2x2 (*)[10]') must not point to an array of matrix type unless outconverter is provided
+reduce_general_bad_result.rs:209:46: error: outconverter OutMatArrayBreak() for '#pragma rs reduce(redMatArrayOutBreak)' (reduce_general_bad_result.rs:208:12) parameter 'out' (type 'rs_matrix2x2 (*)[10]') must not point to an array of matrix type
+reduce_general_bad_result.rs:215:37: error: outconverter OutAlloc() for '#pragma rs reduce(redAlloc)' (reduce_general_bad_result.rs:214:12) parameter 'out' (type 'struct rs_allocation *') must not point to data containing an object type
+reduce_general_bad_result.rs:224:39: error: outconverter OutAllocArray() for '#pragma rs reduce(redAllocArray)' (reduce_general_bad_result.rs:222:12) parameter 'out' (type 'struct rs_allocation (*)[10]') must not point to data containing an object type
+reduce_general_bad_result.rs:236:45: error: outconverter OutStructObj() for '#pragma rs reduce(redStructObj)' (reduce_general_bad_result.rs:234:12) parameter 'out' (type 'struct StructObj1 *') must not point to data containing an object type
+reduce_general_bad_result.rs:250:48: error: outconverter OutStructObjArray() for '#pragma rs reduce(redStructObjArray)' (reduce_general_bad_result.rs:247:12) parameter 'out' (type 'struct StructObj2 (*)[10]') must not point to data containing an object type
+reduce_general_bad_result.rs:258:27: error: accumulator AccumPtr() for '#pragma rs reduce(redPtr)' (reduce_general_bad_result.rs:257:12) parameter 'accum' (type 'char **') must not point to a pointer unless outconverter is provided
+reduce_general_bad_result.rs:268:30: error: outconverter OutPtrBreak() for '#pragma rs reduce(redPtrOutBreak)' (reduce_general_bad_result.rs:267:12) parameter 'out' (type 'char **') must not point to a pointer
+reduce_general_bad_result.rs:276:28: error: structures containing pointers cannot be used as the type of an exported global variable or the parameter to an exported function: 'accum'
+reduce_general_bad_result.rs:286:31: error: structures containing pointers cannot be used as the type of an exported global variable or the parameter to an exported function: 'out'
+reduce_general_bad_result.rs:310:28: error: structures containing pointers cannot be used as the type of an exported global variable or the parameter to an exported function: 'accum'
+reduce_general_bad_result.rs:322:31: error: structures containing pointers cannot be used as the type of an exported global variable or the parameter to an exported function: 'out'
+reduce_general_bad_result.rs:349:33: error: structures containing pointers cannot be used as the type of an exported global variable or the parameter to an exported function: 'accum'
+reduce_general_bad_result.rs:362:36: error: structures containing pointers cannot be used as the type of an exported global variable or the parameter to an exported function: 'out'
+reduce_general_bad_result.rs:373:23: error: function types cannot be exported: 'out'
+reduce_general_bad_result.rs:384:52: error: outconverter OutStructIncomplete() for '#pragma rs reduce(redStructIncomplete)' (reduce_general_bad_result.rs:383:12) parameter 'out' (type 'struct Incomplete *') must not point to an incomplete type
+reduce_general_bad_result.rs:395:38: error: outconverter OutArrayIncomplete() for '#pragma rs reduce(redArrayIncomplete)' (reduce_general_bad_result.rs:394:12) parameter 'out' (type 'int (*)[]') must not point to an incomplete type
diff --git a/tests/F_reduce_general_parse/reduce_general_parse.rscript b/tests/F_reduce_general_parse/reduce_general_parse.rs
index 6606d83..6606d83 100644
--- a/tests/F_reduce_general_parse/reduce_general_parse.rscript
+++ b/tests/F_reduce_general_parse/reduce_general_parse.rs
diff --git a/tests/F_reduce_general_parse/stderr.txt.expect b/tests/F_reduce_general_parse/stderr.txt.expect
index bd02416..b21b78c 100644
--- a/tests/F_reduce_general_parse/stderr.txt.expect
+++ b/tests/F_reduce_general_parse/stderr.txt.expect
@@ -1,14 +1,14 @@
-reduce_general_parse.rscript:5:18: error: missing '(' after 'reduce' for '#pragma rs reduce'
-reduce_general_parse.rscript:6:19: error: missing name after 'reduce(' for '#pragma rs reduce'
-reduce_general_parse.rscript:7:20: error: missing name after 'reduce(' for '#pragma rs reduce'
-reduce_general_parse.rscript:8:19: error: missing name after 'reduce(' for '#pragma rs reduce'
-reduce_general_parse.rscript:9:22: error: missing ')' after 'reduce(foo' for '#pragma rs reduce'
-reduce_general_parse.rscript:10:25: error: missing ')' after 'reduce(foo' for '#pragma rs reduce'
-reduce_general_parse.rscript:11:12: error: missing 'accumulator' for '#pragma rs reduce'
-reduce_general_parse.rscript:12:36: error: missing name after 'initializer(' for '#pragma rs reduce'
-reduce_general_parse.rscript:13:12: error: missing 'accumulator' for '#pragma rs reduce'
-reduce_general_parse.rscript:15:12: error: reduction kernel 'foo' declared multiple times (first one is at reduce_general_parse.rscript:14:12)
-reduce_general_parse.rscript:17:63: error: more than one 'accumulator' for '#pragma rs reduce'
-reduce_general_parse.rscript:18:63: error: more than one 'accumulator' for '#pragma rs reduce'
-reduce_general_parse.rscript:19:24: error: did not recognize 'something' for '#pragma reduce'; expected one of the following keywords: 'accumulator', 'combiner', 'initializer', 'outconverter', 'reduce'
-reduce_general_parse.rscript:20:56: error: did not expect '(' here for '#pragma rs reduce'
+reduce_general_parse.rs:5:18: error: missing '(' after 'reduce' for '#pragma rs reduce'
+reduce_general_parse.rs:6:19: error: missing name after 'reduce(' for '#pragma rs reduce'
+reduce_general_parse.rs:7:20: error: missing name after 'reduce(' for '#pragma rs reduce'
+reduce_general_parse.rs:8:19: error: missing name after 'reduce(' for '#pragma rs reduce'
+reduce_general_parse.rs:9:22: error: missing ')' after 'reduce(foo' for '#pragma rs reduce'
+reduce_general_parse.rs:10:25: error: missing ')' after 'reduce(foo' for '#pragma rs reduce'
+reduce_general_parse.rs:11:12: error: missing 'accumulator' for '#pragma rs reduce'
+reduce_general_parse.rs:12:36: error: missing name after 'initializer(' for '#pragma rs reduce'
+reduce_general_parse.rs:13:12: error: missing 'accumulator' for '#pragma rs reduce'
+reduce_general_parse.rs:15:12: error: reduction kernel 'foo' declared multiple times (first one is at reduce_general_parse.rs:14:12)
+reduce_general_parse.rs:17:63: error: more than one 'accumulator' for '#pragma rs reduce'
+reduce_general_parse.rs:18:63: error: more than one 'accumulator' for '#pragma rs reduce'
+reduce_general_parse.rs:19:24: error: did not recognize 'something' for '#pragma reduce'; expected one of the following keywords: 'accumulator', 'combiner', 'initializer', 'outconverter', 'reduce'
+reduce_general_parse.rs:20:56: error: did not expect '(' here for '#pragma rs reduce'
diff --git a/tests/F_reduce_general_void/reduce_general_void.rscript b/tests/F_reduce_general_void/reduce_general_void.rs
index b39fa56..b39fa56 100644
--- a/tests/F_reduce_general_void/reduce_general_void.rscript
+++ b/tests/F_reduce_general_void/reduce_general_void.rs
diff --git a/tests/F_reduce_general_void/stderr.txt.expect b/tests/F_reduce_general_void/stderr.txt.expect
index c345119..973cae8 100644
--- a/tests/F_reduce_general_void/stderr.txt.expect
+++ b/tests/F_reduce_general_void/stderr.txt.expect
@@ -1,3 +1,3 @@
-reduce_general_void.rscript:11:13: error: accumulator voidA_accum() for '#pragma rs reduce(voidA)' (reduce_general_void.rscript:9:12) parameter 'accum' (type 'void *') must not be pointer to incomplete type
-reduce_general_void.rscript:16:43: error: accumulator voidI_accum() for '#pragma rs reduce(voidI)' (reduce_general_void.rscript:15:12) parameter 'val' (type 'void *') must not be a pointer
-reduce_general_void.rscript:22:29: error: outconverter voidO_out() for '#pragma rs reduce(voidO)' (reduce_general_void.rscript:20:12) parameter 'out' (type 'void *') must not point to an incomplete type
+reduce_general_void.rs:11:13: error: accumulator voidA_accum() for '#pragma rs reduce(voidA)' (reduce_general_void.rs:9:12) parameter 'accum' (type 'void *') must not be pointer to incomplete type
+reduce_general_void.rs:16:43: error: accumulator voidI_accum() for '#pragma rs reduce(voidI)' (reduce_general_void.rs:15:12) parameter 'val' (type 'void *') must not be a pointer
+reduce_general_void.rs:22:29: error: outconverter voidO_out() for '#pragma rs reduce(voidO)' (reduce_general_void.rs:20:12) parameter 'out' (type 'void *') must not point to an incomplete type
diff --git a/tests/F_reduce_general_wrong_api/reduce_general_wrong_api.rscript b/tests/F_reduce_general_wrong_api/reduce_general_wrong_api.rs
index 5da3239..5da3239 100644
--- a/tests/F_reduce_general_wrong_api/reduce_general_wrong_api.rscript
+++ b/tests/F_reduce_general_wrong_api/reduce_general_wrong_api.rs
diff --git a/tests/F_reduce_general_wrong_api/stderr.txt.expect b/tests/F_reduce_general_wrong_api/stderr.txt.expect
index 2b981d1..b92931b 100644
--- a/tests/F_reduce_general_wrong_api/stderr.txt.expect
+++ b/tests/F_reduce_general_wrong_api/stderr.txt.expect
@@ -1 +1 @@
-reduce_general_wrong_api.rscript:5:12: error: reduction kernels are not supported in SDK levels 11-23
+reduce_general_wrong_api.rs:5:12: error: reduction kernels are not supported in SDK levels 11-23
diff --git a/tests/F_refcount_15/refcount_15.rscript b/tests/F_refcount_15/refcount_15.rs
index b3e3a17..b3e3a17 100644
--- a/tests/F_refcount_15/refcount_15.rscript
+++ b/tests/F_refcount_15/refcount_15.rs
diff --git a/tests/F_refcount_15/stderr.txt.expect b/tests/F_refcount_15/stderr.txt.expect
index 25551c6..e6453f0 100644
--- a/tests/F_refcount_15/stderr.txt.expect
+++ b/tests/F_refcount_15/stderr.txt.expect
@@ -1,2 +1,2 @@
-refcount_15.rscript:5:15: error: arrays/structures containing RS object types cannot be exported in target API < 16: 'aFail'
-refcount_15.rscript:9:3: error: arrays/structures containing RS object types cannot be exported in target API < 16: 'sFail'
+refcount_15.rs:5:15: error: arrays/structures containing RS object types cannot be exported in target API < 16: 'aFail'
+refcount_15.rs:9:3: error: arrays/structures containing RS object types cannot be exported in target API < 16: 'sFail'
diff --git a/tests/F_reflection3264_foreach_mismatch/reflection3264_foreach_mismatch.rscript b/tests/F_reflection3264_foreach_mismatch/reflection3264_foreach_mismatch.rs
index c8e4a6d..c8e4a6d 100644
--- a/tests/F_reflection3264_foreach_mismatch/reflection3264_foreach_mismatch.rscript
+++ b/tests/F_reflection3264_foreach_mismatch/reflection3264_foreach_mismatch.rs
diff --git a/tests/F_reflection3264_foreach_mismatch/stderr.txt.expect b/tests/F_reflection3264_foreach_mismatch/stderr.txt.expect
index b620d57..e24f176 100644
--- a/tests/F_reflection3264_foreach_mismatch/stderr.txt.expect
+++ b/tests/F_reflection3264_foreach_mismatch/stderr.txt.expect
@@ -1,26 +1,26 @@
-reflection3264_foreach_mismatch.rscript:13:15: error: foreach kernel 'bb' has __attribute__((kernel)) for 64-bit targets but not for 32-bit targets
-reflection3264_foreach_mismatch.rscript:22:18: error: foreach kernel 'dd' has output type 'uint' for 32-bit targets but output type 'ulong' for 64-bit targets
-reflection3264_foreach_mismatch.rscript:39:15: error: foreach kernel 'ii' has output type 'int' for 64-bit targets but no output for 32-bit targets
-reflection3264_foreach_mismatch.rscript:40:16: error: foreach kernel 'jj' has output type 'int' for 32-bit targets but no output for 64-bit targets
-reflection3264_foreach_mismatch.rscript:66:16: error: foreach kernel 'nn' has 1 input for 32-bit targets but 2 inputs for 64-bit targets
-reflection3264_foreach_mismatch.rscript:88:16: error: foreach kernel 'qq' has different special parameters for 32-bit targets than for 64-bit targets
-reflection3264_foreach_mismatch.rscript:124:16: error: 2nd input of foreach kernel 'uu' has type 'uint' for 32-bit targets but type 'ulong' for 64-bit targets
-reflection3264_foreach_mismatch.rscript:124:16: error: 4th input of foreach kernel 'uu' has type 'struct S' for 32-bit targets but type 'struct T' for 64-bit targets
-reflection3264_foreach_mismatch.rscript:133:6: error: foreach kernel 'xx' has 0 usrData parameters for 32-bit targets but 1 usrData parameter for 64-bit targets
-reflection3264_foreach_mismatch.rscript:132:6: error: foreach kernel 'ww' has 1 usrData parameter for 32-bit targets but 0 usrData parameters for 64-bit targets
-reflection3264_foreach_mismatch.rscript:128:6: error: 1st usrData parameter of foreach kernel 'vv' has type 'uint' for 32-bit targets but type 'ulong' for 64-bit targets
-reflection3264_foreach_mismatch.rscript:108:6: error: 1st input of foreach kernel 'tt' has type 'short' for 64-bit targets but is untyped for 32-bit targets
-reflection3264_foreach_mismatch.rscript:100:6: error: 1st input of foreach kernel 'ss' has type 'char' for 32-bit targets but is untyped for 64-bit targets
-reflection3264_foreach_mismatch.rscript:98:6: error: 1st input of foreach kernel 'rr' has type 'uint' for 32-bit targets but type 'ulong' for 64-bit targets
-reflection3264_foreach_mismatch.rscript:82:6: error: foreach kernel 'pp' has different special parameters for 32-bit targets than for 64-bit targets
-reflection3264_foreach_mismatch.rscript:74:6: error: foreach kernel 'oo' has output type 'uint' for 32-bit targets but output type 'ulong' for 64-bit targets
-reflection3264_foreach_mismatch.rscript:74:6: error: foreach kernel 'oo' has 0 usrData parameters for 32-bit targets but 1 usrData parameter for 64-bit targets
-reflection3264_foreach_mismatch.rscript:60:6: error: foreach kernel 'mm' has 0 inputs for 32-bit targets but 1 input for 64-bit targets
-reflection3264_foreach_mismatch.rscript:52:6: error: foreach kernel 'll' has untyped output for 32-bit targets but no output for 64-bit targets
-reflection3264_foreach_mismatch.rscript:51:6: error: foreach kernel 'kk' has untyped output for 64-bit targets but no output for 32-bit targets
-reflection3264_foreach_mismatch.rscript:38:6: error: foreach kernel 'hh' has output type 'int' for 32-bit targets but no output for 64-bit targets
-reflection3264_foreach_mismatch.rscript:37:6: error: foreach kernel 'gg' has output type 'int' for 64-bit targets but no output for 32-bit targets
-reflection3264_foreach_mismatch.rscript:28:6: error: foreach kernel 'ff' has output type 'short' for 32-bit targets but has untyped output for 64-bit targets
-reflection3264_foreach_mismatch.rscript:27:6: error: foreach kernel 'ee' has output type 'short' for 64-bit targets but has untyped output for 32-bit targets
-reflection3264_foreach_mismatch.rscript:20:6: error: foreach kernel 'cc' has output type 'uint' for 32-bit targets but output type 'ulong' for 64-bit targets
-reflection3264_foreach_mismatch.rscript:7:6: error: foreach kernel 'aa' has __attribute__((kernel)) for 32-bit targets but not for 64-bit targets
+reflection3264_foreach_mismatch.rs:13:15: error: foreach kernel 'bb' has __attribute__((kernel)) for 64-bit targets but not for 32-bit targets
+reflection3264_foreach_mismatch.rs:22:18: error: foreach kernel 'dd' has output type 'uint' for 32-bit targets but output type 'ulong' for 64-bit targets
+reflection3264_foreach_mismatch.rs:39:15: error: foreach kernel 'ii' has output type 'int' for 64-bit targets but no output for 32-bit targets
+reflection3264_foreach_mismatch.rs:40:16: error: foreach kernel 'jj' has output type 'int' for 32-bit targets but no output for 64-bit targets
+reflection3264_foreach_mismatch.rs:66:16: error: foreach kernel 'nn' has 1 input for 32-bit targets but 2 inputs for 64-bit targets
+reflection3264_foreach_mismatch.rs:88:16: error: foreach kernel 'qq' has different special parameters for 32-bit targets than for 64-bit targets
+reflection3264_foreach_mismatch.rs:124:16: error: 2nd input of foreach kernel 'uu' has type 'uint' for 32-bit targets but type 'ulong' for 64-bit targets
+reflection3264_foreach_mismatch.rs:124:16: error: 4th input of foreach kernel 'uu' has type 'struct S' for 32-bit targets but type 'struct T' for 64-bit targets
+reflection3264_foreach_mismatch.rs:133:6: error: foreach kernel 'xx' has 0 usrData parameters for 32-bit targets but 1 usrData parameter for 64-bit targets
+reflection3264_foreach_mismatch.rs:132:6: error: foreach kernel 'ww' has 1 usrData parameter for 32-bit targets but 0 usrData parameters for 64-bit targets
+reflection3264_foreach_mismatch.rs:128:6: error: 1st usrData parameter of foreach kernel 'vv' has type 'uint' for 32-bit targets but type 'ulong' for 64-bit targets
+reflection3264_foreach_mismatch.rs:108:6: error: 1st input of foreach kernel 'tt' has type 'short' for 64-bit targets but is untyped for 32-bit targets
+reflection3264_foreach_mismatch.rs:100:6: error: 1st input of foreach kernel 'ss' has type 'char' for 32-bit targets but is untyped for 64-bit targets
+reflection3264_foreach_mismatch.rs:98:6: error: 1st input of foreach kernel 'rr' has type 'uint' for 32-bit targets but type 'ulong' for 64-bit targets
+reflection3264_foreach_mismatch.rs:82:6: error: foreach kernel 'pp' has different special parameters for 32-bit targets than for 64-bit targets
+reflection3264_foreach_mismatch.rs:74:6: error: foreach kernel 'oo' has output type 'uint' for 32-bit targets but output type 'ulong' for 64-bit targets
+reflection3264_foreach_mismatch.rs:74:6: error: foreach kernel 'oo' has 0 usrData parameters for 32-bit targets but 1 usrData parameter for 64-bit targets
+reflection3264_foreach_mismatch.rs:60:6: error: foreach kernel 'mm' has 0 inputs for 32-bit targets but 1 input for 64-bit targets
+reflection3264_foreach_mismatch.rs:52:6: error: foreach kernel 'll' has untyped output for 32-bit targets but no output for 64-bit targets
+reflection3264_foreach_mismatch.rs:51:6: error: foreach kernel 'kk' has untyped output for 64-bit targets but no output for 32-bit targets
+reflection3264_foreach_mismatch.rs:38:6: error: foreach kernel 'hh' has output type 'int' for 32-bit targets but no output for 64-bit targets
+reflection3264_foreach_mismatch.rs:37:6: error: foreach kernel 'gg' has output type 'int' for 64-bit targets but no output for 32-bit targets
+reflection3264_foreach_mismatch.rs:28:6: error: foreach kernel 'ff' has output type 'short' for 32-bit targets but has untyped output for 64-bit targets
+reflection3264_foreach_mismatch.rs:27:6: error: foreach kernel 'ee' has output type 'short' for 64-bit targets but has untyped output for 32-bit targets
+reflection3264_foreach_mismatch.rs:20:6: error: foreach kernel 'cc' has output type 'uint' for 32-bit targets but output type 'ulong' for 64-bit targets
+reflection3264_foreach_mismatch.rs:7:6: error: foreach kernel 'aa' has __attribute__((kernel)) for 32-bit targets but not for 64-bit targets
diff --git a/tests/F_reflection3264_foreach_mismatch_extra32/reflection3264_foreach_mismatch_extra32.rscript b/tests/F_reflection3264_foreach_mismatch_extra32/reflection3264_foreach_mismatch_extra32.rs
index 8bf08c3..8bf08c3 100644
--- a/tests/F_reflection3264_foreach_mismatch_extra32/reflection3264_foreach_mismatch_extra32.rscript
+++ b/tests/F_reflection3264_foreach_mismatch_extra32/reflection3264_foreach_mismatch_extra32.rs
diff --git a/tests/F_reflection3264_foreach_mismatch_extra32/stderr.txt.expect b/tests/F_reflection3264_foreach_mismatch_extra32/stderr.txt.expect
index 65ea065..a5c8588 100644
--- a/tests/F_reflection3264_foreach_mismatch_extra32/stderr.txt.expect
+++ b/tests/F_reflection3264_foreach_mismatch_extra32/stderr.txt.expect
@@ -1,2 +1,2 @@
-error: in file 'reflection3264_foreach_mismatch_extra32.rscript' foreach kernel 'cc' is only present for 32-bit targets
-error: in file 'reflection3264_foreach_mismatch_extra32.rscript' foreach kernel 'dd' is only present for 32-bit targets
+error: in file 'reflection3264_foreach_mismatch_extra32.rs' foreach kernel 'cc' is only present for 32-bit targets
+error: in file 'reflection3264_foreach_mismatch_extra32.rs' foreach kernel 'dd' is only present for 32-bit targets
diff --git a/tests/F_reflection3264_foreach_mismatch_extra64/reflection3264_foreach_mismatch_extra64.rscript b/tests/F_reflection3264_foreach_mismatch_extra64/reflection3264_foreach_mismatch_extra64.rs
index 469ec99..469ec99 100644
--- a/tests/F_reflection3264_foreach_mismatch_extra64/reflection3264_foreach_mismatch_extra64.rscript
+++ b/tests/F_reflection3264_foreach_mismatch_extra64/reflection3264_foreach_mismatch_extra64.rs
diff --git a/tests/F_reflection3264_foreach_mismatch_extra64/stderr.txt.expect b/tests/F_reflection3264_foreach_mismatch_extra64/stderr.txt.expect
index b305ab2..4e8160e 100644
--- a/tests/F_reflection3264_foreach_mismatch_extra64/stderr.txt.expect
+++ b/tests/F_reflection3264_foreach_mismatch_extra64/stderr.txt.expect
@@ -1,2 +1,2 @@
-reflection3264_foreach_mismatch_extra64.rscript:10:6: error: foreach kernel 'cc' is only present for 64-bit targets
-reflection3264_foreach_mismatch_extra64.rscript:12:16: error: foreach kernel 'dd' is only present for 64-bit targets
+reflection3264_foreach_mismatch_extra64.rs:10:6: error: foreach kernel 'cc' is only present for 64-bit targets
+reflection3264_foreach_mismatch_extra64.rs:12:16: error: foreach kernel 'dd' is only present for 64-bit targets
diff --git a/tests/F_reflection3264_foreach_mismatch_name32/reflection3264_foreach_mismatch_name32.rscript b/tests/F_reflection3264_foreach_mismatch_name32/reflection3264_foreach_mismatch_name32.rs
index 89b597b..89b597b 100644
--- a/tests/F_reflection3264_foreach_mismatch_name32/reflection3264_foreach_mismatch_name32.rscript
+++ b/tests/F_reflection3264_foreach_mismatch_name32/reflection3264_foreach_mismatch_name32.rs
diff --git a/tests/F_reflection3264_foreach_mismatch_name32/stderr.txt.expect b/tests/F_reflection3264_foreach_mismatch_name32/stderr.txt.expect
index dfcc608..1d58483 100644
--- a/tests/F_reflection3264_foreach_mismatch_name32/stderr.txt.expect
+++ b/tests/F_reflection3264_foreach_mismatch_name32/stderr.txt.expect
@@ -1,3 +1,3 @@
-reflection3264_foreach_mismatch_name32.rscript:18:16: error: 1st input of foreach kernel 'bb' has type 'uint' for 32-bit targets but type 'ulong' for 64-bit targets
-reflection3264_foreach_mismatch_name32.rscript:8:6: error: 1st input of foreach kernel 'aa' has type 'uint' for 32-bit targets but type 'ulong' for 64-bit targets
-reflection3264_foreach_mismatch_name32.rscript:11:6: error: 2nd foreach kernel is 'cc32' for 32-bit targets but 'cc64' for 64-bit targets
+reflection3264_foreach_mismatch_name32.rs:18:16: error: 1st input of foreach kernel 'bb' has type 'uint' for 32-bit targets but type 'ulong' for 64-bit targets
+reflection3264_foreach_mismatch_name32.rs:8:6: error: 1st input of foreach kernel 'aa' has type 'uint' for 32-bit targets but type 'ulong' for 64-bit targets
+reflection3264_foreach_mismatch_name32.rs:11:6: error: 2nd foreach kernel is 'cc32' for 32-bit targets but 'cc64' for 64-bit targets
diff --git a/tests/F_reflection3264_foreach_mismatch_name64/reflection3264_foreach_mismatch_name64.rscript b/tests/F_reflection3264_foreach_mismatch_name64/reflection3264_foreach_mismatch_name64.rs
index 59646f5..59646f5 100644
--- a/tests/F_reflection3264_foreach_mismatch_name64/reflection3264_foreach_mismatch_name64.rscript
+++ b/tests/F_reflection3264_foreach_mismatch_name64/reflection3264_foreach_mismatch_name64.rs
diff --git a/tests/F_reflection3264_foreach_mismatch_name64/stderr.txt.expect b/tests/F_reflection3264_foreach_mismatch_name64/stderr.txt.expect
index c12aa38..2175d70 100644
--- a/tests/F_reflection3264_foreach_mismatch_name64/stderr.txt.expect
+++ b/tests/F_reflection3264_foreach_mismatch_name64/stderr.txt.expect
@@ -1,3 +1,3 @@
-reflection3264_foreach_mismatch_name64.rscript:18:16: error: 1st input of foreach kernel 'bb' has type 'uint' for 32-bit targets but type 'ulong' for 64-bit targets
-reflection3264_foreach_mismatch_name64.rscript:8:6: error: 1st input of foreach kernel 'aa' has type 'uint' for 32-bit targets but type 'ulong' for 64-bit targets
-reflection3264_foreach_mismatch_name64.rscript:11:6: error: 2nd foreach kernel is 'cc32' for 32-bit targets but 'cc64' for 64-bit targets
+reflection3264_foreach_mismatch_name64.rs:18:16: error: 1st input of foreach kernel 'bb' has type 'uint' for 32-bit targets but type 'ulong' for 64-bit targets
+reflection3264_foreach_mismatch_name64.rs:8:6: error: 1st input of foreach kernel 'aa' has type 'uint' for 32-bit targets but type 'ulong' for 64-bit targets
+reflection3264_foreach_mismatch_name64.rs:11:6: error: 2nd foreach kernel is 'cc32' for 32-bit targets but 'cc64' for 64-bit targets
diff --git a/tests/F_reflection3264_invokable_extra32/reflection3264_invokable_extra32.rscript b/tests/F_reflection3264_invokable_extra32/reflection3264_invokable_extra32.rs
index 18ce97f..18ce97f 100644
--- a/tests/F_reflection3264_invokable_extra32/reflection3264_invokable_extra32.rscript
+++ b/tests/F_reflection3264_invokable_extra32/reflection3264_invokable_extra32.rs
diff --git a/tests/F_reflection3264_invokable_extra32/stderr.txt.expect b/tests/F_reflection3264_invokable_extra32/stderr.txt.expect
index d1bff28..ba0f30a 100644
--- a/tests/F_reflection3264_invokable_extra32/stderr.txt.expect
+++ b/tests/F_reflection3264_invokable_extra32/stderr.txt.expect
@@ -1,2 +1,2 @@
-error: in file 'reflection3264_invokable_extra32.rscript' invokable function 'd' is only present for 32-bit targets
-error: in file 'reflection3264_invokable_extra32.rscript' invokable function 'e' is only present for 32-bit targets
+error: in file 'reflection3264_invokable_extra32.rs' invokable function 'd' is only present for 32-bit targets
+error: in file 'reflection3264_invokable_extra32.rs' invokable function 'e' is only present for 32-bit targets
diff --git a/tests/F_reflection3264_invokable_extra64/reflection3264_invokable_extra64.rscript b/tests/F_reflection3264_invokable_extra64/reflection3264_invokable_extra64.rs
index e9c1e1f..e9c1e1f 100644
--- a/tests/F_reflection3264_invokable_extra64/reflection3264_invokable_extra64.rscript
+++ b/tests/F_reflection3264_invokable_extra64/reflection3264_invokable_extra64.rs
diff --git a/tests/F_reflection3264_invokable_extra64/stderr.txt.expect b/tests/F_reflection3264_invokable_extra64/stderr.txt.expect
index 1353b7d..4f0d9f9 100644
--- a/tests/F_reflection3264_invokable_extra64/stderr.txt.expect
+++ b/tests/F_reflection3264_invokable_extra64/stderr.txt.expect
@@ -1,2 +1,2 @@
-reflection3264_invokable_extra64.rscript:12:6: error: invokable function 'd' is only present for 64-bit targets
-reflection3264_invokable_extra64.rscript:14:6: error: invokable function 'e' is only present for 64-bit targets
+reflection3264_invokable_extra64.rs:12:6: error: invokable function 'd' is only present for 64-bit targets
+reflection3264_invokable_extra64.rs:14:6: error: invokable function 'e' is only present for 64-bit targets
diff --git a/tests/F_reflection3264_invokable_mismatch/reflection3264_invokable_mismatch.rscript b/tests/F_reflection3264_invokable_mismatch/reflection3264_invokable_mismatch.rs
index 5b3527b..5b3527b 100644
--- a/tests/F_reflection3264_invokable_mismatch/reflection3264_invokable_mismatch.rscript
+++ b/tests/F_reflection3264_invokable_mismatch/reflection3264_invokable_mismatch.rs
diff --git a/tests/F_reflection3264_invokable_mismatch/stderr.txt.expect b/tests/F_reflection3264_invokable_mismatch/stderr.txt.expect
index 317ac35..868ec30 100644
--- a/tests/F_reflection3264_invokable_mismatch/stderr.txt.expect
+++ b/tests/F_reflection3264_invokable_mismatch/stderr.txt.expect
@@ -1,4 +1,4 @@
-reflection3264_invokable_mismatch.rscript:5:6: error: invokable function 'a' has 2 parameters for 32-bit targets but 1 parameter for 64-bit targets
-reflection3264_invokable_mismatch.rscript:10:6: error: 2nd parameter of invokable function 'b' has type 'uint' for 32-bit targets but type 'ulong' for 64-bit targets
-reflection3264_invokable_mismatch.rscript:10:6: error: 4th parameter of invokable function 'b' has type 'int' for 32-bit targets but type 'long' for 64-bit targets
-reflection3264_invokable_mismatch.rscript:13:6: error: 3rd invokable function is 'c32' for 32-bit targets but 'c64' for 64-bit targets
+reflection3264_invokable_mismatch.rs:5:6: error: invokable function 'a' has 2 parameters for 32-bit targets but 1 parameter for 64-bit targets
+reflection3264_invokable_mismatch.rs:10:6: error: 2nd parameter of invokable function 'b' has type 'uint' for 32-bit targets but type 'ulong' for 64-bit targets
+reflection3264_invokable_mismatch.rs:10:6: error: 4th parameter of invokable function 'b' has type 'int' for 32-bit targets but type 'long' for 64-bit targets
+reflection3264_invokable_mismatch.rs:13:6: error: 3rd invokable function is 'c32' for 32-bit targets but 'c64' for 64-bit targets
diff --git a/tests/F_reflection3264_multifile/reflection3264_multifile_1.rscript b/tests/F_reflection3264_multifile/reflection3264_multifile_1.rs
index 8ea1418..8ea1418 100644
--- a/tests/F_reflection3264_multifile/reflection3264_multifile_1.rscript
+++ b/tests/F_reflection3264_multifile/reflection3264_multifile_1.rs
diff --git a/tests/F_reflection3264_multifile/reflection3264_multifile_2.rscript b/tests/F_reflection3264_multifile/reflection3264_multifile_2.rs
index 2b5be58..2b5be58 100644
--- a/tests/F_reflection3264_multifile/reflection3264_multifile_2.rscript
+++ b/tests/F_reflection3264_multifile/reflection3264_multifile_2.rs
diff --git a/tests/F_reflection3264_multifile/reflection3264_multifile_3.rscript b/tests/F_reflection3264_multifile/reflection3264_multifile_3.rs
index 7bf2788..7bf2788 100644
--- a/tests/F_reflection3264_multifile/reflection3264_multifile_3.rscript
+++ b/tests/F_reflection3264_multifile/reflection3264_multifile_3.rs
diff --git a/tests/F_reflection3264_multifile/stderr.txt.expect b/tests/F_reflection3264_multifile/stderr.txt.expect
index 8fccee4..31c4d5f 100644
--- a/tests/F_reflection3264_multifile/stderr.txt.expect
+++ b/tests/F_reflection3264_multifile/stderr.txt.expect
@@ -1,2 +1,2 @@
-reflection3264_multifile_2.rscript:16:16: error: 2nd input of foreach kernel 'm' has type 'uint' for 32-bit targets but type 'ulong' for 64-bit targets
-error: in file 'reflection3264_multifile_2.rscript' invokable function 'g' is only present for 32-bit targets
+reflection3264_multifile_2.rs:16:16: error: 2nd input of foreach kernel 'm' has type 'uint' for 32-bit targets but type 'ulong' for 64-bit targets
+error: in file 'reflection3264_multifile_2.rs' invokable function 'g' is only present for 32-bit targets
diff --git a/tests/F_reflection3264_package_mismatch/reflection3264_package_mismatch.rscript b/tests/F_reflection3264_package_mismatch/reflection3264_package_mismatch.rs
index d0452f8..d0452f8 100644
--- a/tests/F_reflection3264_package_mismatch/reflection3264_package_mismatch.rscript
+++ b/tests/F_reflection3264_package_mismatch/reflection3264_package_mismatch.rs
diff --git a/tests/F_reflection3264_package_mismatch/stderr.txt.expect b/tests/F_reflection3264_package_mismatch/stderr.txt.expect
index 77893d0..030f573 100644
--- a/tests/F_reflection3264_package_mismatch/stderr.txt.expect
+++ b/tests/F_reflection3264_package_mismatch/stderr.txt.expect
@@ -1 +1 @@
-error: in file 'reflection3264_package_mismatch.rscript' Java package name is 'thirty_two' for 32-bit targets but 'sixty_four' for 64-bit targets
+error: in file 'reflection3264_package_mismatch.rs' Java package name is 'thirty_two' for 32-bit targets but 'sixty_four' for 64-bit targets
diff --git a/tests/F_reflection3264_reduce_extra32/reflection3264_reduce_extra32.rscript b/tests/F_reflection3264_reduce_extra32/reflection3264_reduce_extra32.rs
index e734158..e734158 100644
--- a/tests/F_reflection3264_reduce_extra32/reflection3264_reduce_extra32.rscript
+++ b/tests/F_reflection3264_reduce_extra32/reflection3264_reduce_extra32.rs
diff --git a/tests/F_reflection3264_reduce_extra32/stderr.txt.expect b/tests/F_reflection3264_reduce_extra32/stderr.txt.expect
index f0a7997..c058403 100644
--- a/tests/F_reflection3264_reduce_extra32/stderr.txt.expect
+++ b/tests/F_reflection3264_reduce_extra32/stderr.txt.expect
@@ -1,2 +1,2 @@
-error: in file 'reflection3264_reduce_extra32.rscript' reduction kernel 'cc' is only present for 32-bit targets
-error: in file 'reflection3264_reduce_extra32.rscript' reduction kernel 'dd' is only present for 32-bit targets
+error: in file 'reflection3264_reduce_extra32.rs' reduction kernel 'cc' is only present for 32-bit targets
+error: in file 'reflection3264_reduce_extra32.rs' reduction kernel 'dd' is only present for 32-bit targets
diff --git a/tests/F_reflection3264_reduce_extra64/reflection3264_reduce_extra64.rscript b/tests/F_reflection3264_reduce_extra64/reflection3264_reduce_extra64.rs
index c653d50..c653d50 100644
--- a/tests/F_reflection3264_reduce_extra64/reflection3264_reduce_extra64.rscript
+++ b/tests/F_reflection3264_reduce_extra64/reflection3264_reduce_extra64.rs
diff --git a/tests/F_reflection3264_reduce_extra64/stderr.txt.expect b/tests/F_reflection3264_reduce_extra64/stderr.txt.expect
index 1039de1..864c196 100644
--- a/tests/F_reflection3264_reduce_extra64/stderr.txt.expect
+++ b/tests/F_reflection3264_reduce_extra64/stderr.txt.expect
@@ -1,2 +1,2 @@
-reflection3264_reduce_extra64.rscript:10:12: error: reduction kernel 'cc' is only present for 64-bit targets
-reflection3264_reduce_extra64.rscript:11:12: error: reduction kernel 'dd' is only present for 64-bit targets
+reflection3264_reduce_extra64.rs:10:12: error: reduction kernel 'cc' is only present for 64-bit targets
+reflection3264_reduce_extra64.rs:11:12: error: reduction kernel 'dd' is only present for 64-bit targets
diff --git a/tests/F_reflection3264_reduce_mismatch/reflection3264_reduce_mismatch.rscript b/tests/F_reflection3264_reduce_mismatch/reflection3264_reduce_mismatch.rs
index 10b3d85..10b3d85 100644
--- a/tests/F_reflection3264_reduce_mismatch/reflection3264_reduce_mismatch.rscript
+++ b/tests/F_reflection3264_reduce_mismatch/reflection3264_reduce_mismatch.rs
diff --git a/tests/F_reflection3264_reduce_mismatch/stderr.txt.expect b/tests/F_reflection3264_reduce_mismatch/stderr.txt.expect
index e325686..9c9a577 100644
--- a/tests/F_reflection3264_reduce_mismatch/stderr.txt.expect
+++ b/tests/F_reflection3264_reduce_mismatch/stderr.txt.expect
@@ -1,11 +1,11 @@
-reflection3264_reduce_mismatch.rscript:37:12: error: reduction kernel 'cc' has result type 'uint' for 32-bit targets but result type 'ulong' for 64-bit targets
-reflection3264_reduce_mismatch.rscript:37:12: error: 2nd input of reduction kernel 'cc' has type 'uint' for 32-bit targets but type 'ulong' for 64-bit targets
-reflection3264_reduce_mismatch.rscript:37:12: error: 4th input of reduction kernel 'cc' has type 'uint' for 32-bit targets but type 'ulong' for 64-bit targets
-reflection3264_reduce_mismatch.rscript:43:12: error: reduction kernel 'dd' has 2 inputs for 32-bit targets but 1 input for 64-bit targets
-reflection3264_reduce_mismatch.rscript:52:12: error: reduction kernel 'ee' is reflected in Java only for 32-bit targets
-reflection3264_reduce_mismatch.rscript:52:12: error: reduction kernel 'ee' has result type 'int' for 32-bit targets but result type 'struct S' for 64-bit targets
-reflection3264_reduce_mismatch.rscript:52:12: error: 2nd input of reduction kernel 'ee' has type 'uint' for 32-bit targets but type 'ulong' for 64-bit targets
-reflection3264_reduce_mismatch.rscript:53:12: error: reduction kernel 'ff' is reflected in Java only for 64-bit targets
-reflection3264_reduce_mismatch.rscript:53:12: error: reduction kernel 'ff' has result type 'struct S' for 32-bit targets but result type 'int' for 64-bit targets
-reflection3264_reduce_mismatch.rscript:53:12: error: reduction kernel 'ff' has 3 inputs for 32-bit targets but 2 inputs for 64-bit targets
-reflection3264_reduce_mismatch.rscript:54:12: error: 1st input of reduction kernel 'gg' has type 'uint' for 32-bit targets but type 'ulong' for 64-bit targets
+reflection3264_reduce_mismatch.rs:37:12: error: reduction kernel 'cc' has result type 'uint' for 32-bit targets but result type 'ulong' for 64-bit targets
+reflection3264_reduce_mismatch.rs:37:12: error: 2nd input of reduction kernel 'cc' has type 'uint' for 32-bit targets but type 'ulong' for 64-bit targets
+reflection3264_reduce_mismatch.rs:37:12: error: 4th input of reduction kernel 'cc' has type 'uint' for 32-bit targets but type 'ulong' for 64-bit targets
+reflection3264_reduce_mismatch.rs:43:12: error: reduction kernel 'dd' has 2 inputs for 32-bit targets but 1 input for 64-bit targets
+reflection3264_reduce_mismatch.rs:52:12: error: reduction kernel 'ee' is reflected in Java only for 32-bit targets
+reflection3264_reduce_mismatch.rs:52:12: error: reduction kernel 'ee' has result type 'int' for 32-bit targets but result type 'struct S' for 64-bit targets
+reflection3264_reduce_mismatch.rs:52:12: error: 2nd input of reduction kernel 'ee' has type 'uint' for 32-bit targets but type 'ulong' for 64-bit targets
+reflection3264_reduce_mismatch.rs:53:12: error: reduction kernel 'ff' is reflected in Java only for 64-bit targets
+reflection3264_reduce_mismatch.rs:53:12: error: reduction kernel 'ff' has result type 'struct S' for 32-bit targets but result type 'int' for 64-bit targets
+reflection3264_reduce_mismatch.rs:53:12: error: reduction kernel 'ff' has 3 inputs for 32-bit targets but 2 inputs for 64-bit targets
+reflection3264_reduce_mismatch.rs:54:12: error: 1st input of reduction kernel 'gg' has type 'uint' for 32-bit targets but type 'ulong' for 64-bit targets
diff --git a/tests/F_reflection3264_reduce_mismatch_name_exp/reflection3264_reduce_mismatch_name_exp.rscript b/tests/F_reflection3264_reduce_mismatch_name_exp/reflection3264_reduce_mismatch_name_exp.rs
index 7548cfe..7548cfe 100644
--- a/tests/F_reflection3264_reduce_mismatch_name_exp/reflection3264_reduce_mismatch_name_exp.rscript
+++ b/tests/F_reflection3264_reduce_mismatch_name_exp/reflection3264_reduce_mismatch_name_exp.rs
diff --git a/tests/F_reflection3264_reduce_mismatch_name_exp/stderr.txt.expect b/tests/F_reflection3264_reduce_mismatch_name_exp/stderr.txt.expect
index fdcd9ce..c5527b1 100644
--- a/tests/F_reflection3264_reduce_mismatch_name_exp/stderr.txt.expect
+++ b/tests/F_reflection3264_reduce_mismatch_name_exp/stderr.txt.expect
@@ -1 +1 @@
-reflection3264_reduce_mismatch_name_exp.rscript:7:12: error: 1st reduction kernel is 'a32' for 32-bit targets but 'a64' for 64-bit targets
+reflection3264_reduce_mismatch_name_exp.rs:7:12: error: 1st reduction kernel is 'a32' for 32-bit targets but 'a64' for 64-bit targets
diff --git a/tests/F_reflection3264_reduce_mismatch_name_noexp/reflection3264_reduce_mismatch_name_noexp.rscript b/tests/F_reflection3264_reduce_mismatch_name_noexp/reflection3264_reduce_mismatch_name_noexp.rs
index 496ff01..496ff01 100644
--- a/tests/F_reflection3264_reduce_mismatch_name_noexp/reflection3264_reduce_mismatch_name_noexp.rscript
+++ b/tests/F_reflection3264_reduce_mismatch_name_noexp/reflection3264_reduce_mismatch_name_noexp.rs
diff --git a/tests/F_reflection3264_reduce_mismatch_name_noexp/stderr.txt.expect b/tests/F_reflection3264_reduce_mismatch_name_noexp/stderr.txt.expect
index 7c90772..940684f 100644
--- a/tests/F_reflection3264_reduce_mismatch_name_noexp/stderr.txt.expect
+++ b/tests/F_reflection3264_reduce_mismatch_name_noexp/stderr.txt.expect
@@ -1 +1 @@
-reflection3264_reduce_mismatch_name_noexp.rscript:10:12: error: 1st reduction kernel is 'a32' for 32-bit targets but 'a64' for 64-bit targets
+reflection3264_reduce_mismatch_name_noexp.rs:10:12: error: 1st reduction kernel is 'a32' for 32-bit targets but 'a64' for 64-bit targets
diff --git a/tests/F_reflection3264_struct_mismatch/reflection3264_struct_mismatch.rscript b/tests/F_reflection3264_struct_mismatch/reflection3264_struct_mismatch.rs
index 5858add..5858add 100644
--- a/tests/F_reflection3264_struct_mismatch/reflection3264_struct_mismatch.rscript
+++ b/tests/F_reflection3264_struct_mismatch/reflection3264_struct_mismatch.rs
diff --git a/tests/F_reflection3264_struct_mismatch/stderr.txt.expect b/tests/F_reflection3264_struct_mismatch/stderr.txt.expect
index 07acc79..4c70112 100644
--- a/tests/F_reflection3264_struct_mismatch/stderr.txt.expect
+++ b/tests/F_reflection3264_struct_mismatch/stderr.txt.expect
@@ -1,16 +1,16 @@
-reflection3264_struct_mismatch.rscript:19:10: error: global variable 'aa' has type 'int' for 32-bit targets but type 'struct t' for 64-bit targets
-reflection3264_struct_mismatch.rscript:20:10: error: global variable 'bb' has type 'int' for 32-bit targets but type 'struct q' for 64-bit targets
-reflection3264_struct_mismatch.rscript:21:10: error: global variable 'cc' has type 'int' for 32-bit targets but type 'struct b' for 64-bit targets
-reflection3264_struct_mismatch.rscript:22:5: error: global variable 'dd' has type 'struct j' for 32-bit targets but type 'int' for 64-bit targets
-reflection3264_struct_mismatch.rscript:23:5: error: global variable 'ee' has type 'struct f' for 32-bit targets but type 'int' for 64-bit targets
-reflection3264_struct_mismatch.rscript:24:5: error: global variable 'ff' has type 'struct o' for 32-bit targets but type 'int' for 64-bit targets
-reflection3264_struct_mismatch.rscript:6:8: error: structure 'q' is exported only for 64-bit targets
-reflection3264_struct_mismatch.rscript:8:8: error: structure 'b' is exported only for 64-bit targets
-reflection3264_struct_mismatch.rscript:4:8: error: structure 't' is exported only for 64-bit targets
-reflection3264_struct_mismatch.rscript:54:8: error: 2nd field of exported structure 'FieldName' is 'e' for 32-bit targets but 'b' for 64-bit targets
-reflection3264_struct_mismatch.rscript:73:8: error: field 'b' of exported structure 'FieldType' has type 'uint' for 32-bit targets but type 'ulong' for 64-bit targets
-reflection3264_struct_mismatch.rscript:73:8: error: field 'e' of exported structure 'FieldType' has type 'char[4]' for 32-bit targets but type 'char[8]' for 64-bit targets
-reflection3264_struct_mismatch.rscript:37:8: error: exported structure 'FieldCount' has 1 field for 32-bit targets but 2 fields for 64-bit targets
-error: in file 'reflection3264_struct_mismatch.rscript' structure 'f' is exported only for 32-bit targets
-error: in file 'reflection3264_struct_mismatch.rscript' structure 'j' is exported only for 32-bit targets
-error: in file 'reflection3264_struct_mismatch.rscript' structure 'o' is exported only for 32-bit targets
+reflection3264_struct_mismatch.rs:19:10: error: global variable 'aa' has type 'int' for 32-bit targets but type 'struct t' for 64-bit targets
+reflection3264_struct_mismatch.rs:20:10: error: global variable 'bb' has type 'int' for 32-bit targets but type 'struct q' for 64-bit targets
+reflection3264_struct_mismatch.rs:21:10: error: global variable 'cc' has type 'int' for 32-bit targets but type 'struct b' for 64-bit targets
+reflection3264_struct_mismatch.rs:22:5: error: global variable 'dd' has type 'struct j' for 32-bit targets but type 'int' for 64-bit targets
+reflection3264_struct_mismatch.rs:23:5: error: global variable 'ee' has type 'struct f' for 32-bit targets but type 'int' for 64-bit targets
+reflection3264_struct_mismatch.rs:24:5: error: global variable 'ff' has type 'struct o' for 32-bit targets but type 'int' for 64-bit targets
+reflection3264_struct_mismatch.rs:6:8: error: structure 'q' is exported only for 64-bit targets
+reflection3264_struct_mismatch.rs:8:8: error: structure 'b' is exported only for 64-bit targets
+reflection3264_struct_mismatch.rs:4:8: error: structure 't' is exported only for 64-bit targets
+reflection3264_struct_mismatch.rs:54:8: error: 2nd field of exported structure 'FieldName' is 'e' for 32-bit targets but 'b' for 64-bit targets
+reflection3264_struct_mismatch.rs:73:8: error: field 'b' of exported structure 'FieldType' has type 'uint' for 32-bit targets but type 'ulong' for 64-bit targets
+reflection3264_struct_mismatch.rs:73:8: error: field 'e' of exported structure 'FieldType' has type 'char[4]' for 32-bit targets but type 'char[8]' for 64-bit targets
+reflection3264_struct_mismatch.rs:37:8: error: exported structure 'FieldCount' has 1 field for 32-bit targets but 2 fields for 64-bit targets
+error: in file 'reflection3264_struct_mismatch.rs' structure 'f' is exported only for 32-bit targets
+error: in file 'reflection3264_struct_mismatch.rs' structure 'j' is exported only for 32-bit targets
+error: in file 'reflection3264_struct_mismatch.rs' structure 'o' is exported only for 32-bit targets
diff --git a/tests/F_reflection3264_variable_extra32/reflection3264_variable_extra32.rscript b/tests/F_reflection3264_variable_extra32/reflection3264_variable_extra32.rs
index a26178f..a26178f 100644
--- a/tests/F_reflection3264_variable_extra32/reflection3264_variable_extra32.rscript
+++ b/tests/F_reflection3264_variable_extra32/reflection3264_variable_extra32.rs
diff --git a/tests/F_reflection3264_variable_extra32/stderr.txt.expect b/tests/F_reflection3264_variable_extra32/stderr.txt.expect
index 98333be..ec0b242 100644
--- a/tests/F_reflection3264_variable_extra32/stderr.txt.expect
+++ b/tests/F_reflection3264_variable_extra32/stderr.txt.expect
@@ -1,3 +1,3 @@
-reflection3264_variable_extra32.rscript:6:8: error: global variable 'b' has type 'uint' for 32-bit targets but type 'ulong' for 64-bit targets
-error: in file 'reflection3264_variable_extra32.rscript' global variable 'd' is only present for 32-bit targets
-error: in file 'reflection3264_variable_extra32.rscript' global variable 'e' is only present for 32-bit targets
+reflection3264_variable_extra32.rs:6:8: error: global variable 'b' has type 'uint' for 32-bit targets but type 'ulong' for 64-bit targets
+error: in file 'reflection3264_variable_extra32.rs' global variable 'd' is only present for 32-bit targets
+error: in file 'reflection3264_variable_extra32.rs' global variable 'e' is only present for 32-bit targets
diff --git a/tests/F_reflection3264_variable_extra64/reflection3264_variable_extra64.rscript b/tests/F_reflection3264_variable_extra64/reflection3264_variable_extra64.rs
index 4b9e946..4b9e946 100644
--- a/tests/F_reflection3264_variable_extra64/reflection3264_variable_extra64.rscript
+++ b/tests/F_reflection3264_variable_extra64/reflection3264_variable_extra64.rs
diff --git a/tests/F_reflection3264_variable_extra64/stderr.txt.expect b/tests/F_reflection3264_variable_extra64/stderr.txt.expect
index d88bad4..6888f90 100644
--- a/tests/F_reflection3264_variable_extra64/stderr.txt.expect
+++ b/tests/F_reflection3264_variable_extra64/stderr.txt.expect
@@ -1,3 +1,3 @@
-reflection3264_variable_extra64.rscript:6:8: error: global variable 'b' has type 'uint' for 32-bit targets but type 'ulong' for 64-bit targets
-reflection3264_variable_extra64.rscript:12:6: error: global variable 'd' is only present for 64-bit targets
-reflection3264_variable_extra64.rscript:14:7: error: global variable 'e' is only present for 64-bit targets
+reflection3264_variable_extra64.rs:6:8: error: global variable 'b' has type 'uint' for 32-bit targets but type 'ulong' for 64-bit targets
+reflection3264_variable_extra64.rs:12:6: error: global variable 'd' is only present for 64-bit targets
+reflection3264_variable_extra64.rs:14:7: error: global variable 'e' is only present for 64-bit targets
diff --git a/tests/F_reflection3264_variable_mismatch/reflection3264_variable_mismatch.rscript b/tests/F_reflection3264_variable_mismatch/reflection3264_variable_mismatch.rs
index b203751..b203751 100644
--- a/tests/F_reflection3264_variable_mismatch/reflection3264_variable_mismatch.rscript
+++ b/tests/F_reflection3264_variable_mismatch/reflection3264_variable_mismatch.rs
diff --git a/tests/F_reflection3264_variable_mismatch/stderr.txt.expect b/tests/F_reflection3264_variable_mismatch/stderr.txt.expect
index a892a65..bc28bc5 100644
--- a/tests/F_reflection3264_variable_mismatch/stderr.txt.expect
+++ b/tests/F_reflection3264_variable_mismatch/stderr.txt.expect
@@ -1,7 +1,7 @@
-reflection3264_variable_mismatch.rscript:7:8: error: global variable 'a' has type 'uint' for 32-bit targets but type 'ulong' for 64-bit targets
-reflection3264_variable_mismatch.rscript:9:5: error: global variable 'b' has type 'int[4]' for 32-bit targets but type 'int[8]' for 64-bit targets
-reflection3264_variable_mismatch.rscript:16:5: error: global variable 'd' has inconsistent 'const' qualification between 32-bit targets and 64-bit targets
-reflection3264_variable_mismatch.rscript:21:5: error: global variable 'e' has inconsistent 'const' qualification between 32-bit targets and 64-bit targets
-reflection3264_variable_mismatch.rscript:24:12: error: global variable 'f' has type 'struct Bar' for 32-bit targets but type 'struct Foo' for 64-bit targets
-reflection3264_variable_mismatch.rscript:29:8: error: global variable 'g' has type 'uint[10]' for 32-bit targets but type 'ulong[10]' for 64-bit targets
-reflection3264_variable_mismatch.rscript:32:5: error: 10th global variable is 'h32' for 32-bit targets but 'h64' for 64-bit targets
+reflection3264_variable_mismatch.rs:7:8: error: global variable 'a' has type 'uint' for 32-bit targets but type 'ulong' for 64-bit targets
+reflection3264_variable_mismatch.rs:9:5: error: global variable 'b' has type 'int[4]' for 32-bit targets but type 'int[8]' for 64-bit targets
+reflection3264_variable_mismatch.rs:16:5: error: global variable 'd' has inconsistent 'const' qualification between 32-bit targets and 64-bit targets
+reflection3264_variable_mismatch.rs:21:5: error: global variable 'e' has inconsistent 'const' qualification between 32-bit targets and 64-bit targets
+reflection3264_variable_mismatch.rs:24:12: error: global variable 'f' has type 'struct Bar' for 32-bit targets but type 'struct Foo' for 64-bit targets
+reflection3264_variable_mismatch.rs:29:8: error: global variable 'g' has type 'uint[10]' for 32-bit targets but type 'ulong[10]' for 64-bit targets
+reflection3264_variable_mismatch.rs:32:5: error: 10th global variable is 'h32' for 32-bit targets but 'h64' for 64-bit targets
diff --git a/tests/F_reflection3264_variable_mismatch_init/reflection3264_variable_mismatch_init.rscript b/tests/F_reflection3264_variable_mismatch_init/reflection3264_variable_mismatch_init.rs
index 2aa142c..2aa142c 100644
--- a/tests/F_reflection3264_variable_mismatch_init/reflection3264_variable_mismatch_init.rscript
+++ b/tests/F_reflection3264_variable_mismatch_init/reflection3264_variable_mismatch_init.rs
diff --git a/tests/F_reflection3264_variable_mismatch_init/stderr.txt.expect b/tests/F_reflection3264_variable_mismatch_init/stderr.txt.expect
index 2aa9e72..c342a62 100644
--- a/tests/F_reflection3264_variable_mismatch_init/stderr.txt.expect
+++ b/tests/F_reflection3264_variable_mismatch_init/stderr.txt.expect
@@ -1,12 +1,12 @@
-reflection3264_variable_mismatch_init.rscript:6:7: error: global variable 'b' is initialized differently for 32-bit targets than for 64-bit targets
-reflection3264_variable_mismatch_init.rscript:10:8: error: global variable 'd' is initialized differently for 32-bit targets than for 64-bit targets
-reflection3264_variable_mismatch_init.rscript:14:6: error: global variable 'f' is initialized differently for 32-bit targets than for 64-bit targets
-reflection3264_variable_mismatch_init.rscript:18:6: error: global variable 'h' is initialized differently for 32-bit targets than for 64-bit targets
-reflection3264_variable_mismatch_init.rscript:22:8: error: global variable 'j' is initialized differently for 32-bit targets than for 64-bit targets
-reflection3264_variable_mismatch_init.rscript:30:5: error: global variable 'k' is initialized differently for 32-bit targets than for 64-bit targets
-reflection3264_variable_mismatch_init.rscript:38:5: error: global variable 'm' is initialized differently for 32-bit targets than for 64-bit targets
-reflection3264_variable_mismatch_init.rscript:45:6: error: global variable 'n' is initialized differently for 32-bit targets than for 64-bit targets
-reflection3264_variable_mismatch_init.rscript:51:8: error: global variable 'jj' is initialized differently for 32-bit targets than for 64-bit targets
-reflection3264_variable_mismatch_init.rscript:59:5: error: global variable 'kk' is initialized differently for 32-bit targets than for 64-bit targets
-reflection3264_variable_mismatch_init.rscript:65:5: error: global variable 'mm' is initialized differently for 32-bit targets than for 64-bit targets
-reflection3264_variable_mismatch_init.rscript:72:6: error: global variable 'nn' is initialized differently for 32-bit targets than for 64-bit targets
+reflection3264_variable_mismatch_init.rs:6:7: error: global variable 'b' is initialized differently for 32-bit targets than for 64-bit targets
+reflection3264_variable_mismatch_init.rs:10:8: error: global variable 'd' is initialized differently for 32-bit targets than for 64-bit targets
+reflection3264_variable_mismatch_init.rs:14:6: error: global variable 'f' is initialized differently for 32-bit targets than for 64-bit targets
+reflection3264_variable_mismatch_init.rs:18:6: error: global variable 'h' is initialized differently for 32-bit targets than for 64-bit targets
+reflection3264_variable_mismatch_init.rs:22:8: error: global variable 'j' is initialized differently for 32-bit targets than for 64-bit targets
+reflection3264_variable_mismatch_init.rs:30:5: error: global variable 'k' is initialized differently for 32-bit targets than for 64-bit targets
+reflection3264_variable_mismatch_init.rs:38:5: error: global variable 'm' is initialized differently for 32-bit targets than for 64-bit targets
+reflection3264_variable_mismatch_init.rs:45:6: error: global variable 'n' is initialized differently for 32-bit targets than for 64-bit targets
+reflection3264_variable_mismatch_init.rs:51:8: error: global variable 'jj' is initialized differently for 32-bit targets than for 64-bit targets
+reflection3264_variable_mismatch_init.rs:59:5: error: global variable 'kk' is initialized differently for 32-bit targets than for 64-bit targets
+reflection3264_variable_mismatch_init.rs:65:5: error: global variable 'mm' is initialized differently for 32-bit targets than for 64-bit targets
+reflection3264_variable_mismatch_init.rs:72:6: error: global variable 'nn' is initialized differently for 32-bit targets than for 64-bit targets
diff --git a/tests/F_root_11_ox/root_11_ox.rscript b/tests/F_root_11_ox/root_11_ox.rs
index 00278d2..00278d2 100644
--- a/tests/F_root_11_ox/root_11_ox.rscript
+++ b/tests/F_root_11_ox/root_11_ox.rs
diff --git a/tests/F_root_11_ox/stderr.txt.expect b/tests/F_root_11_ox/stderr.txt.expect
index 85b4cc6..1d3fc08 100644
--- a/tests/F_root_11_ox/stderr.txt.expect
+++ b/tests/F_root_11_ox/stderr.txt.expect
@@ -1 +1 @@
-root_11_ox.rscript:5:6: error: Compute kernel root() targeting SDK levels 11-13 may not skip parameters
+root_11_ox.rs:5:6: error: Compute kernel root() targeting SDK levels 11-13 may not skip parameters
diff --git a/tests/F_root_compute_int_in/root_compute_int_in.rscript b/tests/F_root_compute_int_in/root_compute_int_in.rs
index b2560b4..b2560b4 100644
--- a/tests/F_root_compute_int_in/root_compute_int_in.rscript
+++ b/tests/F_root_compute_int_in/root_compute_int_in.rs
diff --git a/tests/F_root_compute_int_in/stderr.txt.expect b/tests/F_root_compute_int_in/stderr.txt.expect
index 64be2e2..13925df 100644
--- a/tests/F_root_compute_int_in/stderr.txt.expect
+++ b/tests/F_root_compute_int_in/stderr.txt.expect
@@ -1,2 +1,2 @@
-root_compute_int_in.rscript:4:21: error: Compute kernel root() cannot have non-pointer parameters besides special parameters ('context', 'x', 'y', 'z'). Parameter 'in' is of type: 'const int'
-root_compute_int_in.rscript:4:6: error: Compute kernel root() must have at least one parameter for in or out
+root_compute_int_in.rs:4:21: error: Compute kernel root() cannot have non-pointer parameters besides special parameters ('context', 'x', 'y', 'z'). Parameter 'in' is of type: 'const int'
+root_compute_int_in.rs:4:6: error: Compute kernel root() must have at least one parameter for in or out
diff --git a/tests/F_root_compute_non_const_usrData/root_compute_non_const_usrData.rscript b/tests/F_root_compute_non_const_usrData/root_compute_non_const_usrData.rs
index 46dc642..46dc642 100644
--- a/tests/F_root_compute_non_const_usrData/root_compute_non_const_usrData.rscript
+++ b/tests/F_root_compute_non_const_usrData/root_compute_non_const_usrData.rs
diff --git a/tests/F_root_compute_non_const_usrData/stderr.txt.expect b/tests/F_root_compute_non_const_usrData/stderr.txt.expect
index 28e79fc..3974ed7 100644
--- a/tests/F_root_compute_non_const_usrData/stderr.txt.expect
+++ b/tests/F_root_compute_non_const_usrData/stderr.txt.expect
@@ -1 +1 @@
-root_compute_non_const_usrData.rscript:4:44: error: Compute kernel root() can only have one non-const pointer parameter. Parameters 'aout' and 'usrData' are both non-const.
+root_compute_non_const_usrData.rs:4:44: error: Compute kernel root() can only have one non-const pointer parameter. Parameters 'aout' and 'usrData' are both non-const.
diff --git a/tests/F_root_compute_non_ptr_usrData/root_compute_non_ptr_usrData.rscript b/tests/F_root_compute_non_ptr_usrData/root_compute_non_ptr_usrData.rs
index ce67f8a..ce67f8a 100644
--- a/tests/F_root_compute_non_ptr_usrData/root_compute_non_ptr_usrData.rscript
+++ b/tests/F_root_compute_non_ptr_usrData/root_compute_non_ptr_usrData.rs
diff --git a/tests/F_root_compute_non_ptr_usrData/stderr.txt.expect b/tests/F_root_compute_non_ptr_usrData/stderr.txt.expect
index b6b20bd..a113ce4 100644
--- a/tests/F_root_compute_non_ptr_usrData/stderr.txt.expect
+++ b/tests/F_root_compute_non_ptr_usrData/stderr.txt.expect
@@ -1 +1 @@
-root_compute_non_ptr_usrData.rscript:4:48: error: Compute kernel root() cannot have non-pointer parameters besides special parameters ('context', 'x', 'y', 'z'). Parameter 'usrData' is of type: 'const int'
+root_compute_non_ptr_usrData.rs:4:48: error: Compute kernel root() cannot have non-pointer parameters besides special parameters ('context', 'x', 'y', 'z'). Parameter 'usrData' is of type: 'const int'
diff --git a/tests/F_root_compute_non_uint32_t_xyzar/root_compute_non_uint32_t_xyzar.rscript b/tests/F_root_compute_non_uint32_t_xyzar/root_compute_non_uint32_t_xyzar.rs
index da45b86..da45b86 100644
--- a/tests/F_root_compute_non_uint32_t_xyzar/root_compute_non_uint32_t_xyzar.rscript
+++ b/tests/F_root_compute_non_uint32_t_xyzar/root_compute_non_uint32_t_xyzar.rs
diff --git a/tests/F_root_compute_non_uint32_t_xyzar/stderr.txt.expect b/tests/F_root_compute_non_uint32_t_xyzar/stderr.txt.expect
index f3aa166..9b4af29 100644
--- a/tests/F_root_compute_non_uint32_t_xyzar/stderr.txt.expect
+++ b/tests/F_root_compute_non_uint32_t_xyzar/stderr.txt.expect
@@ -1,6 +1,6 @@
-root_compute_non_uint32_t_xyzar.rscript:5:17: error: Special parameter 'x' must be of type 'int' or 'unsigned int'. It is of type 'short'.
-root_compute_non_uint32_t_xyzar.rscript:5:26: error: Special parameter 'y' must be of type 'int' or 'unsigned int'. It is of type 'float'.
-root_compute_non_uint32_t_xyzar.rscript:5:26: error: Special parameters 'x' and 'y' must be of the same type. 'x' is of type 'short' while 'y' is of type 'float'.
-root_compute_non_uint32_t_xyzar.rscript:5:36: error: Special parameter 'z' must be of type 'int' or 'unsigned int'. It is of type 'double'.
-root_compute_non_uint32_t_xyzar.rscript:5:36: error: Special parameters 'x' and 'z' must be of the same type. 'x' is of type 'short' while 'z' is of type 'double'.
-root_compute_non_uint32_t_xyzar.rscript:5:45: error: In compute kernel root(), parameter 'ar' cannot appear after any of the special parameters ('context', 'x', 'y', 'z').
+root_compute_non_uint32_t_xyzar.rs:5:17: error: Special parameter 'x' must be of type 'int' or 'unsigned int'. It is of type 'short'.
+root_compute_non_uint32_t_xyzar.rs:5:26: error: Special parameter 'y' must be of type 'int' or 'unsigned int'. It is of type 'float'.
+root_compute_non_uint32_t_xyzar.rs:5:26: error: Special parameters 'x' and 'y' must be of the same type. 'x' is of type 'short' while 'y' is of type 'float'.
+root_compute_non_uint32_t_xyzar.rs:5:36: error: Special parameter 'z' must be of type 'int' or 'unsigned int'. It is of type 'double'.
+root_compute_non_uint32_t_xyzar.rs:5:36: error: Special parameters 'x' and 'z' must be of the same type. 'x' is of type 'short' while 'z' is of type 'double'.
+root_compute_non_uint32_t_xyzar.rs:5:45: error: In compute kernel root(), parameter 'ar' cannot appear after any of the special parameters ('context', 'x', 'y', 'z').
diff --git a/tests/F_root_compute_non_uint32_t_xyzwar/root_compute_non_uint32_t_xyzwar.rscript b/tests/F_root_compute_non_uint32_t_xyzwar/root_compute_non_uint32_t_xyzwar.rs
index b3a00ad..b3a00ad 100644
--- a/tests/F_root_compute_non_uint32_t_xyzwar/root_compute_non_uint32_t_xyzwar.rscript
+++ b/tests/F_root_compute_non_uint32_t_xyzwar/root_compute_non_uint32_t_xyzwar.rs
diff --git a/tests/F_root_compute_non_uint32_t_xyzwar/stderr.txt.expect b/tests/F_root_compute_non_uint32_t_xyzwar/stderr.txt.expect
index 82cc533..9678fac 100644
--- a/tests/F_root_compute_non_uint32_t_xyzwar/stderr.txt.expect
+++ b/tests/F_root_compute_non_uint32_t_xyzwar/stderr.txt.expect
@@ -1,7 +1,7 @@
-root_compute_non_uint32_t_xyzwar.rscript:6:17: error: Special parameter 'x' must be of type 'int' or 'unsigned int'. It is of type 'short'.
-root_compute_non_uint32_t_xyzwar.rscript:6:26: error: Special parameter 'y' must be of type 'int' or 'unsigned int'. It is of type 'float'.
-root_compute_non_uint32_t_xyzwar.rscript:6:26: error: Special parameters 'x' and 'y' must be of the same type. 'x' is of type 'short' while 'y' is of type 'float'.
-root_compute_non_uint32_t_xyzwar.rscript:6:36: error: Special parameter 'z' must be of type 'int' or 'unsigned int'. It is of type 'double'.
-root_compute_non_uint32_t_xyzwar.rscript:6:36: error: Special parameters 'x' and 'z' must be of the same type. 'x' is of type 'short' while 'z' is of type 'double'.
-root_compute_non_uint32_t_xyzwar.rscript:6:44: error: In compute kernel root(), parameter 'w' cannot appear after any of the special parameters ('context', 'x', 'y', 'z').
-root_compute_non_uint32_t_xyzwar.rscript:6:53: error: In compute kernel root(), parameter 'ar' cannot appear after any of the special parameters ('context', 'x', 'y', 'z').
+root_compute_non_uint32_t_xyzwar.rs:6:17: error: Special parameter 'x' must be of type 'int' or 'unsigned int'. It is of type 'short'.
+root_compute_non_uint32_t_xyzwar.rs:6:26: error: Special parameter 'y' must be of type 'int' or 'unsigned int'. It is of type 'float'.
+root_compute_non_uint32_t_xyzwar.rs:6:26: error: Special parameters 'x' and 'y' must be of the same type. 'x' is of type 'short' while 'y' is of type 'float'.
+root_compute_non_uint32_t_xyzwar.rs:6:36: error: Special parameter 'z' must be of type 'int' or 'unsigned int'. It is of type 'double'.
+root_compute_non_uint32_t_xyzwar.rs:6:36: error: Special parameters 'x' and 'z' must be of the same type. 'x' is of type 'short' while 'z' is of type 'double'.
+root_compute_non_uint32_t_xyzwar.rs:6:44: error: In compute kernel root(), parameter 'w' cannot appear after any of the special parameters ('context', 'x', 'y', 'z').
+root_compute_non_uint32_t_xyzwar.rs:6:53: error: In compute kernel root(), parameter 'ar' cannot appear after any of the special parameters ('context', 'x', 'y', 'z').
diff --git a/tests/F_root_compute_non_void_ret/root_compute_non_void_ret.rscript b/tests/F_root_compute_non_void_ret/root_compute_non_void_ret.rs
index b1dd4fa..b1dd4fa 100644
--- a/tests/F_root_compute_non_void_ret/root_compute_non_void_ret.rscript
+++ b/tests/F_root_compute_non_void_ret/root_compute_non_void_ret.rs
diff --git a/tests/F_root_compute_non_void_ret/stderr.txt.expect b/tests/F_root_compute_non_void_ret/stderr.txt.expect
index c89bb97..a371330 100644
--- a/tests/F_root_compute_non_void_ret/stderr.txt.expect
+++ b/tests/F_root_compute_non_void_ret/stderr.txt.expect
@@ -1 +1 @@
-root_compute_non_void_ret.rscript:4:5: error: Compute kernel root() is required to return a void type
+root_compute_non_void_ret.rs:4:5: error: Compute kernel root() is required to return a void type
diff --git a/tests/F_root_compute_really_bad/root_compute_really_bad.rscript b/tests/F_root_compute_really_bad/root_compute_really_bad.rs
index 47d6b48..47d6b48 100644
--- a/tests/F_root_compute_really_bad/root_compute_really_bad.rscript
+++ b/tests/F_root_compute_really_bad/root_compute_really_bad.rs
diff --git a/tests/F_root_compute_really_bad/stderr.txt.expect b/tests/F_root_compute_really_bad/stderr.txt.expect
index 7236edb..7d10dcc 100644
--- a/tests/F_root_compute_really_bad/stderr.txt.expect
+++ b/tests/F_root_compute_really_bad/stderr.txt.expect
@@ -1,17 +1,17 @@
-root_compute_really_bad.rscript:4:5: error: Compute kernel root() is required to return a void type
-root_compute_really_bad.rscript:5:31: error: In compute kernel root(), special parameter 'x' must be defined before special parameter 'y'.
-root_compute_really_bad.rscript:6:19: error: In compute kernel root(), parameter 'extra1' cannot appear after any of the special parameters ('context', 'x', 'y', 'z').
-root_compute_really_bad.rscript:6:36: error: In compute kernel root(), parameter 'extra2' cannot appear after any of the special parameters ('context', 'x', 'y', 'z').
-root_compute_really_bad.rscript:4:14: error: Compute kernel root() cannot have non-pointer parameters besides special parameters ('context', 'x', 'y', 'z'). Parameter 'ain' is of type: 'int'
-root_compute_really_bad.rscript:4:23: error: Compute kernel root() cannot have non-pointer parameters besides special parameters ('context', 'x', 'y', 'z'). Parameter 'aout' is of type: 'int'
-root_compute_really_bad.rscript:4:33: error: Compute kernel root() cannot have non-pointer parameters besides special parameters ('context', 'x', 'y', 'z'). Parameter 'usrData' is of type: 'int'
-root_compute_really_bad.rscript:4:48: error: Compute kernel root() cannot have non-pointer parameters besides special parameters ('context', 'x', 'y', 'z'). Parameter 'x1' is of type: 'float'
-root_compute_really_bad.rscript:4:59: error: Compute kernel root() cannot have non-pointer parameters besides special parameters ('context', 'x', 'y', 'z'). Parameter 'y1' is of type: 'double'
-root_compute_really_bad.rscript:4:5: error: Compute kernel root() must have at least one parameter for in or out
-root_compute_really_bad.rscript:10:44: error: Compute kernel root2() can only have one non-const pointer parameter. Parameters 'ain' and 'usrData' are both non-const.
-root_compute_really_bad.rscript:10:66: error: Unexpected parameter 'x1' for compute kernel root2()
-root_compute_really_bad.rscript:11:26: error: Unexpected parameter 'y1' for compute kernel root2()
-root_compute_really_bad.rscript:16:38: error: In compute kernel root_kernel(), special parameter 'x' must be defined before special parameter 'y'.
-root_compute_really_bad.rscript:16:50: error: In compute kernel root_kernel(), parameter 'extra1' cannot appear after any of the special parameters ('context', 'x', 'y', 'z').
-root_compute_really_bad.rscript:16:67: error: In compute kernel root_kernel(), parameter 'extra2' cannot appear after any of the special parameters ('context', 'x', 'y', 'z').
-root_compute_really_bad.rscript:15:31: error: Compute kernel root_kernel() cannot have parameter 'aout' of pointer type: 'int *'
+root_compute_really_bad.rs:4:5: error: Compute kernel root() is required to return a void type
+root_compute_really_bad.rs:5:31: error: In compute kernel root(), special parameter 'x' must be defined before special parameter 'y'.
+root_compute_really_bad.rs:6:19: error: In compute kernel root(), parameter 'extra1' cannot appear after any of the special parameters ('context', 'x', 'y', 'z').
+root_compute_really_bad.rs:6:36: error: In compute kernel root(), parameter 'extra2' cannot appear after any of the special parameters ('context', 'x', 'y', 'z').
+root_compute_really_bad.rs:4:14: error: Compute kernel root() cannot have non-pointer parameters besides special parameters ('context', 'x', 'y', 'z'). Parameter 'ain' is of type: 'int'
+root_compute_really_bad.rs:4:23: error: Compute kernel root() cannot have non-pointer parameters besides special parameters ('context', 'x', 'y', 'z'). Parameter 'aout' is of type: 'int'
+root_compute_really_bad.rs:4:33: error: Compute kernel root() cannot have non-pointer parameters besides special parameters ('context', 'x', 'y', 'z'). Parameter 'usrData' is of type: 'int'
+root_compute_really_bad.rs:4:48: error: Compute kernel root() cannot have non-pointer parameters besides special parameters ('context', 'x', 'y', 'z'). Parameter 'x1' is of type: 'float'
+root_compute_really_bad.rs:4:59: error: Compute kernel root() cannot have non-pointer parameters besides special parameters ('context', 'x', 'y', 'z'). Parameter 'y1' is of type: 'double'
+root_compute_really_bad.rs:4:5: error: Compute kernel root() must have at least one parameter for in or out
+root_compute_really_bad.rs:10:44: error: Compute kernel root2() can only have one non-const pointer parameter. Parameters 'ain' and 'usrData' are both non-const.
+root_compute_really_bad.rs:10:66: error: Unexpected parameter 'x1' for compute kernel root2()
+root_compute_really_bad.rs:11:26: error: Unexpected parameter 'y1' for compute kernel root2()
+root_compute_really_bad.rs:16:38: error: In compute kernel root_kernel(), special parameter 'x' must be defined before special parameter 'y'.
+root_compute_really_bad.rs:16:50: error: In compute kernel root_kernel(), parameter 'extra1' cannot appear after any of the special parameters ('context', 'x', 'y', 'z').
+root_compute_really_bad.rs:16:67: error: In compute kernel root_kernel(), parameter 'extra2' cannot appear after any of the special parameters ('context', 'x', 'y', 'z').
+root_compute_really_bad.rs:15:31: error: Compute kernel root_kernel() cannot have parameter 'aout' of pointer type: 'int *'
diff --git a/tests/F_root_compute_too_many_args/root_compute_too_many_args.rscript b/tests/F_root_compute_too_many_args/root_compute_too_many_args.rs
index 52e917f..52e917f 100644
--- a/tests/F_root_compute_too_many_args/root_compute_too_many_args.rscript
+++ b/tests/F_root_compute_too_many_args/root_compute_too_many_args.rs
diff --git a/tests/F_root_compute_too_many_args/stderr.txt.expect b/tests/F_root_compute_too_many_args/stderr.txt.expect
index 5dca714..8afe8bc 100644
--- a/tests/F_root_compute_too_many_args/stderr.txt.expect
+++ b/tests/F_root_compute_too_many_args/stderr.txt.expect
@@ -1,2 +1,2 @@
-root_compute_too_many_args.rscript:6:20: error: In compute kernel root(), parameter 'extra1' cannot appear after any of the special parameters ('context', 'x', 'y', 'z').
-root_compute_too_many_args.rscript:6:37: error: In compute kernel root(), parameter 'extra2' cannot appear after any of the special parameters ('context', 'x', 'y', 'z').
+root_compute_too_many_args.rs:6:20: error: In compute kernel root(), parameter 'extra1' cannot appear after any of the special parameters ('context', 'x', 'y', 'z').
+root_compute_too_many_args.rs:6:37: error: In compute kernel root(), parameter 'extra2' cannot appear after any of the special parameters ('context', 'x', 'y', 'z').
diff --git a/tests/F_root_graphics/root_graphics.rscript b/tests/F_root_graphics/root_graphics.rs
index 970cc9a..970cc9a 100644
--- a/tests/F_root_graphics/root_graphics.rscript
+++ b/tests/F_root_graphics/root_graphics.rs
diff --git a/tests/F_root_graphics/stderr.txt.expect b/tests/F_root_graphics/stderr.txt.expect
index 2314c92..6b1e04d 100644
--- a/tests/F_root_graphics/stderr.txt.expect
+++ b/tests/F_root_graphics/stderr.txt.expect
@@ -1 +1 @@
-root_graphics.rscript:4:6: error: root() is required to return an int for graphics usage
+root_graphics.rs:4:6: error: root() is required to return an int for graphics usage
diff --git a/tests/F_root_graphics_13/root_graphics_13.rscript b/tests/F_root_graphics_13/root_graphics_13.rs
index c6c1fbd..c6c1fbd 100644
--- a/tests/F_root_graphics_13/root_graphics_13.rscript
+++ b/tests/F_root_graphics_13/root_graphics_13.rs
diff --git a/tests/F_root_graphics_13/stderr.txt.expect b/tests/F_root_graphics_13/stderr.txt.expect
index d8ead4c..74e9ee0 100644
--- a/tests/F_root_graphics_13/stderr.txt.expect
+++ b/tests/F_root_graphics_13/stderr.txt.expect
@@ -1 +1 @@
-root_graphics_13.rscript:5:23: error: invalid parameter type for legacy graphics root() function: 'unsigned int'
+root_graphics_13.rs:5:23: error: invalid parameter type for legacy graphics root() function: 'unsigned int'
diff --git a/tests/F_rs_fp_two_pragmas/rs_fp_two_pragmas.rscript b/tests/F_rs_fp_two_pragmas/rs_fp_two_pragmas.rs
index b07091c..b07091c 100644
--- a/tests/F_rs_fp_two_pragmas/rs_fp_two_pragmas.rscript
+++ b/tests/F_rs_fp_two_pragmas/rs_fp_two_pragmas.rs
diff --git a/tests/F_rs_fp_two_pragmas/stderr.txt.expect b/tests/F_rs_fp_two_pragmas/stderr.txt.expect
index 7edfd1e..6ad9b66 100644
--- a/tests/F_rs_fp_two_pragmas/stderr.txt.expect
+++ b/tests/F_rs_fp_two_pragmas/stderr.txt.expect
@@ -1 +1 @@
-rs_fp_two_pragmas.rscript:5:9: error: Multiple float precisions specified.  Encountered rs_fp_relaxed previously.
+rs_fp_two_pragmas.rs:5:9: error: Multiple float precisions specified.  Encountered rs_fp_relaxed previously.
diff --git a/tests/F_rs_prefix/rs_prefix.rscript b/tests/F_rs_prefix/rs_prefix.rs
index 99ae9aa..99ae9aa 100644
--- a/tests/F_rs_prefix/rs_prefix.rscript
+++ b/tests/F_rs_prefix/rs_prefix.rs
diff --git a/tests/F_rs_prefix/stderr.txt.expect b/tests/F_rs_prefix/stderr.txt.expect
index 54027a7..11d291b 100644
--- a/tests/F_rs_prefix/stderr.txt.expect
+++ b/tests/F_rs_prefix/stderr.txt.expect
@@ -1 +1 @@
-rs_prefix.rscript:4:6: error: invalid function name prefix, "rs" is reserved: 'rs_foo'
+rs_prefix.rs:4:6: error: invalid function name prefix, "rs" is reserved: 'rs_foo'
diff --git a/tests/F_set_target_api_10/set_target_api_10.rscript b/tests/F_set_target_api_10/set_target_api_10.rs
index 53bda21..53bda21 100644
--- a/tests/F_set_target_api_10/set_target_api_10.rscript
+++ b/tests/F_set_target_api_10/set_target_api_10.rs
diff --git a/tests/F_set_target_api_9000/set_target_api_9000.rscript b/tests/F_set_target_api_9000/set_target_api_9000.rs
index 26e40ac..26e40ac 100644
--- a/tests/F_set_target_api_9000/set_target_api_9000.rscript
+++ b/tests/F_set_target_api_9000/set_target_api_9000.rs
diff --git a/tests/F_set_target_api_foo/set_target_api_foo.rscript b/tests/F_set_target_api_foo/set_target_api_foo.rs
index e818a5a..e818a5a 100644
--- a/tests/F_set_target_api_foo/set_target_api_foo.rscript
+++ b/tests/F_set_target_api_foo/set_target_api_foo.rs
diff --git a/tests/F_struct_array_copy/stderr.txt.expect b/tests/F_struct_array_copy/stderr.txt.expect
index cad62da..48bc6d7 100644
--- a/tests/F_struct_array_copy/stderr.txt.expect
+++ b/tests/F_struct_array_copy/stderr.txt.expect
@@ -1 +1 @@
-struct_array_copy.rscript:35:8: error: Arrays of RS object types within structures cannot be copied
+struct_array_copy.rs:35:8: error: Arrays of RS object types within structures cannot be copied
diff --git a/tests/F_struct_array_copy/struct_array_copy.rscript b/tests/F_struct_array_copy/struct_array_copy.rs
index 1b55100..1b55100 100644
--- a/tests/F_struct_array_copy/struct_array_copy.rscript
+++ b/tests/F_struct_array_copy/struct_array_copy.rs
diff --git a/tests/F_struct_bitfield/stderr.txt.expect b/tests/F_struct_bitfield/stderr.txt.expect
index 0c994e4..d82e226 100644
--- a/tests/F_struct_bitfield/stderr.txt.expect
+++ b/tests/F_struct_bitfield/stderr.txt.expect
@@ -1 +1 @@
-struct_bitfield.rscript:5:9: error: bit fields are not able to be exported: 's.x'
+struct_bitfield.rs:5:9: error: bit fields are not able to be exported: 's.x'
diff --git a/tests/F_struct_bitfield/struct_bitfield.rscript b/tests/F_struct_bitfield/struct_bitfield.rs
index 95e3418..95e3418 100644
--- a/tests/F_struct_bitfield/struct_bitfield.rscript
+++ b/tests/F_struct_bitfield/struct_bitfield.rs
diff --git a/tests/F_struct_field_ptr_to_array/stderr.txt.expect b/tests/F_struct_field_ptr_to_array/stderr.txt.expect
index a41ca9c..60f409a 100644
--- a/tests/F_struct_field_ptr_to_array/stderr.txt.expect
+++ b/tests/F_struct_field_ptr_to_array/stderr.txt.expect
@@ -1 +1 @@
-struct_field_ptr_to_array.rscript:4:8: error: structures containing pointers cannot be used as the type of an exported global variable or the parameter to an exported function: 'foo'
+struct_field_ptr_to_array.rs:4:8: error: structures containing pointers cannot be used as the type of an exported global variable or the parameter to an exported function: 'foo'
diff --git a/tests/F_struct_field_ptr_to_array/struct_field_ptr_to_array.rscript b/tests/F_struct_field_ptr_to_array/struct_field_ptr_to_array.rs
index 5923f9a..5923f9a 100644
--- a/tests/F_struct_field_ptr_to_array/struct_field_ptr_to_array.rscript
+++ b/tests/F_struct_field_ptr_to_array/struct_field_ptr_to_array.rs
diff --git a/tests/F_struct_field_ptr_to_fn_noproto/stderr.txt.expect b/tests/F_struct_field_ptr_to_fn_noproto/stderr.txt.expect
index 9eca5e6..0825d98 100644
--- a/tests/F_struct_field_ptr_to_fn_noproto/stderr.txt.expect
+++ b/tests/F_struct_field_ptr_to_fn_noproto/stderr.txt.expect
@@ -1 +1 @@
-struct_field_ptr_to_fn_noproto.rscript:4:8: error: structures containing pointers cannot be used as the type of an exported global variable or the parameter to an exported function: 'foo'
+struct_field_ptr_to_fn_noproto.rs:4:8: error: structures containing pointers cannot be used as the type of an exported global variable or the parameter to an exported function: 'foo'
diff --git a/tests/F_struct_field_ptr_to_fn_noproto/struct_field_ptr_to_fn_noproto.rscript b/tests/F_struct_field_ptr_to_fn_noproto/struct_field_ptr_to_fn_noproto.rs
index e301a33..e301a33 100644
--- a/tests/F_struct_field_ptr_to_fn_noproto/struct_field_ptr_to_fn_noproto.rscript
+++ b/tests/F_struct_field_ptr_to_fn_noproto/struct_field_ptr_to_fn_noproto.rs
diff --git a/tests/F_struct_field_ptr_to_fn_proto/stderr.txt.expect b/tests/F_struct_field_ptr_to_fn_proto/stderr.txt.expect
index 76a2bb7..9030b2d 100644
--- a/tests/F_struct_field_ptr_to_fn_proto/stderr.txt.expect
+++ b/tests/F_struct_field_ptr_to_fn_proto/stderr.txt.expect
@@ -1 +1 @@
-struct_field_ptr_to_fn_proto.rscript:4:8: error: structures containing pointers cannot be used as the type of an exported global variable or the parameter to an exported function: 'foo'
+struct_field_ptr_to_fn_proto.rs:4:8: error: structures containing pointers cannot be used as the type of an exported global variable or the parameter to an exported function: 'foo'
diff --git a/tests/F_struct_field_ptr_to_fn_proto/struct_field_ptr_to_fn_proto.rscript b/tests/F_struct_field_ptr_to_fn_proto/struct_field_ptr_to_fn_proto.rs
index dcccd57..dcccd57 100644
--- a/tests/F_struct_field_ptr_to_fn_proto/struct_field_ptr_to_fn_proto.rscript
+++ b/tests/F_struct_field_ptr_to_fn_proto/struct_field_ptr_to_fn_proto.rs
diff --git a/tests/F_struct_float3_array/stderr.txt.expect b/tests/F_struct_float3_array/stderr.txt.expect
index 44e86c4..1eac9bd 100644
--- a/tests/F_struct_float3_array/stderr.txt.expect
+++ b/tests/F_struct_float3_array/stderr.txt.expect
@@ -1 +1 @@
-struct_float3_array.rscript:4:8: error: arrays of width 3 vector types cannot be exported: 'float3_array'
+struct_float3_array.rs:4:8: error: arrays of width 3 vector types cannot be exported: 'float3_array'
diff --git a/tests/F_struct_float3_array/struct_float3_array.rscript b/tests/F_struct_float3_array/struct_float3_array.rs
index 58d6d64..58d6d64 100644
--- a/tests/F_struct_float3_array/struct_float3_array.rscript
+++ b/tests/F_struct_float3_array/struct_float3_array.rs
diff --git a/tests/F_struct_ptr/stderr.txt.expect b/tests/F_struct_ptr/stderr.txt.expect
index cbeb838..a0bfee0 100644
--- a/tests/F_struct_ptr/stderr.txt.expect
+++ b/tests/F_struct_ptr/stderr.txt.expect
@@ -1 +1 @@
-struct_ptr.rscript:4:8: error: struct is not defined in this module
+struct_ptr.rs:4:8: error: struct is not defined in this module
diff --git a/tests/F_struct_ptr/struct_ptr.rscript b/tests/F_struct_ptr/struct_ptr.rs
index 15eee65..15eee65 100644
--- a/tests/F_struct_ptr/struct_ptr.rscript
+++ b/tests/F_struct_ptr/struct_ptr.rs
diff --git a/tests/F_too_many_inputs/stderr.txt.expect b/tests/F_too_many_inputs/stderr.txt.expect
index 335453d..aec9fdc 100644
--- a/tests/F_too_many_inputs/stderr.txt.expect
+++ b/tests/F_too_many_inputs/stderr.txt.expect
@@ -1 +1 @@
-too_many_inputs.rscript:9:95: error: Invalid parameter 'in8' for compute kernel bad(). Kernels targeting SDK levels 23+ may not use more than 8 input parameters.
+too_many_inputs.rs:9:95: error: Invalid parameter 'in8' for compute kernel bad(). Kernels targeting SDK levels 23+ may not use more than 8 input parameters.
diff --git a/tests/F_too_many_inputs/too_many_inputs.rscript b/tests/F_too_many_inputs/too_many_inputs.rs
index 248ee4f..248ee4f 100644
--- a/tests/F_too_many_inputs/too_many_inputs.rscript
+++ b/tests/F_too_many_inputs/too_many_inputs.rs
diff --git a/tests/F_union/stderr.txt.expect b/tests/F_union/stderr.txt.expect
index ba7c663..2bf177d 100644
--- a/tests/F_union/stderr.txt.expect
+++ b/tests/F_union/stderr.txt.expect
@@ -1,3 +1,3 @@
-union.rscript:4:7: error: unions cannot be exported: 'u'
-union.rscript:9:14: error: unions containing RS object types are not allowed
-union.rscript:16:11: error: unions containing RS object types are not allowed
+union.rs:4:7: error: unions cannot be exported: 'u'
+union.rs:9:14: error: unions containing RS object types are not allowed
+union.rs:16:11: error: unions containing RS object types are not allowed
diff --git a/tests/F_union/union.rscript b/tests/F_union/union.rs
index a6fa48d..a6fa48d 100644
--- a/tests/F_union/union.rscript
+++ b/tests/F_union/union.rs
diff --git a/tests/F_unknown_function/stderr.txt.expect b/tests/F_unknown_function/stderr.txt.expect
index 2a42af9..c8329e3 100644
--- a/tests/F_unknown_function/stderr.txt.expect
+++ b/tests/F_unknown_function/stderr.txt.expect
@@ -1 +1 @@
-unknown_function.rscript:6:5: error: implicit declaration of function 'bar' is invalid in C99
+unknown_function.rs:6:5: error: implicit declaration of function 'bar' is invalid in C99
diff --git a/tests/F_unknown_function/unknown_function.rscript b/tests/F_unknown_function/unknown_function.rs
index 8127993..8127993 100644
--- a/tests/F_unknown_function/unknown_function.rscript
+++ b/tests/F_unknown_function/unknown_function.rs
diff --git a/tests/F_unknown_function/zzz.rscript b/tests/F_unknown_function/zzz.rs
index 54929dc..54929dc 100644
--- a/tests/F_unknown_function/zzz.rscript
+++ b/tests/F_unknown_function/zzz.rs
diff --git a/tests/F_v15_non_root_kernel/stderr.txt.expect b/tests/F_v15_non_root_kernel/stderr.txt.expect
index 658d002..fe38dc8 100644
--- a/tests/F_v15_non_root_kernel/stderr.txt.expect
+++ b/tests/F_v15_non_root_kernel/stderr.txt.expect
@@ -1 +1 @@
-v15_non_root_kernel.rscript:5:6: error: Non-root compute kernel foo() is not supported in SDK levels 11-15
+v15_non_root_kernel.rs:5:6: error: Non-root compute kernel foo() is not supported in SDK levels 11-15
diff --git a/tests/F_v15_non_root_kernel/v15_non_root_kernel.rscript b/tests/F_v15_non_root_kernel/v15_non_root_kernel.rs
index d8b903e..d8b903e 100644
--- a/tests/F_v15_non_root_kernel/v15_non_root_kernel.rscript
+++ b/tests/F_v15_non_root_kernel/v15_non_root_kernel.rs
diff --git a/tests/F_vector_cast/stderr.txt.expect b/tests/F_vector_cast/stderr.txt.expect
index 52c2aec..032948d 100644
--- a/tests/F_vector_cast/stderr.txt.expect
+++ b/tests/F_vector_cast/stderr.txt.expect
@@ -1,6 +1,6 @@
-vector_cast.rscript:8:11: error: cannot convert between vector values of different size ('float2' (vector of 2 'float' values) and 'int2' (vector of 2 'int' values))
-vector_cast.rscript:15:11: error: cannot convert between vector values of different size ('int3' (vector of 3 'int' values) and 'float3' (vector of 3 'float' values))
-vector_cast.rscript:7:9: error: invalid vector cast
-vector_cast.rscript:14:9: error: invalid vector cast
-vector_cast.rscript:21:9: error: invalid vector cast
-vector_cast.rscript:31:13: error: invalid vector cast
+vector_cast.rs:8:11: error: cannot convert between vector values of different size ('float2' (vector of 2 'float' values) and 'int2' (vector of 2 'int' values))
+vector_cast.rs:15:11: error: cannot convert between vector values of different size ('int3' (vector of 3 'int' values) and 'float3' (vector of 3 'float' values))
+vector_cast.rs:7:9: error: invalid vector cast
+vector_cast.rs:14:9: error: invalid vector cast
+vector_cast.rs:21:9: error: invalid vector cast
+vector_cast.rs:31:13: error: invalid vector cast
diff --git a/tests/F_vector_cast/vector_cast.rscript b/tests/F_vector_cast/vector_cast.rs
index fa49d97..fa49d97 100644
--- a/tests/F_vector_cast/vector_cast.rscript
+++ b/tests/F_vector_cast/vector_cast.rs
diff --git a/tests/F_void_ptr/stderr.txt.expect b/tests/F_void_ptr/stderr.txt.expect
index b9f22d2..7958827 100644
--- a/tests/F_void_ptr/stderr.txt.expect
+++ b/tests/F_void_ptr/stderr.txt.expect
@@ -1 +1 @@
-void_ptr.rscript:4:7: error: void pointers cannot be exported: 'v'
+void_ptr.rs:4:7: error: void pointers cannot be exported: 'v'
diff --git a/tests/F_void_ptr/void_ptr.rscript b/tests/F_void_ptr/void_ptr.rs
index 1fc1737..1fc1737 100644
--- a/tests/F_void_ptr/void_ptr.rscript
+++ b/tests/F_void_ptr/void_ptr.rs
diff --git a/tests/F_warnings_as_error/deprecated.rscript b/tests/F_warnings_as_error/deprecated.rs
index b06f6af..b06f6af 100644
--- a/tests/F_warnings_as_error/deprecated.rscript
+++ b/tests/F_warnings_as_error/deprecated.rs
diff --git a/tests/F_warnings_as_error/stderr.txt.expect b/tests/F_warnings_as_error/stderr.txt.expect
index fd4b3ac..7af87a8 100644
--- a/tests/F_warnings_as_error/stderr.txt.expect
+++ b/tests/F_warnings_as_error/stderr.txt.expect
@@ -1,4 +1,4 @@
-deprecated.rscript:9:11: error: implicit declaration of function 'func0' is invalid in C99
-deprecated.rscript:9:11: note: did you mean 'func1'?
-deprecated.rscript:8:13: note: 'func1' declared here
-deprecated.rscript:15:1: error: control reaches end of non-void function
+deprecated.rs:9:11: error: implicit declaration of function 'func0' is invalid in C99
+deprecated.rs:9:11: note: did you mean 'func1'?
+deprecated.rs:8:13: note: 'func1' declared here
+deprecated.rs:15:1: error: control reaches end of non-void function
diff --git a/tests/F_z_wrong_api/stderr.txt.expect b/tests/F_z_wrong_api/stderr.txt.expect
index 4bfe3ca..89f2d18 100644
--- a/tests/F_z_wrong_api/stderr.txt.expect
+++ b/tests/F_z_wrong_api/stderr.txt.expect
@@ -1 +1 @@
-z_wrong_api.rscript:5:60: error: compute kernel bad() targeting SDK levels 11-22 may not use special parameter 'z'.
+z_wrong_api.rs:5:60: error: compute kernel bad() targeting SDK levels 11-22 may not use special parameter 'z'.
diff --git a/tests/F_z_wrong_api/z_wrong_api.rscript b/tests/F_z_wrong_api/z_wrong_api.rs
index 42b08a2..42b08a2 100644
--- a/tests/F_z_wrong_api/z_wrong_api.rscript
+++ b/tests/F_z_wrong_api/z_wrong_api.rs
diff --git a/tests/P_all_api_11/all11.rscript b/tests/P_all_api_11/all11.rs
index 2c0dc0e..2c0dc0e 100644
--- a/tests/P_all_api_11/all11.rscript
+++ b/tests/P_all_api_11/all11.rs
diff --git a/tests/P_all_api_12/all12.rscript b/tests/P_all_api_12/all12.rs
index 98268c9..98268c9 100644
--- a/tests/P_all_api_12/all12.rscript
+++ b/tests/P_all_api_12/all12.rs
diff --git a/tests/P_all_api_13/all13.rscript b/tests/P_all_api_13/all13.rs
index 0e14e1a..0e14e1a 100644
--- a/tests/P_all_api_13/all13.rscript
+++ b/tests/P_all_api_13/all13.rs
diff --git a/tests/P_all_api_14/all14.rscript b/tests/P_all_api_14/all14.rs
index 9e69767..9e69767 100644
--- a/tests/P_all_api_14/all14.rscript
+++ b/tests/P_all_api_14/all14.rs
diff --git a/tests/P_all_api_15/all15.rscript b/tests/P_all_api_15/all15.rs
index 1ce2798..1ce2798 100644
--- a/tests/P_all_api_15/all15.rscript
+++ b/tests/P_all_api_15/all15.rs
diff --git a/tests/P_all_api_16/all16.rscript b/tests/P_all_api_16/all16.rs
index b6b7954..b6b7954 100644
--- a/tests/P_all_api_16/all16.rscript
+++ b/tests/P_all_api_16/all16.rs
diff --git a/tests/P_all_api_17/all17.rscript b/tests/P_all_api_17/all17.rs
index be84dd1..be84dd1 100644
--- a/tests/P_all_api_17/all17.rscript
+++ b/tests/P_all_api_17/all17.rs
diff --git a/tests/P_all_api_18/all18.rscript b/tests/P_all_api_18/all18.rs
index d07107e..d07107e 100644
--- a/tests/P_all_api_18/all18.rscript
+++ b/tests/P_all_api_18/all18.rs
diff --git a/tests/P_all_api_19/all19.rscript b/tests/P_all_api_19/all19.rs
index da44c86..da44c86 100644
--- a/tests/P_all_api_19/all19.rscript
+++ b/tests/P_all_api_19/all19.rs
diff --git a/tests/P_all_api_20/all20.rscript b/tests/P_all_api_20/all20.rs
index d3a53e4..d3a53e4 100644
--- a/tests/P_all_api_20/all20.rscript
+++ b/tests/P_all_api_20/all20.rs
diff --git a/tests/P_all_api_21/all21.rscript b/tests/P_all_api_21/all21.rs
index cd0b0c8..cd0b0c8 100644
--- a/tests/P_all_api_21/all21.rscript
+++ b/tests/P_all_api_21/all21.rs
diff --git a/tests/P_all_api_22/all22.rscript b/tests/P_all_api_22/all22.rs
index 9d20f7b..9d20f7b 100644
--- a/tests/P_all_api_22/all22.rscript
+++ b/tests/P_all_api_22/all22.rs
diff --git a/tests/P_all_api_23/all23.rscript b/tests/P_all_api_23/all23.rs
index cabfa44..cabfa44 100644
--- a/tests/P_all_api_23/all23.rscript
+++ b/tests/P_all_api_23/all23.rs
diff --git a/tests/P_all_api_24/all24.rscript b/tests/P_all_api_24/all24.rs
index 408185d..408185d 100644
--- a/tests/P_all_api_24/all24.rscript
+++ b/tests/P_all_api_24/all24.rs
diff --git a/tests/P_alloc_in_struct/alloc_in_struct.rscript b/tests/P_alloc_in_struct/alloc_in_struct.rs
index eaefd87..eaefd87 100644
--- a/tests/P_alloc_in_struct/alloc_in_struct.rscript
+++ b/tests/P_alloc_in_struct/alloc_in_struct.rs
diff --git a/tests/P_array_cpp/array.rscript b/tests/P_array_cpp/array.rs
index 9a36c6d..9a36c6d 100644
--- a/tests/P_array_cpp/array.rscript
+++ b/tests/P_array_cpp/array.rs
diff --git a/tests/P_array_init/array_init.rscript b/tests/P_array_init/array_init.rs
index 2a4fe0f..2a4fe0f 100644
--- a/tests/P_array_init/array_init.rscript
+++ b/tests/P_array_init/array_init.rs
diff --git a/tests/P_array_init/stderr.txt.expect b/tests/P_array_init/stderr.txt.expect
index e0dd67e..387a51d 100644
--- a/tests/P_array_init/stderr.txt.expect
+++ b/tests/P_array_init/stderr.txt.expect
@@ -1 +1 @@
-array_init.rscript:22:6: warning: tentative array definition assumed to have one element
+array_init.rs:22:6: warning: tentative array definition assumed to have one element
diff --git a/tests/P_compute/compute.rscript b/tests/P_compute/compute.rs
index 9ed58b8..9ed58b8 100644
--- a/tests/P_compute/compute.rscript
+++ b/tests/P_compute/compute.rs
diff --git a/tests/P_constant/constant.rscript b/tests/P_constant/constant.rs
index 4457e37..4457e37 100644
--- a/tests/P_constant/constant.rscript
+++ b/tests/P_constant/constant.rs
diff --git a/tests/P_constant/stderr.txt.expect b/tests/P_constant/stderr.txt.expect
index a8c0803..3728bee 100644
--- a/tests/P_constant/stderr.txt.expect
+++ b/tests/P_constant/stderr.txt.expect
@@ -1 +1 @@
-constant.rscript:21:18: warning: 'extern' variable has an initializer
+constant.rs:21:18: warning: 'extern' variable has an initializer
diff --git a/tests/P_debug/debug.rscript b/tests/P_debug/debug.rs
index 69ede2a..69ede2a 100644
--- a/tests/P_debug/debug.rscript
+++ b/tests/P_debug/debug.rs
diff --git a/tests/P_dummy_root/dummy_root.rscript b/tests/P_dummy_root/dummy_root.rs
index 7731d94..7731d94 100644
--- a/tests/P_dummy_root/dummy_root.rscript
+++ b/tests/P_dummy_root/dummy_root.rs
diff --git a/tests/P_export_types/export_types.rscript b/tests/P_export_types/export_types.rs
index 8c725f1..8c725f1 100644
--- a/tests/P_export_types/export_types.rscript
+++ b/tests/P_export_types/export_types.rs
diff --git a/tests/P_export_types_v20/export_types.rscript b/tests/P_export_types_v20/export_types.rs
index 61d55e1..61d55e1 100644
--- a/tests/P_export_types_v20/export_types.rscript
+++ b/tests/P_export_types_v20/export_types.rs
diff --git a/tests/P_extern_const/extern_const.rscript b/tests/P_extern_const/extern_const.rs
index e80906a..e80906a 100644
--- a/tests/P_extern_const/extern_const.rscript
+++ b/tests/P_extern_const/extern_const.rs
diff --git a/tests/P_float3/float3.rscript b/tests/P_float3/float3.rs
index 1255992..1255992 100644
--- a/tests/P_float3/float3.rscript
+++ b/tests/P_float3/float3.rs
diff --git a/tests/P_foreach/foreach.rscript b/tests/P_foreach/foreach.rs
index c23fb81..c23fb81 100644
--- a/tests/P_foreach/foreach.rscript
+++ b/tests/P_foreach/foreach.rs
diff --git a/tests/P_foreach_multi/foreach_multi.rscript b/tests/P_foreach_multi/foreach_multi.rs
index e8a597e..e8a597e 100644
--- a/tests/P_foreach_multi/foreach_multi.rscript
+++ b/tests/P_foreach_multi/foreach_multi.rs
diff --git a/tests/P_foreach_options/foreach_options.rscript b/tests/P_foreach_options/foreach_options.rs
index cb15b73..cb15b73 100644
--- a/tests/P_foreach_options/foreach_options.rscript
+++ b/tests/P_foreach_options/foreach_options.rs
diff --git a/tests/P_fp16/fp16.rscript b/tests/P_fp16/fp16.rs
index 074c988..074c988 100644
--- a/tests/P_fp16/fp16.rscript
+++ b/tests/P_fp16/fp16.rs
diff --git a/tests/P_ignore_warnings/ignore_warnings.rscript b/tests/P_ignore_warnings/ignore_warnings.rs
index 76704d6..76704d6 100644
--- a/tests/P_ignore_warnings/ignore_warnings.rscript
+++ b/tests/P_ignore_warnings/ignore_warnings.rs
diff --git a/tests/P_invoke_half_parameter/invoke_half_parameter.rscript b/tests/P_invoke_half_parameter/invoke_half_parameter.rs
index f68f742..f68f742 100644
--- a/tests/P_invoke_half_parameter/invoke_half_parameter.rscript
+++ b/tests/P_invoke_half_parameter/invoke_half_parameter.rs
diff --git a/tests/P_kernel/kernel.rscript b/tests/P_kernel/kernel.rs
index fa962dd..fa962dd 100644
--- a/tests/P_kernel/kernel.rscript
+++ b/tests/P_kernel/kernel.rs
diff --git a/tests/P_kernel_cpp/kernel_cpp.rscript b/tests/P_kernel_cpp/kernel_cpp.rs
index 9e582b3..9e582b3 100644
--- a/tests/P_kernel_cpp/kernel_cpp.rscript
+++ b/tests/P_kernel_cpp/kernel_cpp.rs
diff --git a/tests/P_kernel_multi_in/kernel_multi_in.rscript b/tests/P_kernel_multi_in/kernel_multi_in.rs
index f38757b..f38757b 100644
--- a/tests/P_kernel_multi_in/kernel_multi_in.rscript
+++ b/tests/P_kernel_multi_in/kernel_multi_in.rs
diff --git a/tests/P_kernel_noalloc/kernel_noalloc.rscript b/tests/P_kernel_noalloc/kernel_noalloc.rs
index ab64847..ab64847 100644
--- a/tests/P_kernel_noalloc/kernel_noalloc.rscript
+++ b/tests/P_kernel_noalloc/kernel_noalloc.rs
diff --git a/tests/P_kernel_noalloc_noarg/kernel_noalloc_noarg.rscript b/tests/P_kernel_noalloc_noarg/kernel_noalloc_noarg.rs
index e1ccb09..e1ccb09 100644
--- a/tests/P_kernel_noalloc_noarg/kernel_noalloc_noarg.rscript
+++ b/tests/P_kernel_noalloc_noarg/kernel_noalloc_noarg.rs
diff --git a/tests/P_license/license.rscript b/tests/P_license/license.rs
index 0ee1ae6..0ee1ae6 100644
--- a/tests/P_license/license.rscript
+++ b/tests/P_license/license.rs
diff --git a/tests/P_local_ref_after_return/local_ref_after_return.rscript b/tests/P_local_ref_after_return/local_ref_after_return.rs
index 977fab7..977fab7 100644
--- a/tests/P_local_ref_after_return/local_ref_after_return.rscript
+++ b/tests/P_local_ref_after_return/local_ref_after_return.rs
diff --git a/tests/P_long64/long64.rscript b/tests/P_long64/long64.rs
index f530aa0..f530aa0 100644
--- a/tests/P_long64/long64.rscript
+++ b/tests/P_long64/long64.rs
diff --git a/tests/P_math_fp/math_fp.rscript b/tests/P_math_fp/math_fp.rs
index 0bedd6e..0bedd6e 100644
--- a/tests/P_math_fp/math_fp.rscript
+++ b/tests/P_math_fp/math_fp.rs
diff --git a/tests/P_math_int/math_int.rscript b/tests/P_math_int/math_int.rs
index 59ef57f..59ef57f 100644
--- a/tests/P_math_int/math_int.rscript
+++ b/tests/P_math_int/math_int.rs
diff --git a/tests/P_matrix_cpp/matrix.rscript b/tests/P_matrix_cpp/matrix.rs
index 4847b54..4847b54 100644
--- a/tests/P_matrix_cpp/matrix.rscript
+++ b/tests/P_matrix_cpp/matrix.rs
diff --git a/tests/P_multi_in_target_version/multi_in_target_version.rscript b/tests/P_multi_in_target_version/multi_in_target_version.rs
index 2128778..2128778 100644
--- a/tests/P_multi_in_target_version/multi_in_target_version.rscript
+++ b/tests/P_multi_in_target_version/multi_in_target_version.rs
diff --git a/tests/P_odr_array/def1.rscript b/tests/P_odr_array/def1.rs
index 501a96b..501a96b 100644
--- a/tests/P_odr_array/def1.rscript
+++ b/tests/P_odr_array/def1.rs
diff --git a/tests/P_odr_array/def2.rscript b/tests/P_odr_array/def2.rs
index 501a96b..501a96b 100644
--- a/tests/P_odr_array/def2.rscript
+++ b/tests/P_odr_array/def2.rs
diff --git a/tests/P_odr_nested_records_1/odr1.rscript b/tests/P_odr_nested_records_1/odr1.rs
index 4b86c4e..4b86c4e 100644
--- a/tests/P_odr_nested_records_1/odr1.rscript
+++ b/tests/P_odr_nested_records_1/odr1.rs
diff --git a/tests/P_odr_nested_records_1/odr2.rscript b/tests/P_odr_nested_records_1/odr2.rs
index 4b86c4e..4b86c4e 100644
--- a/tests/P_odr_nested_records_1/odr2.rscript
+++ b/tests/P_odr_nested_records_1/odr2.rs
diff --git a/tests/P_odr_nested_records_2/odr1.rscript b/tests/P_odr_nested_records_2/odr1.rs
index 00fbe2e..00fbe2e 100644
--- a/tests/P_odr_nested_records_2/odr1.rscript
+++ b/tests/P_odr_nested_records_2/odr1.rs
diff --git a/tests/P_odr_nested_records_2/odr2.rscript b/tests/P_odr_nested_records_2/odr2.rs
index 769060d..769060d 100644
--- a/tests/P_odr_nested_records_2/odr2.rscript
+++ b/tests/P_odr_nested_records_2/odr2.rs
diff --git a/tests/P_odr_nested_records_3/odr1.rscript b/tests/P_odr_nested_records_3/odr1.rs
index 0edef03..0edef03 100644
--- a/tests/P_odr_nested_records_3/odr1.rscript
+++ b/tests/P_odr_nested_records_3/odr1.rs
diff --git a/tests/P_odr_nested_records_3/odr2.rscript b/tests/P_odr_nested_records_3/odr2.rs
index 00d0f0f..00d0f0f 100644
--- a/tests/P_odr_nested_records_3/odr2.rscript
+++ b/tests/P_odr_nested_records_3/odr2.rs
diff --git a/tests/P_one_definition_rule/def1.rscript b/tests/P_one_definition_rule/def1.rs
index 1e0cebe..1e0cebe 100644
--- a/tests/P_one_definition_rule/def1.rscript
+++ b/tests/P_one_definition_rule/def1.rs
diff --git a/tests/P_one_definition_rule/def2.rscript b/tests/P_one_definition_rule/def2.rs
index 1e0cebe..1e0cebe 100644
--- a/tests/P_one_definition_rule/def2.rscript
+++ b/tests/P_one_definition_rule/def2.rs
diff --git a/tests/P_ooo_compute/ooo_compute.rscript b/tests/P_ooo_compute/ooo_compute.rs
index 961bcd2..961bcd2 100644
--- a/tests/P_ooo_compute/ooo_compute.rscript
+++ b/tests/P_ooo_compute/ooo_compute.rs
diff --git a/tests/P_overload/overload.rscript b/tests/P_overload/overload.rs
index ba3be6e..ba3be6e 100644
--- a/tests/P_overload/overload.rscript
+++ b/tests/P_overload/overload.rs
diff --git a/tests/P_redefine_RS_VERSION/redefine_RS_VERSION.rscript b/tests/P_redefine_RS_VERSION/redefine_RS_VERSION.rs
index 08f96ab..08f96ab 100644
--- a/tests/P_redefine_RS_VERSION/redefine_RS_VERSION.rscript
+++ b/tests/P_redefine_RS_VERSION/redefine_RS_VERSION.rs
diff --git a/tests/P_redefine_RS_VERSION/stderr.txt.expect b/tests/P_redefine_RS_VERSION/stderr.txt.expect
index e2b93c9..7af3b00 100644
--- a/tests/P_redefine_RS_VERSION/stderr.txt.expect
+++ b/tests/P_redefine_RS_VERSION/stderr.txt.expect
@@ -1,2 +1,2 @@
-redefine_RS_VERSION.rscript:4:9: warning: 'RS_VERSION' macro redefined
+redefine_RS_VERSION.rs:4:9: warning: 'RS_VERSION' macro redefined
 <built-in>:1:9: note: previous definition is here
diff --git a/tests/P_reduce_general_accumulator/ScriptC_reduce_general_accumulator.java.expect b/tests/P_reduce_general_accumulator/ScriptC_reduce_general_accumulator.java.expect
index e4ec85a..e742b69 100644
--- a/tests/P_reduce_general_accumulator/ScriptC_reduce_general_accumulator.java.expect
+++ b/tests/P_reduce_general_accumulator/ScriptC_reduce_general_accumulator.java.expect
@@ -16,7 +16,7 @@
 
 /*
  * This file is auto-generated. DO NOT MODIFY!
- * The source Renderscript file: reduce_general_accumulator.rscript
+ * The source Renderscript file: reduce_general_accumulator.rs
  */
 
 package accumulator;
diff --git a/tests/P_reduce_general_accumulator/reduce_general_accumulator.rscript b/tests/P_reduce_general_accumulator/reduce_general_accumulator.rs
index cec196d..cec196d 100644
--- a/tests/P_reduce_general_accumulator/reduce_general_accumulator.rscript
+++ b/tests/P_reduce_general_accumulator/reduce_general_accumulator.rs
diff --git a/tests/P_reduce_general_duplicate_array/ScriptC_reduce_general_duplicate_array.java.expect b/tests/P_reduce_general_duplicate_array/ScriptC_reduce_general_duplicate_array.java.expect
index d49da09..f582ddc 100644
--- a/tests/P_reduce_general_duplicate_array/ScriptC_reduce_general_duplicate_array.java.expect
+++ b/tests/P_reduce_general_duplicate_array/ScriptC_reduce_general_duplicate_array.java.expect
@@ -16,7 +16,7 @@
 
 /*
  * This file is auto-generated. DO NOT MODIFY!
- * The source Renderscript file: reduce_general_duplicate_array.rscript
+ * The source Renderscript file: reduce_general_duplicate_array.rs
  */
 
 package array;
diff --git a/tests/P_reduce_general_duplicate_array/reduce_general_duplicate_array.rscript b/tests/P_reduce_general_duplicate_array/reduce_general_duplicate_array.rs
index 9c806a6..9c806a6 100644
--- a/tests/P_reduce_general_duplicate_array/reduce_general_duplicate_array.rscript
+++ b/tests/P_reduce_general_duplicate_array/reduce_general_duplicate_array.rs
diff --git a/tests/P_reduce_general_examples/ScriptC_reduce_general_examples.java.expect b/tests/P_reduce_general_examples/ScriptC_reduce_general_examples.java.expect
index fc487c1..129b785 100644
--- a/tests/P_reduce_general_examples/ScriptC_reduce_general_examples.java.expect
+++ b/tests/P_reduce_general_examples/ScriptC_reduce_general_examples.java.expect
@@ -16,7 +16,7 @@
 
 /*
  * This file is auto-generated. DO NOT MODIFY!
- * The source Renderscript file: reduce_general_examples.rscript
+ * The source Renderscript file: reduce_general_examples.rs
  */
 
 package examples;
diff --git a/tests/P_reduce_general_examples/reduce_general_examples.rscript b/tests/P_reduce_general_examples/reduce_general_examples.rs
index 17b6a27..17b6a27 100644
--- a/tests/P_reduce_general_examples/reduce_general_examples.rscript
+++ b/tests/P_reduce_general_examples/reduce_general_examples.rs
diff --git a/tests/P_reduce_general_examples_backward/ScriptC_reduce_general_examples_backward.java.expect b/tests/P_reduce_general_examples_backward/ScriptC_reduce_general_examples_backward.java.expect
index 7a56004..49c5ede 100644
--- a/tests/P_reduce_general_examples_backward/ScriptC_reduce_general_examples_backward.java.expect
+++ b/tests/P_reduce_general_examples_backward/ScriptC_reduce_general_examples_backward.java.expect
@@ -16,7 +16,7 @@
 
 /*
  * This file is auto-generated. DO NOT MODIFY!
- * The source Renderscript file: reduce_general_examples_backward.rscript
+ * The source Renderscript file: reduce_general_examples_backward.rs
  */
 
 package examples;
diff --git a/tests/P_reduce_general_examples_backward/reduce_general_examples_backward.rscript b/tests/P_reduce_general_examples_backward/reduce_general_examples_backward.rs
index 00d3323..00d3323 100644
--- a/tests/P_reduce_general_examples_backward/reduce_general_examples_backward.rscript
+++ b/tests/P_reduce_general_examples_backward/reduce_general_examples_backward.rs
diff --git a/tests/P_reduce_general_examples_explicit/ScriptC_reduce_general_examples_explicit.java.expect b/tests/P_reduce_general_examples_explicit/ScriptC_reduce_general_examples_explicit.java.expect
index f53ada1..adcba0c 100644
--- a/tests/P_reduce_general_examples_explicit/ScriptC_reduce_general_examples_explicit.java.expect
+++ b/tests/P_reduce_general_examples_explicit/ScriptC_reduce_general_examples_explicit.java.expect
@@ -16,7 +16,7 @@
 
 /*
  * This file is auto-generated. DO NOT MODIFY!
- * The source Renderscript file: reduce_general_examples_explicit.rscript
+ * The source Renderscript file: reduce_general_examples_explicit.rs
  */
 
 package examples;
diff --git a/tests/P_reduce_general_examples_explicit/reduce_general_examples_explicit.rscript b/tests/P_reduce_general_examples_explicit/reduce_general_examples_explicit.rs
index bd76c8e..bd76c8e 100644
--- a/tests/P_reduce_general_examples_explicit/reduce_general_examples_explicit.rscript
+++ b/tests/P_reduce_general_examples_explicit/reduce_general_examples_explicit.rs
diff --git a/tests/P_reduce_general_examples_halter/ScriptC_reduce_general_examples_halter.java.expect b/tests/P_reduce_general_examples_halter/ScriptC_reduce_general_examples_halter.java.expect
index d55c17a..5a8966a 100644
--- a/tests/P_reduce_general_examples_halter/ScriptC_reduce_general_examples_halter.java.expect
+++ b/tests/P_reduce_general_examples_halter/ScriptC_reduce_general_examples_halter.java.expect
@@ -16,7 +16,7 @@
 
 /*
  * This file is auto-generated. DO NOT MODIFY!
- * The source Renderscript file: reduce_general_examples_halter.rscript
+ * The source Renderscript file: reduce_general_examples_halter.rs
  */
 
 package examples;
diff --git a/tests/P_reduce_general_examples_halter/reduce_general_examples_halter.rscript b/tests/P_reduce_general_examples_halter/reduce_general_examples_halter.rs
index 8e35fe0..8e35fe0 100644
--- a/tests/P_reduce_general_examples_halter/reduce_general_examples_halter.rscript
+++ b/tests/P_reduce_general_examples_halter/reduce_general_examples_halter.rs
diff --git a/tests/P_reduce_general_input/ScriptC_reduce_general_input.java.expect b/tests/P_reduce_general_input/ScriptC_reduce_general_input.java.expect
index eb1e8dd..56d10b2 100644
--- a/tests/P_reduce_general_input/ScriptC_reduce_general_input.java.expect
+++ b/tests/P_reduce_general_input/ScriptC_reduce_general_input.java.expect
@@ -16,7 +16,7 @@
 
 /*
  * This file is auto-generated. DO NOT MODIFY!
- * The source Renderscript file: reduce_general_input.rscript
+ * The source Renderscript file: reduce_general_input.rs
  */
 
 package input;
diff --git a/tests/P_reduce_general_input/ScriptField_MyStruct.java.expect b/tests/P_reduce_general_input/ScriptField_MyStruct.java.expect
index 56fe121..8f3859b 100644
--- a/tests/P_reduce_general_input/ScriptField_MyStruct.java.expect
+++ b/tests/P_reduce_general_input/ScriptField_MyStruct.java.expect
@@ -16,7 +16,7 @@
 
 /*
  * This file is auto-generated. DO NOT MODIFY!
- * The source Renderscript file: reduce_general_input.rscript
+ * The source Renderscript file: reduce_general_input.rs
  */
 
 package input;
diff --git a/tests/P_reduce_general_input/reduce_general_input.rscript b/tests/P_reduce_general_input/reduce_general_input.rs
index e0fa90f..e0fa90f 100644
--- a/tests/P_reduce_general_input/reduce_general_input.rscript
+++ b/tests/P_reduce_general_input/reduce_general_input.rs
diff --git a/tests/P_reduce_general_inputs/ScriptC_reduce_general_inputs.java.expect b/tests/P_reduce_general_inputs/ScriptC_reduce_general_inputs.java.expect
index eff2274..198f438 100644
--- a/tests/P_reduce_general_inputs/ScriptC_reduce_general_inputs.java.expect
+++ b/tests/P_reduce_general_inputs/ScriptC_reduce_general_inputs.java.expect
@@ -16,7 +16,7 @@
 
 /*
  * This file is auto-generated. DO NOT MODIFY!
- * The source Renderscript file: reduce_general_inputs.rscript
+ * The source Renderscript file: reduce_general_inputs.rs
  */
 
 package inputs;
diff --git a/tests/P_reduce_general_inputs/ScriptField_MyStruct.java.expect b/tests/P_reduce_general_inputs/ScriptField_MyStruct.java.expect
index 359f994..95c1c50 100644
--- a/tests/P_reduce_general_inputs/ScriptField_MyStruct.java.expect
+++ b/tests/P_reduce_general_inputs/ScriptField_MyStruct.java.expect
@@ -16,7 +16,7 @@
 
 /*
  * This file is auto-generated. DO NOT MODIFY!
- * The source Renderscript file: reduce_general_inputs.rscript
+ * The source Renderscript file: reduce_general_inputs.rs
  */
 
 package inputs;
diff --git a/tests/P_reduce_general_inputs/reduce_general_inputs.rscript b/tests/P_reduce_general_inputs/reduce_general_inputs.rs
index aa7aae7..aa7aae7 100644
--- a/tests/P_reduce_general_inputs/reduce_general_inputs.rscript
+++ b/tests/P_reduce_general_inputs/reduce_general_inputs.rs
diff --git a/tests/P_reduce_general_reflect/reduce_general_reflect.rscript b/tests/P_reduce_general_reflect/reduce_general_reflect.rs
index a7ef619..a7ef619 100644
--- a/tests/P_reduce_general_reflect/reduce_general_reflect.rscript
+++ b/tests/P_reduce_general_reflect/reduce_general_reflect.rs
diff --git a/tests/P_reduce_general_result/ScriptC_reduce_general_result.java.expect b/tests/P_reduce_general_result/ScriptC_reduce_general_result.java.expect
index c259fa3..bbd40ba 100644
--- a/tests/P_reduce_general_result/ScriptC_reduce_general_result.java.expect
+++ b/tests/P_reduce_general_result/ScriptC_reduce_general_result.java.expect
@@ -16,7 +16,7 @@
 
 /*
  * This file is auto-generated. DO NOT MODIFY!
- * The source Renderscript file: reduce_general_result.rscript
+ * The source Renderscript file: reduce_general_result.rs
  */
 
 package result;
diff --git a/tests/P_reduce_general_result/ScriptField_MyStruct.java.expect b/tests/P_reduce_general_result/ScriptField_MyStruct.java.expect
index 7026fe5..834c865 100644
--- a/tests/P_reduce_general_result/ScriptField_MyStruct.java.expect
+++ b/tests/P_reduce_general_result/ScriptField_MyStruct.java.expect
@@ -16,7 +16,7 @@
 
 /*
  * This file is auto-generated. DO NOT MODIFY!
- * The source Renderscript file: reduce_general_result.rscript
+ * The source Renderscript file: reduce_general_result.rs
  */
 
 package result;
diff --git a/tests/P_reduce_general_result/reduce_general_result.rscript b/tests/P_reduce_general_result/reduce_general_result.rs
index 06c38bc..06c38bc 100644
--- a/tests/P_reduce_general_result/reduce_general_result.rscript
+++ b/tests/P_reduce_general_result/reduce_general_result.rs
diff --git a/tests/P_reduce_general_struct/ScriptC_reduce_general_struct.java.expect b/tests/P_reduce_general_struct/ScriptC_reduce_general_struct.java.expect
index 892dc56..d2d15da 100644
--- a/tests/P_reduce_general_struct/ScriptC_reduce_general_struct.java.expect
+++ b/tests/P_reduce_general_struct/ScriptC_reduce_general_struct.java.expect
@@ -16,7 +16,7 @@
 
 /*
  * This file is auto-generated. DO NOT MODIFY!
- * The source Renderscript file: reduce_general_struct.rscript
+ * The source Renderscript file: reduce_general_struct.rs
  */
 
 package struct;
diff --git a/tests/P_reduce_general_struct/reduce_general_struct.rscript b/tests/P_reduce_general_struct/reduce_general_struct.rs
index ac6951e..ac6951e 100644
--- a/tests/P_reduce_general_struct/reduce_general_struct.rscript
+++ b/tests/P_reduce_general_struct/reduce_general_struct.rs
diff --git a/tests/P_refcount/refcount.rscript b/tests/P_refcount/refcount.rs
index 96cb9d6..96cb9d6 100644
--- a/tests/P_refcount/refcount.rscript
+++ b/tests/P_refcount/refcount.rs
diff --git a/tests/P_reflection3264_divergent/ScriptC_reflection3264_divergent.java.expect b/tests/P_reflection3264_divergent/ScriptC_reflection3264_divergent.java.expect
index 0a1ebd8..e71eaa3 100644
--- a/tests/P_reflection3264_divergent/ScriptC_reflection3264_divergent.java.expect
+++ b/tests/P_reflection3264_divergent/ScriptC_reflection3264_divergent.java.expect
@@ -16,7 +16,7 @@
 
 /*
  * This file is auto-generated. DO NOT MODIFY!
- * The source Renderscript file: reflection3264_divergent.rscript
+ * The source Renderscript file: reflection3264_divergent.rs
  */
 
 package foo;
diff --git a/tests/P_reflection3264_divergent/ScriptField_Divergent.java.expect b/tests/P_reflection3264_divergent/ScriptField_Divergent.java.expect
index d03cb13..1be4ac2 100644
--- a/tests/P_reflection3264_divergent/ScriptField_Divergent.java.expect
+++ b/tests/P_reflection3264_divergent/ScriptField_Divergent.java.expect
@@ -16,7 +16,7 @@
 
 /*
  * This file is auto-generated. DO NOT MODIFY!
- * The source Renderscript file: reflection3264_divergent.rscript
+ * The source Renderscript file: reflection3264_divergent.rs
  */
 
 package foo;
diff --git a/tests/P_reflection3264_divergent/ScriptField_DivergentNest.java.expect b/tests/P_reflection3264_divergent/ScriptField_DivergentNest.java.expect
index dcfa278..18ba85a 100644
--- a/tests/P_reflection3264_divergent/ScriptField_DivergentNest.java.expect
+++ b/tests/P_reflection3264_divergent/ScriptField_DivergentNest.java.expect
@@ -16,7 +16,7 @@
 
 /*
  * This file is auto-generated. DO NOT MODIFY!
- * The source Renderscript file: reflection3264_divergent.rscript
+ * The source Renderscript file: reflection3264_divergent.rs
  */
 
 package foo;
diff --git a/tests/P_reflection3264_divergent/ScriptField_NonDivergent.java.expect b/tests/P_reflection3264_divergent/ScriptField_NonDivergent.java.expect
index 4aa188f..437b9c5 100644
--- a/tests/P_reflection3264_divergent/ScriptField_NonDivergent.java.expect
+++ b/tests/P_reflection3264_divergent/ScriptField_NonDivergent.java.expect
@@ -16,7 +16,7 @@
 
 /*
  * This file is auto-generated. DO NOT MODIFY!
- * The source Renderscript file: reflection3264_divergent.rscript
+ * The source Renderscript file: reflection3264_divergent.rs
  */
 
 package foo;
diff --git a/tests/P_reflection3264_divergent/reflection3264_divergent.rscript b/tests/P_reflection3264_divergent/reflection3264_divergent.rs
index 8677987..8677987 100644
--- a/tests/P_reflection3264_divergent/reflection3264_divergent.rscript
+++ b/tests/P_reflection3264_divergent/reflection3264_divergent.rs
diff --git a/tests/P_reflection3264_divergent_support/ScriptC_reflection3264_divergent.java.expect b/tests/P_reflection3264_divergent_support/ScriptC_reflection3264_divergent.java.expect
index 75e3cfa..b5a8ef2 100644
--- a/tests/P_reflection3264_divergent_support/ScriptC_reflection3264_divergent.java.expect
+++ b/tests/P_reflection3264_divergent_support/ScriptC_reflection3264_divergent.java.expect
@@ -16,7 +16,7 @@
 
 /*
  * This file is auto-generated. DO NOT MODIFY!
- * The source Renderscript file: reflection3264_divergent.rscript
+ * The source Renderscript file: reflection3264_divergent.rs
  */
 
 package foo;
diff --git a/tests/P_reflection3264_divergent_support/ScriptField_Divergent.java.expect b/tests/P_reflection3264_divergent_support/ScriptField_Divergent.java.expect
index 42f99e7..dc5e6c0 100644
--- a/tests/P_reflection3264_divergent_support/ScriptField_Divergent.java.expect
+++ b/tests/P_reflection3264_divergent_support/ScriptField_Divergent.java.expect
@@ -16,7 +16,7 @@
 
 /*
  * This file is auto-generated. DO NOT MODIFY!
- * The source Renderscript file: reflection3264_divergent.rscript
+ * The source Renderscript file: reflection3264_divergent.rs
  */
 
 package foo;
diff --git a/tests/P_reflection3264_divergent_support/ScriptField_DivergentNest.java.expect b/tests/P_reflection3264_divergent_support/ScriptField_DivergentNest.java.expect
index 0dadb0f..80df1cd 100644
--- a/tests/P_reflection3264_divergent_support/ScriptField_DivergentNest.java.expect
+++ b/tests/P_reflection3264_divergent_support/ScriptField_DivergentNest.java.expect
@@ -16,7 +16,7 @@
 
 /*
  * This file is auto-generated. DO NOT MODIFY!
- * The source Renderscript file: reflection3264_divergent.rscript
+ * The source Renderscript file: reflection3264_divergent.rs
  */
 
 package foo;
diff --git a/tests/P_reflection3264_divergent_support/ScriptField_NonDivergent.java.expect b/tests/P_reflection3264_divergent_support/ScriptField_NonDivergent.java.expect
index a01cab0..64559c3 100644
--- a/tests/P_reflection3264_divergent_support/ScriptField_NonDivergent.java.expect
+++ b/tests/P_reflection3264_divergent_support/ScriptField_NonDivergent.java.expect
@@ -16,7 +16,7 @@
 
 /*
  * This file is auto-generated. DO NOT MODIFY!
- * The source Renderscript file: reflection3264_divergent.rscript
+ * The source Renderscript file: reflection3264_divergent.rs
  */
 
 package foo;
diff --git a/tests/P_reflection3264_divergent_support/reflection3264_divergent.rscript b/tests/P_reflection3264_divergent_support/reflection3264_divergent.rs
index a77b119..a77b119 100644
--- a/tests/P_reflection3264_divergent_support/reflection3264_divergent.rscript
+++ b/tests/P_reflection3264_divergent_support/reflection3264_divergent.rs
diff --git a/tests/P_reflection3264_multifile/ScriptC_reflection3264_multifile_1.java.expect b/tests/P_reflection3264_multifile/ScriptC_reflection3264_multifile_1.java.expect
index 403a9fb..9637753 100644
--- a/tests/P_reflection3264_multifile/ScriptC_reflection3264_multifile_1.java.expect
+++ b/tests/P_reflection3264_multifile/ScriptC_reflection3264_multifile_1.java.expect
@@ -16,7 +16,7 @@
 
 /*
  * This file is auto-generated. DO NOT MODIFY!
- * The source Renderscript file: reflection3264_multifile_1.rscript
+ * The source Renderscript file: reflection3264_multifile_1.rs
  */
 
 package foo;
diff --git a/tests/P_reflection3264_multifile/ScriptC_reflection3264_multifile_2.java.expect b/tests/P_reflection3264_multifile/ScriptC_reflection3264_multifile_2.java.expect
index 37474f9..4464559 100644
--- a/tests/P_reflection3264_multifile/ScriptC_reflection3264_multifile_2.java.expect
+++ b/tests/P_reflection3264_multifile/ScriptC_reflection3264_multifile_2.java.expect
@@ -16,7 +16,7 @@
 
 /*
  * This file is auto-generated. DO NOT MODIFY!
- * The source Renderscript file: reflection3264_multifile_2.rscript
+ * The source Renderscript file: reflection3264_multifile_2.rs
  */
 
 package foo;
diff --git a/tests/P_reflection3264_multifile/ScriptC_reflection3264_multifile_3.java.expect b/tests/P_reflection3264_multifile/ScriptC_reflection3264_multifile_3.java.expect
index 5acde1e..7740bb5 100644
--- a/tests/P_reflection3264_multifile/ScriptC_reflection3264_multifile_3.java.expect
+++ b/tests/P_reflection3264_multifile/ScriptC_reflection3264_multifile_3.java.expect
@@ -16,7 +16,7 @@
 
 /*
  * This file is auto-generated. DO NOT MODIFY!
- * The source Renderscript file: reflection3264_multifile_3.rscript
+ * The source Renderscript file: reflection3264_multifile_3.rs
  */
 
 package foo;
diff --git a/tests/P_reflection3264_multifile/reflection3264_multifile_1.rscript b/tests/P_reflection3264_multifile/reflection3264_multifile_1.rs
index e43fc93..e43fc93 100644
--- a/tests/P_reflection3264_multifile/reflection3264_multifile_1.rscript
+++ b/tests/P_reflection3264_multifile/reflection3264_multifile_1.rs
diff --git a/tests/P_reflection3264_multifile/reflection3264_multifile_2.rscript b/tests/P_reflection3264_multifile/reflection3264_multifile_2.rs
index 2b54e08..2b54e08 100644
--- a/tests/P_reflection3264_multifile/reflection3264_multifile_2.rscript
+++ b/tests/P_reflection3264_multifile/reflection3264_multifile_2.rs
diff --git a/tests/P_reflection3264_multifile/reflection3264_multifile_3.rscript b/tests/P_reflection3264_multifile/reflection3264_multifile_3.rs
index b34096a..b34096a 100644
--- a/tests/P_reflection3264_multifile/reflection3264_multifile_3.rscript
+++ b/tests/P_reflection3264_multifile/reflection3264_multifile_3.rs
diff --git a/tests/P_root_11_i/root_11_i.rscript b/tests/P_root_11_i/root_11_i.rs
index 105569f..105569f 100644
--- a/tests/P_root_11_i/root_11_i.rscript
+++ b/tests/P_root_11_i/root_11_i.rs
diff --git a/tests/P_root_11_iouxy/root_11_iouxy.rscript b/tests/P_root_11_iouxy/root_11_iouxy.rs
index 2cd0667..2cd0667 100644
--- a/tests/P_root_11_iouxy/root_11_iouxy.rscript
+++ b/tests/P_root_11_iouxy/root_11_iouxy.rs
diff --git a/tests/P_root_compute/root_compute.rscript b/tests/P_root_compute/root_compute.rs
index e668380..e668380 100644
--- a/tests/P_root_compute/root_compute.rscript
+++ b/tests/P_root_compute/root_compute.rs
diff --git a/tests/P_root_compute_int32_xy/root_compute_int32_xy.rscript b/tests/P_root_compute_int32_xy/root_compute_int32_xy.rs
index 37df481..37df481 100644
--- a/tests/P_root_compute_int32_xy/root_compute_int32_xy.rscript
+++ b/tests/P_root_compute_int32_xy/root_compute_int32_xy.rs
diff --git a/tests/P_root_compute_non_void_ptr_usrData/root_compute_non_void_ptr_usrData.rscript b/tests/P_root_compute_non_void_ptr_usrData/root_compute_non_void_ptr_usrData.rs
index cf7f318..cf7f318 100644
--- a/tests/P_root_compute_non_void_ptr_usrData/root_compute_non_void_ptr_usrData.rscript
+++ b/tests/P_root_compute_non_void_ptr_usrData/root_compute_non_void_ptr_usrData.rs
diff --git a/tests/P_root_graphics/root_graphics.rscript b/tests/P_root_graphics/root_graphics.rs
index 62ec241..62ec241 100644
--- a/tests/P_root_graphics/root_graphics.rscript
+++ b/tests/P_root_graphics/root_graphics.rs
diff --git a/tests/P_root_graphics_13/root_graphics_13.rscript b/tests/P_root_graphics_13/root_graphics_13.rs
index 882bea1..882bea1 100644
--- a/tests/P_root_graphics_13/root_graphics_13.rscript
+++ b/tests/P_root_graphics_13/root_graphics_13.rs
diff --git a/tests/P_root_void/root_void.rscript b/tests/P_root_void/root_void.rs
index 13bed22..13bed22 100644
--- a/tests/P_root_void/root_void.rscript
+++ b/tests/P_root_void/root_void.rs
diff --git a/tests/P_rs_fp_full/rs_fp_full.rscript b/tests/P_rs_fp_full/rs_fp_full.rs
index 35050fc..35050fc 100644
--- a/tests/P_rs_fp_full/rs_fp_full.rscript
+++ b/tests/P_rs_fp_full/rs_fp_full.rs
diff --git a/tests/P_rs_fp_imprecise/rs_fp_imprecise.rscript b/tests/P_rs_fp_imprecise/rs_fp_imprecise.rs
index 98c4c91..98c4c91 100644
--- a/tests/P_rs_fp_imprecise/rs_fp_imprecise.rscript
+++ b/tests/P_rs_fp_imprecise/rs_fp_imprecise.rs
diff --git a/tests/P_rs_fp_imprecise/stderr.txt.expect b/tests/P_rs_fp_imprecise/stderr.txt.expect
index 7a98ebc..0d86335 100644
--- a/tests/P_rs_fp_imprecise/stderr.txt.expect
+++ b/tests/P_rs_fp_imprecise/stderr.txt.expect
@@ -1 +1 @@
-rs_fp_imprecise.rscript:4:9: warning: rs_fp_imprecise is deprecated.  Assuming rs_fp_relaxed instead.
+rs_fp_imprecise.rs:4:9: warning: rs_fp_imprecise is deprecated.  Assuming rs_fp_relaxed instead.
diff --git a/tests/P_rs_fp_relaxed/rs_fp_relaxed.rscript b/tests/P_rs_fp_relaxed/rs_fp_relaxed.rs
index dfa8c82..dfa8c82 100644
--- a/tests/P_rs_fp_relaxed/rs_fp_relaxed.rscript
+++ b/tests/P_rs_fp_relaxed/rs_fp_relaxed.rs
diff --git a/tests/P_rs_package_name/rs_package_name.rscript b/tests/P_rs_package_name/rs_package_name.rs
index ac62324..ac62324 100644
--- a/tests/P_rs_package_name/rs_package_name.rscript
+++ b/tests/P_rs_package_name/rs_package_name.rs
diff --git a/tests/P_set_target_api_11/set_target_api_11.rscript b/tests/P_set_target_api_11/set_target_api_11.rs
index 412b21d..412b21d 100644
--- a/tests/P_set_target_api_11/set_target_api_11.rscript
+++ b/tests/P_set_target_api_11/set_target_api_11.rs
diff --git a/tests/P_set_target_api_12/set_target_api_12.rscript b/tests/P_set_target_api_12/set_target_api_12.rs
index 69e36a4..69e36a4 100644
--- a/tests/P_set_target_api_12/set_target_api_12.rscript
+++ b/tests/P_set_target_api_12/set_target_api_12.rs
diff --git a/tests/P_set_target_api_13/set_target_api_13.rscript b/tests/P_set_target_api_13/set_target_api_13.rs
index 64c8cac..64c8cac 100644
--- a/tests/P_set_target_api_13/set_target_api_13.rscript
+++ b/tests/P_set_target_api_13/set_target_api_13.rs
diff --git a/tests/P_set_target_api_14/set_target_api_14.rscript b/tests/P_set_target_api_14/set_target_api_14.rs
index b2be554..b2be554 100644
--- a/tests/P_set_target_api_14/set_target_api_14.rscript
+++ b/tests/P_set_target_api_14/set_target_api_14.rs
diff --git a/tests/P_set_target_api_15/set_target_api_15.rscript b/tests/P_set_target_api_15/set_target_api_15.rs
index f9d2b59..f9d2b59 100644
--- a/tests/P_set_target_api_15/set_target_api_15.rscript
+++ b/tests/P_set_target_api_15/set_target_api_15.rs
diff --git a/tests/P_set_target_api_16/set_target_api_16.rscript b/tests/P_set_target_api_16/set_target_api_16.rs
index a0f823f..a0f823f 100644
--- a/tests/P_set_target_api_16/set_target_api_16.rscript
+++ b/tests/P_set_target_api_16/set_target_api_16.rs
diff --git a/tests/P_set_target_api_17/set_target_api_17.rscript b/tests/P_set_target_api_17/set_target_api_17.rs
index 3361c48..3361c48 100644
--- a/tests/P_set_target_api_17/set_target_api_17.rscript
+++ b/tests/P_set_target_api_17/set_target_api_17.rs
diff --git a/tests/P_set_target_api_18/set_target_api_18.rscript b/tests/P_set_target_api_18/set_target_api_18.rs
index a898735..a898735 100644
--- a/tests/P_set_target_api_18/set_target_api_18.rscript
+++ b/tests/P_set_target_api_18/set_target_api_18.rs
diff --git a/tests/P_set_target_api_19/set_target_api_19.rscript b/tests/P_set_target_api_19/set_target_api_19.rs
index 6d290b9..6d290b9 100644
--- a/tests/P_set_target_api_19/set_target_api_19.rscript
+++ b/tests/P_set_target_api_19/set_target_api_19.rs
diff --git a/tests/P_set_target_api_development/set_target_api_development.rscript b/tests/P_set_target_api_development/set_target_api_development.rs
index 0bcad66..0bcad66 100644
--- a/tests/P_set_target_api_development/set_target_api_development.rscript
+++ b/tests/P_set_target_api_development/set_target_api_development.rs
diff --git a/tests/P_static_struct/static_struct.rscript b/tests/P_static_struct/static_struct.rs
index 0b3e9ec..0b3e9ec 100644
--- a/tests/P_static_struct/static_struct.rscript
+++ b/tests/P_static_struct/static_struct.rs
diff --git a/tests/P_str_escape/str\\escape.rscript b/tests/P_str_escape/str\\escape.rs
index b2072d5..b2072d5 100644
--- a/tests/P_str_escape/str\\escape.rscript
+++ b/tests/P_str_escape/str\\escape.rs
diff --git a/tests/P_struct_field/ScriptC_struct_field.java.expect b/tests/P_struct_field/ScriptC_struct_field.java.expect
index 35aa267..9729da8 100644
--- a/tests/P_struct_field/ScriptC_struct_field.java.expect
+++ b/tests/P_struct_field/ScriptC_struct_field.java.expect
@@ -16,7 +16,7 @@
 
 /*
  * This file is auto-generated. DO NOT MODIFY!
- * The source Renderscript file: struct_field.rscript
+ * The source Renderscript file: struct_field.rs
  */
 
 package struct_field;
diff --git a/tests/P_struct_field/ScriptField_InnerOne.java.expect b/tests/P_struct_field/ScriptField_InnerOne.java.expect
index 0954854..8ceea0a 100644
--- a/tests/P_struct_field/ScriptField_InnerOne.java.expect
+++ b/tests/P_struct_field/ScriptField_InnerOne.java.expect
@@ -16,7 +16,7 @@
 
 /*
  * This file is auto-generated. DO NOT MODIFY!
- * The source Renderscript file: struct_field.rscript
+ * The source Renderscript file: struct_field.rs
  */
 
 package struct_field;
diff --git a/tests/P_struct_field/ScriptField_InnerTwo.java.expect b/tests/P_struct_field/ScriptField_InnerTwo.java.expect
index d1211e5..f28d9cd 100644
--- a/tests/P_struct_field/ScriptField_InnerTwo.java.expect
+++ b/tests/P_struct_field/ScriptField_InnerTwo.java.expect
@@ -16,7 +16,7 @@
 
 /*
  * This file is auto-generated. DO NOT MODIFY!
- * The source Renderscript file: struct_field.rscript
+ * The source Renderscript file: struct_field.rs
  */
 
 package struct_field;
diff --git a/tests/P_struct_field/ScriptField_Outer.java.expect b/tests/P_struct_field/ScriptField_Outer.java.expect
index 7f3892a..7d9b5c7 100644
--- a/tests/P_struct_field/ScriptField_Outer.java.expect
+++ b/tests/P_struct_field/ScriptField_Outer.java.expect
@@ -16,7 +16,7 @@
 
 /*
  * This file is auto-generated. DO NOT MODIFY!
- * The source Renderscript file: struct_field.rscript
+ * The source Renderscript file: struct_field.rs
  */
 
 package struct_field;
diff --git a/tests/P_struct_field/struct_field.rscript b/tests/P_struct_field/struct_field.rs
index 025a3ae..025a3ae 100644
--- a/tests/P_struct_field/struct_field.rscript
+++ b/tests/P_struct_field/struct_field.rs
diff --git a/tests/P_struct_matrix/struct_matrix.rscript b/tests/P_struct_matrix/struct_matrix.rs
index 353238b..353238b 100644
--- a/tests/P_struct_matrix/struct_matrix.rscript
+++ b/tests/P_struct_matrix/struct_matrix.rs
diff --git a/tests/P_use_RS_VERSION/use_RS_VERSION.rscript b/tests/P_use_RS_VERSION/use_RS_VERSION.rs
index ae7a3ad..ae7a3ad 100644
--- a/tests/P_use_RS_VERSION/use_RS_VERSION.rscript
+++ b/tests/P_use_RS_VERSION/use_RS_VERSION.rs
diff --git a/tests/P_verbose/verbose.rscript b/tests/P_verbose/verbose.rs
index 7815a77..7815a77 100644
--- a/tests/P_verbose/verbose.rscript
+++ b/tests/P_verbose/verbose.rs
diff --git a/tests/P_warnings/stderr.txt.expect b/tests/P_warnings/stderr.txt.expect
index 6015a44..00d6d40 100644
--- a/tests/P_warnings/stderr.txt.expect
+++ b/tests/P_warnings/stderr.txt.expect
@@ -1,7 +1,7 @@
-warnings.rscript:6:1: warning: control reaches end of non-void function
-warnings.rscript:9:7: warning: unused variable 'k'
-warnings.rscript:11:7: warning: unused variable 'j'
-warnings.rscript:11:11: warning: variable 'l' is uninitialized when used here
-warnings.rscript:10:8: note: initialize the variable 'l' to silence this warning
-warnings.rscript:5:12: warning: unused function 'foo'
-warnings.rscript:8:13: warning: unused function 'bar'
+warnings.rs:6:1: warning: control reaches end of non-void function
+warnings.rs:9:7: warning: unused variable 'k'
+warnings.rs:11:7: warning: unused variable 'j'
+warnings.rs:11:11: warning: variable 'l' is uninitialized when used here
+warnings.rs:10:8: note: initialize the variable 'l' to silence this warning
+warnings.rs:5:12: warning: unused function 'foo'
+warnings.rs:8:13: warning: unused function 'bar'
diff --git a/tests/P_warnings/warnings.rscript b/tests/P_warnings/warnings.rs
index f419d9c..f419d9c 100644
--- a/tests/P_warnings/warnings.rscript
+++ b/tests/P_warnings/warnings.rs
diff --git a/tests/P_warnings_deprecated/deprecated.rscript b/tests/P_warnings_deprecated/deprecated.rs
index 4e5f5af..4e5f5af 100644
--- a/tests/P_warnings_deprecated/deprecated.rscript
+++ b/tests/P_warnings_deprecated/deprecated.rs
diff --git a/tests/P_warnings_deprecated/stderr.txt.expect b/tests/P_warnings_deprecated/stderr.txt.expect
index ca4afee..a96a5d0 100644
--- a/tests/P_warnings_deprecated/stderr.txt.expect
+++ b/tests/P_warnings_deprecated/stderr.txt.expect
@@ -1,4 +1,4 @@
-deprecated.rscript:9:9: warning: 'rsClamp' is deprecated: Use clamp() instead.
+deprecated.rs:9:9: warning: 'rsClamp' is deprecated: Use clamp() instead.
 ../../../../../frameworks/rs/script_api/include/rs_math.rsh:6482:5: note: 'rsClamp' has been explicitly marked deprecated here
-deprecated.rscript:10:8: warning: 'rsGetAllocation' is deprecated: This function is deprecated and will be removed from the SDK in a future release.
+deprecated.rs:10:8: warning: 'rsGetAllocation' is deprecated: This function is deprecated and will be removed from the SDK in a future release.
 ../../../../../frameworks/rs/script_api/include/rs_object_info.rsh:381:5: note: 'rsGetAllocation' has been explicitly marked deprecated here
diff --git a/tests/P_warnings_rsSetElementAt/setelementat.rscript b/tests/P_warnings_rsSetElementAt/setelementat.rs
index 032a456..032a456 100644
--- a/tests/P_warnings_rsSetElementAt/setelementat.rscript
+++ b/tests/P_warnings_rsSetElementAt/setelementat.rs
diff --git a/tests/P_warnings_rsSetElementAt/stderr.txt.expect b/tests/P_warnings_rsSetElementAt/stderr.txt.expect
index 91a072e..d003f5e 100644
--- a/tests/P_warnings_rsSetElementAt/stderr.txt.expect
+++ b/tests/P_warnings_rsSetElementAt/stderr.txt.expect
@@ -1,13 +1,13 @@
-setelementat.rscript:21:5: warning: untyped rsSetElementAt() can reduce performance. Use rsSetElementAt_float() instead.
-setelementat.rscript:22:5: warning: untyped rsSetElementAt() can reduce performance. Use rsSetElementAt_double() instead.
-setelementat.rscript:23:5: warning: untyped rsSetElementAt() can reduce performance. Use rsSetElementAt_float2() instead.
-setelementat.rscript:24:5: warning: untyped rsSetElementAt() can reduce performance. Use rsSetElementAt_float3() instead.
-setelementat.rscript:25:5: warning: untyped rsSetElementAt() can reduce performance. Use rsSetElementAt_float4() instead.
-setelementat.rscript:26:5: warning: untyped rsSetElementAt() can reduce performance. Use rsSetElementAt_char() instead.
-setelementat.rscript:27:5: warning: untyped rsSetElementAt() can reduce performance. Use rsSetElementAt_uchar() instead.
-setelementat.rscript:28:5: warning: untyped rsSetElementAt() can reduce performance. Use rsSetElementAt_short() instead.
-setelementat.rscript:29:5: warning: untyped rsSetElementAt() can reduce performance. Use rsSetElementAt_ushort() instead.
-setelementat.rscript:30:5: warning: untyped rsSetElementAt() can reduce performance. Use rsSetElementAt_int() instead.
-setelementat.rscript:31:5: warning: untyped rsSetElementAt() can reduce performance. Use rsSetElementAt_uint() instead.
-setelementat.rscript:32:5: warning: untyped rsSetElementAt() can reduce performance. Use rsSetElementAt_long() instead.
-setelementat.rscript:33:5: warning: untyped rsSetElementAt() can reduce performance. Use rsSetElementAt_ulong() instead.
+setelementat.rs:21:5: warning: untyped rsSetElementAt() can reduce performance. Use rsSetElementAt_float() instead.
+setelementat.rs:22:5: warning: untyped rsSetElementAt() can reduce performance. Use rsSetElementAt_double() instead.
+setelementat.rs:23:5: warning: untyped rsSetElementAt() can reduce performance. Use rsSetElementAt_float2() instead.
+setelementat.rs:24:5: warning: untyped rsSetElementAt() can reduce performance. Use rsSetElementAt_float3() instead.
+setelementat.rs:25:5: warning: untyped rsSetElementAt() can reduce performance. Use rsSetElementAt_float4() instead.
+setelementat.rs:26:5: warning: untyped rsSetElementAt() can reduce performance. Use rsSetElementAt_char() instead.
+setelementat.rs:27:5: warning: untyped rsSetElementAt() can reduce performance. Use rsSetElementAt_uchar() instead.
+setelementat.rs:28:5: warning: untyped rsSetElementAt() can reduce performance. Use rsSetElementAt_short() instead.
+setelementat.rs:29:5: warning: untyped rsSetElementAt() can reduce performance. Use rsSetElementAt_ushort() instead.
+setelementat.rs:30:5: warning: untyped rsSetElementAt() can reduce performance. Use rsSetElementAt_int() instead.
+setelementat.rs:31:5: warning: untyped rsSetElementAt() can reduce performance. Use rsSetElementAt_uint() instead.
+setelementat.rs:32:5: warning: untyped rsSetElementAt() can reduce performance. Use rsSetElementAt_long() instead.
+setelementat.rs:33:5: warning: untyped rsSetElementAt() can reduce performance. Use rsSetElementAt_ulong() instead.
diff --git a/tests/slang_test.py b/tests/slang_test.py
index 82593cc..9465286 100755
--- a/tests/slang_test.py
+++ b/tests/slang_test.py
@@ -129,8 +129,8 @@ def ReportIfDifferFromExpected(tests, name, file1, file2):
 
 
 def GetRSFiles():
-  """Returns a list of files in cwd with extension '.rscript' or '.fs'."""
-  rs_files = glob.glob('*.rscript')
+  """Returns a list of files in cwd with extension '.rs' or '.fs'."""
+  rs_files = glob.glob('*.rs')
   fs_files = glob.glob('*.fs')
   rs_files += fs_files
   rs_files.sort()
@@ -170,7 +170,7 @@ def CreateCmd():
   rs_files = GetRSFiles()
 
   # Extra command line arguments can be placed as // comments at the start of
-  # any .rscript file. We automatically bundle up all of these extra args and invoke
+  # any .rs file. We automatically bundle up all of these extra args and invoke
   # llvm-rs-cc with them.
   extra_args_str = ''
   for rs_file in rs_files: