Update deps

* Fix rebase again

DEPS

@@ -13,7 +13,7 @@ vars = {
   'protobuf_revision': 'v21.12',
 
   're2_revision': '264e71e88e1c8a4b5ec326e70e9cf1d476f58a58',
-  'spirv_headers_revision': '7b0309708da5126b89e4ce6f19835f36dc912f2f',
+  'spirv_headers_revision': 'ae6a8b39717523d96683bc0d20b541944e28072f',
 }
 
 deps = {

test/operand_capabilities_test.cpp

@@ -66,20 +66,12 @@ struct EnumCapabilityCase {
 // to emit failure cases when they occur, which helps debug tests.
 inline std::ostream& operator<<(std::ostream& out, EnumCapabilityCase e) {
   out << "{" << spvOperandTypeStr(e.type) << " " << e.value << " "
-      << show(e.expected_capabilities) << " }";
+      << e.expected_capabilities << " }";
   return out;
 }
 
 using EnvEnumCapabilityCase = std::tuple<spv_target_env, EnumCapabilityCase>;
 
-// Emits an EnvEnumCapabilityCase to the given output stream. This is used
-// to emit failure cases when they occur, which helps debug tests.
-inline std::ostream& operator<<(std::ostream& out, EnvEnumCapabilityCase e) {
-  out << "EnvEnumCapabilityTest{ " << spvLogStringForEnv(std::get<0>(e)) << " "
-      << std::get<1>(e) << " }";
-  return out;
-}
-
 // Test fixture for testing EnumCapabilityCases.
 using EnumCapabilityTest =
     TestWithParam<std::tuple<spv_target_env, EnumCapabilityCase>>;