From 34e58aa01fe80cd81a566e719bb0a6a5560a961e Mon Sep 17 00:00:00 2001
From: Eduard-Mihai Burtescu <eddyb@lyken.rs>
Date: Mon, 24 Apr 2023 15:18:20 +0300
Subject: [PATCH] tests: `rustfmt` all the tests that had e.g. `// only-spirt`
 removed.

---
 tests/ui/arch/all_memory_barrier.rs                |  2 --
 .../ui/arch/all_memory_barrier_with_group_sync.rs  |  2 --
 tests/ui/arch/device_memory_barrier.rs             |  2 --
 .../arch/device_memory_barrier_with_group_sync.rs  |  2 --
 tests/ui/arch/workgroup_memory_barrier.rs          |  2 --
 .../workgroup_memory_barrier_with_group_sync.rs    |  2 --
 tests/ui/dis/add_two_ints.rs                       |  2 --
 tests/ui/dis/add_two_ints.stderr                   |  2 +-
 tests/ui/dis/asm.rs                                |  2 --
 tests/ui/dis/asm.stderr                            |  2 +-
 tests/ui/dis/asm_add_two_ints.rs                   |  2 --
 tests/ui/dis/asm_add_two_ints.stderr               |  2 +-
 tests/ui/dis/asm_op_decorate.spirt.rs              |  2 --
 tests/ui/dis/complex_image_sample_inst.rs          |  2 --
 tests/ui/dis/complex_image_sample_inst.stderr      |  2 +-
 tests/ui/dis/custom_entry_point.spirt.rs           |  2 --
 tests/ui/dis/entry-pass-mode-cast-array.rs         |  2 --
 tests/ui/dis/entry-pass-mode-cast-array.stderr     |  6 +++---
 tests/ui/dis/generic-fn-op-name.spirt.rs           |  2 --
 tests/ui/dis/index_user_dst.spirt.rs               |  2 --
 tests/ui/dis/index_user_dst.spirt.stderr           |  6 +++---
 tests/ui/dis/issue-373.spirt.rs                    |  2 --
 tests/ui/dis/issue-373.spirt.stderr                |  4 ++--
 tests/ui/dis/issue-723-output.spirt.rs             |  2 --
 tests/ui/dis/issue-731.rs                          |  2 --
 tests/ui/dis/issue-731.stderr                      |  6 +++---
 tests/ui/dis/non-writable-storage_buffer.spirt.rs  |  2 --
 tests/ui/dis/pass-mode-cast-struct.spirt.rs        |  2 --
 tests/ui/dis/pass-mode-cast-struct.spirt.stderr    | 14 +++++++-------
 tests/ui/dis/ptr_copy.normal.stderr                | 12 ++++++------
 tests/ui/dis/ptr_copy.rs                           |  2 --
 tests/ui/dis/ptr_copy.via_intrinsic.stderr         |  2 +-
 tests/ui/dis/ptr_read.rs                           |  2 --
 tests/ui/dis/ptr_read.stderr                       |  2 +-
 tests/ui/dis/ptr_read_method.rs                    |  2 --
 tests/ui/dis/ptr_read_method.stderr                |  2 +-
 tests/ui/dis/ptr_write.rs                          |  2 --
 tests/ui/dis/ptr_write.stderr                      |  2 +-
 tests/ui/dis/ptr_write_method.rs                   |  2 --
 tests/ui/dis/ptr_write_method.stderr               |  2 +-
 tests/ui/lang/core/ref/member_ref_arg-broken.rs    |  1 -
 tests/ui/lang/core/unwrap_or.spirt.rs              |  2 --
 tests/ui/lang/core/unwrap_or.spirt.stderr          |  4 ++--
 43 files changed, 35 insertions(+), 88 deletions(-)

diff --git a/tests/ui/arch/all_memory_barrier.rs b/tests/ui/arch/all_memory_barrier.rs
index 81443752bd..b3f6d2f374 100644
--- a/tests/ui/arch/all_memory_barrier.rs
+++ b/tests/ui/arch/all_memory_barrier.rs
@@ -1,5 +1,3 @@
-
-
 // build-pass
 // compile-flags: -C target-feature=+VulkanMemoryModelDeviceScopeKHR,+ext:SPV_KHR_vulkan_memory_model
 // compile-flags: -C llvm-args=--disassemble-fn=all_memory_barrier::all_memory_barrier
diff --git a/tests/ui/arch/all_memory_barrier_with_group_sync.rs b/tests/ui/arch/all_memory_barrier_with_group_sync.rs
index 560965faab..dc49dffd18 100644
--- a/tests/ui/arch/all_memory_barrier_with_group_sync.rs
+++ b/tests/ui/arch/all_memory_barrier_with_group_sync.rs
@@ -1,5 +1,3 @@
-
-
 // build-pass
 // compile-flags: -C target-feature=+VulkanMemoryModelDeviceScopeKHR,+ext:SPV_KHR_vulkan_memory_model
 // compile-flags: -C llvm-args=--disassemble-fn=all_memory_barrier_with_group_sync::all_memory_barrier_with_group_sync
diff --git a/tests/ui/arch/device_memory_barrier.rs b/tests/ui/arch/device_memory_barrier.rs
index 49db7fe770..e43db6d777 100644
--- a/tests/ui/arch/device_memory_barrier.rs
+++ b/tests/ui/arch/device_memory_barrier.rs
@@ -1,5 +1,3 @@
-
-
 // build-pass
 // compile-flags: -C target-feature=+VulkanMemoryModelDeviceScopeKHR,+ext:SPV_KHR_vulkan_memory_model
 // compile-flags: -C llvm-args=--disassemble-fn=device_memory_barrier::device_memory_barrier
diff --git a/tests/ui/arch/device_memory_barrier_with_group_sync.rs b/tests/ui/arch/device_memory_barrier_with_group_sync.rs
index b8f6aebf47..294dc45870 100644
--- a/tests/ui/arch/device_memory_barrier_with_group_sync.rs
+++ b/tests/ui/arch/device_memory_barrier_with_group_sync.rs
@@ -1,5 +1,3 @@
-
-
 // build-pass
 // compile-flags: -C target-feature=+VulkanMemoryModelDeviceScopeKHR,+ext:SPV_KHR_vulkan_memory_model
 // compile-flags: -C llvm-args=--disassemble-fn=device_memory_barrier_with_group_sync::device_memory_barrier_with_group_sync
diff --git a/tests/ui/arch/workgroup_memory_barrier.rs b/tests/ui/arch/workgroup_memory_barrier.rs
index 3c6528fa56..1a4b6de668 100644
--- a/tests/ui/arch/workgroup_memory_barrier.rs
+++ b/tests/ui/arch/workgroup_memory_barrier.rs
@@ -1,5 +1,3 @@
-
-
 // build-pass
 // compile-flags: -C llvm-args=--disassemble-fn=workgroup_memory_barrier::workgroup_memory_barrier
 
diff --git a/tests/ui/arch/workgroup_memory_barrier_with_group_sync.rs b/tests/ui/arch/workgroup_memory_barrier_with_group_sync.rs
index 818dac5a13..125df880d6 100644
--- a/tests/ui/arch/workgroup_memory_barrier_with_group_sync.rs
+++ b/tests/ui/arch/workgroup_memory_barrier_with_group_sync.rs
@@ -1,5 +1,3 @@
-
-
 // build-pass
 // compile-flags: -C llvm-args=--disassemble-fn=workgroup_memory_barrier_with_group_sync::workgroup_memory_barrier_with_group_sync
 
diff --git a/tests/ui/dis/add_two_ints.rs b/tests/ui/dis/add_two_ints.rs
index 2dbed36af8..81dccc353d 100644
--- a/tests/ui/dis/add_two_ints.rs
+++ b/tests/ui/dis/add_two_ints.rs
@@ -1,5 +1,3 @@
-
-
 // build-pass
 // compile-flags: -C llvm-args=--disassemble-fn=add_two_ints::add_two_ints
 
diff --git a/tests/ui/dis/add_two_ints.stderr b/tests/ui/dis/add_two_ints.stderr
index 9b0d0e399c..002d10ce6f 100644
--- a/tests/ui/dis/add_two_ints.stderr
+++ b/tests/ui/dis/add_two_ints.stderr
@@ -2,7 +2,7 @@
 %4 = OpFunctionParameter  %2
 %5 = OpFunctionParameter  %2
 %6 = OpLabel
-OpLine %7 9 4
+OpLine %7 7 4
 %8 = OpIAdd  %2  %4 %5
 OpNoLine
 OpReturnValue %8
diff --git a/tests/ui/dis/asm.rs b/tests/ui/dis/asm.rs
index 8c42b06945..1e2a5a6f01 100644
--- a/tests/ui/dis/asm.rs
+++ b/tests/ui/dis/asm.rs
@@ -1,5 +1,3 @@
-
-
 // build-pass
 // compile-flags: -C llvm-args=--disassemble-fn=asm::asm
 
diff --git a/tests/ui/dis/asm.stderr b/tests/ui/dis/asm.stderr
index 55e3328c0a..b0e55dbc55 100644
--- a/tests/ui/dis/asm.stderr
+++ b/tests/ui/dis/asm.stderr
@@ -1,6 +1,6 @@
 %1 = OpFunction  %2  None %3
 %4 = OpLabel
-OpLine %5 11 8
+OpLine %5 9 8
 OpMemoryBarrier %6 %7
 OpNoLine
 OpReturn
diff --git a/tests/ui/dis/asm_add_two_ints.rs b/tests/ui/dis/asm_add_two_ints.rs
index a0ec07270b..e7cbedf191 100644
--- a/tests/ui/dis/asm_add_two_ints.rs
+++ b/tests/ui/dis/asm_add_two_ints.rs
@@ -1,5 +1,3 @@
-
-
 // build-pass
 // compile-flags: -C llvm-args=--disassemble-fn=asm_add_two_ints::add_two_ints
 
diff --git a/tests/ui/dis/asm_add_two_ints.stderr b/tests/ui/dis/asm_add_two_ints.stderr
index a25cc33c01..ca526c6105 100644
--- a/tests/ui/dis/asm_add_two_ints.stderr
+++ b/tests/ui/dis/asm_add_two_ints.stderr
@@ -2,7 +2,7 @@
 %4 = OpFunctionParameter  %2
 %5 = OpFunctionParameter  %2
 %6 = OpLabel
-OpLine %7 12 8
+OpLine %7 10 8
 %8 = OpIAdd  %2  %4 %5
 OpNoLine
 OpReturnValue %8
diff --git a/tests/ui/dis/asm_op_decorate.spirt.rs b/tests/ui/dis/asm_op_decorate.spirt.rs
index b38e296ddc..9c7999ab2e 100644
--- a/tests/ui/dis/asm_op_decorate.spirt.rs
+++ b/tests/ui/dis/asm_op_decorate.spirt.rs
@@ -1,5 +1,3 @@
-
-
 #![crate_name = "asm_op_decorate"]
 
 // build-pass
diff --git a/tests/ui/dis/complex_image_sample_inst.rs b/tests/ui/dis/complex_image_sample_inst.rs
index d2b47d2d8e..f42cce8d0b 100644
--- a/tests/ui/dis/complex_image_sample_inst.rs
+++ b/tests/ui/dis/complex_image_sample_inst.rs
@@ -1,5 +1,3 @@
-
-
 // build-pass
 // compile-flags: -Ctarget-feature=+RuntimeDescriptorArray,+ext:SPV_EXT_descriptor_indexing
 // compile-flags: -C llvm-args=--disassemble-fn=complex_image_sample_inst::sample_proj_lod
diff --git a/tests/ui/dis/complex_image_sample_inst.stderr b/tests/ui/dis/complex_image_sample_inst.stderr
index 621b897961..2682527c58 100644
--- a/tests/ui/dis/complex_image_sample_inst.stderr
+++ b/tests/ui/dis/complex_image_sample_inst.stderr
@@ -5,7 +5,7 @@
 %8 = OpFunctionParameter  %9
 %10 = OpFunctionParameter  %9
 %11 = OpLabel
-OpLine %12 20 8
+OpLine %12 18 8
 %13 = OpAccessChain  %14  %15 %16
 %17 = OpLoad  %18  %13
 %19 = OpImageSampleProjExplicitLod  %2  %17 %4 Grad|ConstOffset %5 %7 %20
diff --git a/tests/ui/dis/custom_entry_point.spirt.rs b/tests/ui/dis/custom_entry_point.spirt.rs
index 372f34c8e5..20dfab8f65 100644
--- a/tests/ui/dis/custom_entry_point.spirt.rs
+++ b/tests/ui/dis/custom_entry_point.spirt.rs
@@ -1,5 +1,3 @@
-
-
 #![crate_name = "custom_entry_point"]
 
 // build-pass
diff --git a/tests/ui/dis/entry-pass-mode-cast-array.rs b/tests/ui/dis/entry-pass-mode-cast-array.rs
index b4c10d29fb..0e1314465e 100644
--- a/tests/ui/dis/entry-pass-mode-cast-array.rs
+++ b/tests/ui/dis/entry-pass-mode-cast-array.rs
@@ -1,5 +1,3 @@
-
-
 // This is a similar setup to the `issue-731` test, but instead of "just" the
 // missing copy out of the global (`Input`) `OpVariable`, small enough types
 // would fail much earlier (by generating unsupported pointer casts).
diff --git a/tests/ui/dis/entry-pass-mode-cast-array.stderr b/tests/ui/dis/entry-pass-mode-cast-array.stderr
index bc4c2f2c59..5fd5cdd459 100644
--- a/tests/ui/dis/entry-pass-mode-cast-array.stderr
+++ b/tests/ui/dis/entry-pass-mode-cast-array.stderr
@@ -1,12 +1,12 @@
 %1 = OpFunction  %2  None %3
 %4 = OpLabel
-OpLine %5 15 12
+OpLine %5 13 12
 %6 = OpLoad  %7  %8
-OpLine %5 16 4
+OpLine %5 14 4
 %9 = OpCompositeExtract  %10  %6 0
 %11 = OpFAdd  %10  %9 %12
 %13 = OpCompositeInsert  %7  %11 %6 0
-OpLine %5 17 4
+OpLine %5 15 4
 OpStore %14 %13
 OpNoLine
 OpReturn
diff --git a/tests/ui/dis/generic-fn-op-name.spirt.rs b/tests/ui/dis/generic-fn-op-name.spirt.rs
index 3e126f17c3..07db02a6e1 100644
--- a/tests/ui/dis/generic-fn-op-name.spirt.rs
+++ b/tests/ui/dis/generic-fn-op-name.spirt.rs
@@ -1,5 +1,3 @@
-
-
 #![crate_name = "generic_fn_op_name"]
 //
 // Test that generic functions' `OpName` correctly include generic arguments.
diff --git a/tests/ui/dis/index_user_dst.spirt.rs b/tests/ui/dis/index_user_dst.spirt.rs
index ae197da6b2..f1b4142e9d 100644
--- a/tests/ui/dis/index_user_dst.spirt.rs
+++ b/tests/ui/dis/index_user_dst.spirt.rs
@@ -1,5 +1,3 @@
-
-
 #![crate_name = "index_user_dst"]
 
 // build-pass
diff --git a/tests/ui/dis/index_user_dst.spirt.stderr b/tests/ui/dis/index_user_dst.spirt.stderr
index 23dc9d01d2..21a7f8e173 100644
--- a/tests/ui/dis/index_user_dst.spirt.stderr
+++ b/tests/ui/dis/index_user_dst.spirt.stderr
@@ -1,15 +1,15 @@
 %1 = OpFunction  %2  None %3
 %4 = OpLabel
-OpLine %5 11 12
+OpLine %5 9 12
 %6 = OpAccessChain  %7  %8 %9
 %10 = OpArrayLength  %11  %8 0
-OpLine %5 12 21
+OpLine %5 10 21
 %12 = OpULessThan  %13  %9 %10
 OpNoLine
 OpSelectionMerge %14 None
 OpBranchConditional %12 %15 %16
 %15 = OpLabel
-OpLine %5 12 21
+OpLine %5 10 21
 %17 = OpInBoundsAccessChain  %18  %6 %9
 %19 = OpLoad  %20  %17
 OpNoLine
diff --git a/tests/ui/dis/issue-373.spirt.rs b/tests/ui/dis/issue-373.spirt.rs
index 8ae1a37ef8..482136d448 100644
--- a/tests/ui/dis/issue-373.spirt.rs
+++ b/tests/ui/dis/issue-373.spirt.rs
@@ -1,5 +1,3 @@
-
-
 #![crate_name = "issue_373"]
 
 // Test that returning a single-scalar-field `#[repr(C)] struct` doesn't generate
diff --git a/tests/ui/dis/issue-373.spirt.stderr b/tests/ui/dis/issue-373.spirt.stderr
index b4d793b26b..3c22b8c3c9 100644
--- a/tests/ui/dis/issue-373.spirt.stderr
+++ b/tests/ui/dis/issue-373.spirt.stderr
@@ -1,9 +1,9 @@
 %1 = OpFunction  %2  None %3
 %4 = OpLabel
-OpLine %5 26 11
+OpLine %5 24 11
 %6 = OpFunctionCall  %7  %8
 %9 = OpCompositeExtract  %10  %6 0
-OpLine %5 26 4
+OpLine %5 24 4
 OpStore %11 %9
 OpNoLine
 OpReturn
diff --git a/tests/ui/dis/issue-723-output.spirt.rs b/tests/ui/dis/issue-723-output.spirt.rs
index 9e0bab9287..39bad58bcc 100644
--- a/tests/ui/dis/issue-723-output.spirt.rs
+++ b/tests/ui/dis/issue-723-output.spirt.rs
@@ -1,5 +1,3 @@
-
-
 #![crate_name = "issue_723_output"]
 
 // Test that interface (global) `OpVariable`s mentioned by `OpEntryPoint` don't
diff --git a/tests/ui/dis/issue-731.rs b/tests/ui/dis/issue-731.rs
index 0073242aec..ccd8d39ef4 100644
--- a/tests/ui/dis/issue-731.rs
+++ b/tests/ui/dis/issue-731.rs
@@ -1,5 +1,3 @@
-
-
 // Test that non-immediate (i.e. not one of scalar/scalar-pair/vector) inputs
 // get properly copied out of the global (`Input`) `OpVariable` and mutation is
 // only ever done on `fn`-local `OpVariable`s, not on the original global.
diff --git a/tests/ui/dis/issue-731.stderr b/tests/ui/dis/issue-731.stderr
index 5fd5cdd459..78fdc54539 100644
--- a/tests/ui/dis/issue-731.stderr
+++ b/tests/ui/dis/issue-731.stderr
@@ -1,12 +1,12 @@
 %1 = OpFunction  %2  None %3
 %4 = OpLabel
-OpLine %5 13 12
+OpLine %5 11 12
 %6 = OpLoad  %7  %8
-OpLine %5 14 4
+OpLine %5 12 4
 %9 = OpCompositeExtract  %10  %6 0
 %11 = OpFAdd  %10  %9 %12
 %13 = OpCompositeInsert  %7  %11 %6 0
-OpLine %5 15 4
+OpLine %5 13 4
 OpStore %14 %13
 OpNoLine
 OpReturn
diff --git a/tests/ui/dis/non-writable-storage_buffer.spirt.rs b/tests/ui/dis/non-writable-storage_buffer.spirt.rs
index e85fd947b1..830bdb173c 100644
--- a/tests/ui/dis/non-writable-storage_buffer.spirt.rs
+++ b/tests/ui/dis/non-writable-storage_buffer.spirt.rs
@@ -1,5 +1,3 @@
-
-
 #![crate_name = "non_writable_storage_buffer"]
 
 // Tests that only `&T` (where `T: Freeze`) storage buffers get `NonWritable`.
diff --git a/tests/ui/dis/pass-mode-cast-struct.spirt.rs b/tests/ui/dis/pass-mode-cast-struct.spirt.rs
index 477b56668d..5ed7442537 100644
--- a/tests/ui/dis/pass-mode-cast-struct.spirt.rs
+++ b/tests/ui/dis/pass-mode-cast-struct.spirt.rs
@@ -1,5 +1,3 @@
-
-
 #![crate_name = "pass_mode_cast_struct"]
 
 // Test that a small enough `struct` doesn't generate unsupported pointer casts.
diff --git a/tests/ui/dis/pass-mode-cast-struct.spirt.stderr b/tests/ui/dis/pass-mode-cast-struct.spirt.stderr
index c1b01964c3..39488b0971 100644
--- a/tests/ui/dis/pass-mode-cast-struct.spirt.stderr
+++ b/tests/ui/dis/pass-mode-cast-struct.spirt.stderr
@@ -1,19 +1,19 @@
 %1 = OpFunction  %2  None %3
 %4 = OpLabel
-OpLine %5 31 12
+OpLine %5 29 12
 %6 = OpLoad  %7  %8
-OpLine %5 32 14
+OpLine %5 30 14
 %9 = OpFunctionCall  %10  %11 %6
-OpLine %5 33 15
+OpLine %5 31 15
 %12 = OpCompositeExtract  %13  %9 0
-OpLine %5 33 24
+OpLine %5 31 24
 %14 = OpCompositeExtract  %15  %9 1
-OpLine %5 33 32
+OpLine %5 31 32
 %16 = OpCompositeExtract  %15  %9 2
-OpLine %5 33 23
+OpLine %5 31 23
 %17 = OpIAdd  %15  %14 %16
 %18 = OpUConvert  %13  %17
-OpLine %5 33 4
+OpLine %5 31 4
 %19 = OpIAdd  %13  %12 %18
 OpStore %20 %19
 OpNoLine
diff --git a/tests/ui/dis/ptr_copy.normal.stderr b/tests/ui/dis/ptr_copy.normal.stderr
index c84157ee26..42d4114aa3 100644
--- a/tests/ui/dis/ptr_copy.normal.stderr
+++ b/tests/ui/dis/ptr_copy.normal.stderr
@@ -10,19 +10,19 @@ note: used from within `core::intrinsics::copy::<f32>`
 2447 | pub const unsafe fn copy<T>(src: *const T, dst: *mut T, count: usize) {
      |                     ^
 note: called by `ptr_copy::copy_via_raw_ptr`
-    --> $DIR/ptr_copy.rs:30:18
+    --> $DIR/ptr_copy.rs:28:18
      |
-30   |         unsafe { core::ptr::copy(src, dst, 1) }
+28   |         unsafe { core::ptr::copy(src, dst, 1) }
      |                  ^
 note: called by `ptr_copy::main`
-    --> $DIR/ptr_copy.rs:35:5
+    --> $DIR/ptr_copy.rs:33:5
      |
-35   |     copy_via_raw_ptr(&i, o);
+33   |     copy_via_raw_ptr(&i, o);
      |     ^
 note: called by `main`
-    --> $DIR/ptr_copy.rs:33:1
+    --> $DIR/ptr_copy.rs:31:1
      |
-33   | #[spirv(fragment)]
+31   | #[spirv(fragment)]
      | ^
 
 error: aborting due to previous error
diff --git a/tests/ui/dis/ptr_copy.rs b/tests/ui/dis/ptr_copy.rs
index 95a7dc6cee..ca376e25c1 100644
--- a/tests/ui/dis/ptr_copy.rs
+++ b/tests/ui/dis/ptr_copy.rs
@@ -1,5 +1,3 @@
-
-
 // revisions: normal via_intrinsic
 //[normal] build-fail
 // normalize-stderr-test "\S*/library/core/src/" -> "$$CORE_SRC/"
diff --git a/tests/ui/dis/ptr_copy.via_intrinsic.stderr b/tests/ui/dis/ptr_copy.via_intrinsic.stderr
index 4935551402..cb2adb4cbb 100644
--- a/tests/ui/dis/ptr_copy.via_intrinsic.stderr
+++ b/tests/ui/dis/ptr_copy.via_intrinsic.stderr
@@ -2,7 +2,7 @@
 %4 = OpFunctionParameter  %5
 %6 = OpFunctionParameter  %5
 %7 = OpLabel
-OpLine %8 19 17
+OpLine %8 17 17
 OpCopyMemory %6 %4
 OpNoLine
 OpReturn
diff --git a/tests/ui/dis/ptr_read.rs b/tests/ui/dis/ptr_read.rs
index fc331080d4..494bcdb3fa 100644
--- a/tests/ui/dis/ptr_read.rs
+++ b/tests/ui/dis/ptr_read.rs
@@ -1,5 +1,3 @@
-
-
 // build-pass
 // compile-flags: -C llvm-args=--disassemble-fn=ptr_read::copy_via_raw_ptr
 
diff --git a/tests/ui/dis/ptr_read.stderr b/tests/ui/dis/ptr_read.stderr
index 4a4df10a76..c528b471ee 100644
--- a/tests/ui/dis/ptr_read.stderr
+++ b/tests/ui/dis/ptr_read.stderr
@@ -4,7 +4,7 @@
 %7 = OpLabel
 OpLine %8 1157 8
 %9 = OpLoad  %10  %4
-OpLine %11 9 13
+OpLine %11 7 13
 OpStore %6 %9
 OpNoLine
 OpReturn
diff --git a/tests/ui/dis/ptr_read_method.rs b/tests/ui/dis/ptr_read_method.rs
index ae13b2e2d8..41620e9ebb 100644
--- a/tests/ui/dis/ptr_read_method.rs
+++ b/tests/ui/dis/ptr_read_method.rs
@@ -1,5 +1,3 @@
-
-
 // build-pass
 // compile-flags: -C llvm-args=--disassemble-fn=ptr_read_method::copy_via_raw_ptr
 
diff --git a/tests/ui/dis/ptr_read_method.stderr b/tests/ui/dis/ptr_read_method.stderr
index 4a4df10a76..c528b471ee 100644
--- a/tests/ui/dis/ptr_read_method.stderr
+++ b/tests/ui/dis/ptr_read_method.stderr
@@ -4,7 +4,7 @@
 %7 = OpLabel
 OpLine %8 1157 8
 %9 = OpLoad  %10  %4
-OpLine %11 9 13
+OpLine %11 7 13
 OpStore %6 %9
 OpNoLine
 OpReturn
diff --git a/tests/ui/dis/ptr_write.rs b/tests/ui/dis/ptr_write.rs
index eb1eb6aee7..fcfdc4cd8d 100644
--- a/tests/ui/dis/ptr_write.rs
+++ b/tests/ui/dis/ptr_write.rs
@@ -1,5 +1,3 @@
-
-
 // build-pass
 // compile-flags: -C llvm-args=--disassemble-fn=ptr_write::copy_via_raw_ptr
 
diff --git a/tests/ui/dis/ptr_write.stderr b/tests/ui/dis/ptr_write.stderr
index 2556854af5..97fe1c725a 100644
--- a/tests/ui/dis/ptr_write.stderr
+++ b/tests/ui/dis/ptr_write.stderr
@@ -2,7 +2,7 @@
 %4 = OpFunctionParameter  %5
 %6 = OpFunctionParameter  %5
 %7 = OpLabel
-OpLine %8 9 35
+OpLine %8 7 35
 %9 = OpLoad  %10  %4
 OpLine %11 1354 8
 OpStore %6 %9
diff --git a/tests/ui/dis/ptr_write_method.rs b/tests/ui/dis/ptr_write_method.rs
index f2c25a2ac6..bdc969df38 100644
--- a/tests/ui/dis/ptr_write_method.rs
+++ b/tests/ui/dis/ptr_write_method.rs
@@ -1,5 +1,3 @@
-
-
 // build-pass
 // compile-flags: -C llvm-args=--disassemble-fn=ptr_write_method::copy_via_raw_ptr
 
diff --git a/tests/ui/dis/ptr_write_method.stderr b/tests/ui/dis/ptr_write_method.stderr
index 709f86aa5d..66e65d6857 100644
--- a/tests/ui/dis/ptr_write_method.stderr
+++ b/tests/ui/dis/ptr_write_method.stderr
@@ -2,7 +2,7 @@
 %4 = OpFunctionParameter  %5
 %6 = OpFunctionParameter  %5
 %7 = OpLabel
-OpLine %8 9 37
+OpLine %8 7 37
 %9 = OpLoad  %10  %4
 OpLine %11 1354 8
 OpStore %6 %9
diff --git a/tests/ui/lang/core/ref/member_ref_arg-broken.rs b/tests/ui/lang/core/ref/member_ref_arg-broken.rs
index fffe669fae..7e3da82097 100644
--- a/tests/ui/lang/core/ref/member_ref_arg-broken.rs
+++ b/tests/ui/lang/core/ref/member_ref_arg-broken.rs
@@ -6,7 +6,6 @@
 
 // normalize-stderr-test     "38\[%38\]" -> "$$ID[%$$ID]"
 
-
 use spirv_std::spirv;
 
 struct S {
diff --git a/tests/ui/lang/core/unwrap_or.spirt.rs b/tests/ui/lang/core/unwrap_or.spirt.rs
index c22f895f06..d6644a902f 100644
--- a/tests/ui/lang/core/unwrap_or.spirt.rs
+++ b/tests/ui/lang/core/unwrap_or.spirt.rs
@@ -1,5 +1,3 @@
-
-
 #![crate_name = "unwrap_or"]
 
 // unwrap_or generates some memory-bools (as u8). Test to make sure they're fused away.
diff --git a/tests/ui/lang/core/unwrap_or.spirt.stderr b/tests/ui/lang/core/unwrap_or.spirt.stderr
index 366c0bf3cc..5d4494ac0c 100644
--- a/tests/ui/lang/core/unwrap_or.spirt.stderr
+++ b/tests/ui/lang/core/unwrap_or.spirt.stderr
@@ -1,6 +1,6 @@
 %1 = OpFunction  %2  None %3
 %4 = OpLabel
-OpLine %5 15 11
+OpLine %5 13 11
 %6 = OpCompositeInsert  %7  %8 %9 0
 %10 = OpCompositeExtract  %11  %6 1
 OpLine %12 967 14
@@ -24,7 +24,7 @@ OpBranch %26
 %28 = OpLabel
 OpBranch %26
 %26 = OpLabel
-OpLine %5 15 4
+OpLine %5 13 4
 OpStore %29 %24
 OpNoLine
 OpReturn