[tint] Remove diagnostic from reflection files.
The reflection files uses diagnostics for a bit more context on
reflection issues. The extra info is nice, but the class name is already
unique, so remove the extra context and just use the basic `Result`
class.
Bug: 383726508
Change-Id: I7fe0cae4b83ca3b1c7cec488b351627e5b9c08dc
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/230715
Reviewed-by: James Price <jrprice@google.com>
Commit-Queue: dan sinclair <dsinclair@chromium.org>
diff --git a/src/tint/api/common/BUILD.bazel b/src/tint/api/common/BUILD.bazel
index 1f5c71c..c66e7c7 100644
--- a/src/tint/api/common/BUILD.bazel
+++ b/src/tint/api/common/BUILD.bazel
@@ -50,14 +50,12 @@
deps = [
"//src/tint/utils",
"//src/tint/utils/containers",
- "//src/tint/utils/diagnostic",
"//src/tint/utils/ice",
"//src/tint/utils/macros",
"//src/tint/utils/math",
"//src/tint/utils/memory",
"//src/tint/utils/result",
"//src/tint/utils/rtti",
- "//src/tint/utils/text",
"//src/utils",
],
copts = COPTS,
@@ -75,14 +73,12 @@
"//src/tint/api/common",
"//src/tint/utils",
"//src/tint/utils/containers",
- "//src/tint/utils/diagnostic",
"//src/tint/utils/ice",
"//src/tint/utils/macros",
"//src/tint/utils/math",
"//src/tint/utils/memory",
"//src/tint/utils/result",
"//src/tint/utils/rtti",
- "//src/tint/utils/text",
"@gtest",
"//src/utils",
],
diff --git a/src/tint/api/common/BUILD.cmake b/src/tint/api/common/BUILD.cmake
index d220123..aae0e1b 100644
--- a/src/tint/api/common/BUILD.cmake
+++ b/src/tint/api/common/BUILD.cmake
@@ -49,14 +49,12 @@
tint_target_add_dependencies(tint_api_common lib
tint_utils
tint_utils_containers
- tint_utils_diagnostic
tint_utils_ice
tint_utils_macros
tint_utils_math
tint_utils_memory
tint_utils_result
tint_utils_rtti
- tint_utils_text
)
tint_target_add_external_dependencies(tint_api_common lib
@@ -77,14 +75,12 @@
tint_api_common
tint_utils
tint_utils_containers
- tint_utils_diagnostic
tint_utils_ice
tint_utils_macros
tint_utils_math
tint_utils_memory
tint_utils_result
tint_utils_rtti
- tint_utils_text
)
tint_target_add_external_dependencies(tint_api_common_test test
diff --git a/src/tint/api/common/BUILD.gn b/src/tint/api/common/BUILD.gn
index 2e63d4a..4ccb186 100644
--- a/src/tint/api/common/BUILD.gn
+++ b/src/tint/api/common/BUILD.gn
@@ -55,14 +55,12 @@
"${dawn_root}/src/utils:utils",
"${tint_src_dir}/utils",
"${tint_src_dir}/utils/containers",
- "${tint_src_dir}/utils/diagnostic",
"${tint_src_dir}/utils/ice",
"${tint_src_dir}/utils/macros",
"${tint_src_dir}/utils/math",
"${tint_src_dir}/utils/memory",
"${tint_src_dir}/utils/result",
"${tint_src_dir}/utils/rtti",
- "${tint_src_dir}/utils/text",
]
}
if (tint_build_unittests) {
@@ -78,14 +76,12 @@
"${tint_src_dir}/api/common",
"${tint_src_dir}/utils",
"${tint_src_dir}/utils/containers",
- "${tint_src_dir}/utils/diagnostic",
"${tint_src_dir}/utils/ice",
"${tint_src_dir}/utils/macros",
"${tint_src_dir}/utils/math",
"${tint_src_dir}/utils/memory",
"${tint_src_dir}/utils/result",
"${tint_src_dir}/utils/rtti",
- "${tint_src_dir}/utils/text",
]
}
}
diff --git a/src/tint/lang/core/BUILD.bazel b/src/tint/lang/core/BUILD.bazel
index d97a08c..0da567e 100644
--- a/src/tint/lang/core/BUILD.bazel
+++ b/src/tint/lang/core/BUILD.bazel
@@ -77,7 +77,6 @@
deps = [
"//src/tint/utils",
"//src/tint/utils/containers",
- "//src/tint/utils/diagnostic",
"//src/tint/utils/ice",
"//src/tint/utils/macros",
"//src/tint/utils/math",
@@ -148,14 +147,12 @@
"//src/tint/lang/core",
"//src/tint/utils",
"//src/tint/utils/containers",
- "//src/tint/utils/diagnostic",
"//src/tint/utils/ice",
"//src/tint/utils/macros",
"//src/tint/utils/math",
"//src/tint/utils/memory",
"//src/tint/utils/result",
"//src/tint/utils/rtti",
- "//src/tint/utils/text",
"@benchmark",
"//src/utils",
],
diff --git a/src/tint/lang/core/BUILD.cmake b/src/tint/lang/core/BUILD.cmake
index 916838e..ff90ada 100644
--- a/src/tint/lang/core/BUILD.cmake
+++ b/src/tint/lang/core/BUILD.cmake
@@ -82,7 +82,6 @@
tint_target_add_dependencies(tint_lang_core lib
tint_utils
tint_utils_containers
- tint_utils_diagnostic
tint_utils_ice
tint_utils_macros
tint_utils_math
@@ -159,14 +158,12 @@
tint_lang_core
tint_utils
tint_utils_containers
- tint_utils_diagnostic
tint_utils_ice
tint_utils_macros
tint_utils_math
tint_utils_memory
tint_utils_result
tint_utils_rtti
- tint_utils_text
)
tint_target_add_external_dependencies(tint_lang_core_bench bench
diff --git a/src/tint/lang/core/BUILD.gn b/src/tint/lang/core/BUILD.gn
index 8d70582..a6c0c1f 100644
--- a/src/tint/lang/core/BUILD.gn
+++ b/src/tint/lang/core/BUILD.gn
@@ -82,7 +82,6 @@
"${dawn_root}/src/utils:utils",
"${tint_src_dir}/utils",
"${tint_src_dir}/utils/containers",
- "${tint_src_dir}/utils/diagnostic",
"${tint_src_dir}/utils/ice",
"${tint_src_dir}/utils/macros",
"${tint_src_dir}/utils/math",
@@ -149,14 +148,12 @@
"${tint_src_dir}/lang/core",
"${tint_src_dir}/utils",
"${tint_src_dir}/utils/containers",
- "${tint_src_dir}/utils/diagnostic",
"${tint_src_dir}/utils/ice",
"${tint_src_dir}/utils/macros",
"${tint_src_dir}/utils/math",
"${tint_src_dir}/utils/memory",
"${tint_src_dir}/utils/result",
"${tint_src_dir}/utils/rtti",
- "${tint_src_dir}/utils/text",
]
}
}
diff --git a/src/tint/lang/core/common/BUILD.bazel b/src/tint/lang/core/common/BUILD.bazel
index 2f5a134..aa49f4e 100644
--- a/src/tint/lang/core/common/BUILD.bazel
+++ b/src/tint/lang/core/common/BUILD.bazel
@@ -48,14 +48,12 @@
"//src/tint/api/common",
"//src/tint/utils",
"//src/tint/utils/containers",
- "//src/tint/utils/diagnostic",
"//src/tint/utils/ice",
"//src/tint/utils/macros",
"//src/tint/utils/math",
"//src/tint/utils/memory",
"//src/tint/utils/result",
"//src/tint/utils/rtti",
- "//src/tint/utils/text",
"//src/utils",
],
copts = COPTS,
diff --git a/src/tint/lang/core/common/BUILD.cmake b/src/tint/lang/core/common/BUILD.cmake
index de554b7..25183f2 100644
--- a/src/tint/lang/core/common/BUILD.cmake
+++ b/src/tint/lang/core/common/BUILD.cmake
@@ -47,14 +47,12 @@
tint_api_common
tint_utils
tint_utils_containers
- tint_utils_diagnostic
tint_utils_ice
tint_utils_macros
tint_utils_math
tint_utils_memory
tint_utils_result
tint_utils_rtti
- tint_utils_text
)
tint_target_add_external_dependencies(tint_lang_core_common lib
diff --git a/src/tint/lang/core/common/BUILD.gn b/src/tint/lang/core/common/BUILD.gn
index 8343eaf..eb6ff04 100644
--- a/src/tint/lang/core/common/BUILD.gn
+++ b/src/tint/lang/core/common/BUILD.gn
@@ -49,13 +49,11 @@
"${tint_src_dir}/api/common",
"${tint_src_dir}/utils",
"${tint_src_dir}/utils/containers",
- "${tint_src_dir}/utils/diagnostic",
"${tint_src_dir}/utils/ice",
"${tint_src_dir}/utils/macros",
"${tint_src_dir}/utils/math",
"${tint_src_dir}/utils/memory",
"${tint_src_dir}/utils/result",
"${tint_src_dir}/utils/rtti",
- "${tint_src_dir}/utils/text",
]
}
diff --git a/src/tint/lang/core/ir/analysis/BUILD.bazel b/src/tint/lang/core/ir/analysis/BUILD.bazel
index 6e8e286..5231fd1 100644
--- a/src/tint/lang/core/ir/analysis/BUILD.bazel
+++ b/src/tint/lang/core/ir/analysis/BUILD.bazel
@@ -54,7 +54,6 @@
"//src/tint/lang/core/type",
"//src/tint/utils",
"//src/tint/utils/containers",
- "//src/tint/utils/diagnostic",
"//src/tint/utils/ice",
"//src/tint/utils/macros",
"//src/tint/utils/math",
diff --git a/src/tint/lang/core/ir/analysis/BUILD.cmake b/src/tint/lang/core/ir/analysis/BUILD.cmake
index d2896ad..c71f7f0 100644
--- a/src/tint/lang/core/ir/analysis/BUILD.cmake
+++ b/src/tint/lang/core/ir/analysis/BUILD.cmake
@@ -53,7 +53,6 @@
tint_lang_core_type
tint_utils
tint_utils_containers
- tint_utils_diagnostic
tint_utils_ice
tint_utils_macros
tint_utils_math
diff --git a/src/tint/lang/core/ir/analysis/BUILD.gn b/src/tint/lang/core/ir/analysis/BUILD.gn
index ba4efb0..59425c1 100644
--- a/src/tint/lang/core/ir/analysis/BUILD.gn
+++ b/src/tint/lang/core/ir/analysis/BUILD.gn
@@ -59,7 +59,6 @@
"${tint_src_dir}/lang/core/type",
"${tint_src_dir}/utils",
"${tint_src_dir}/utils/containers",
- "${tint_src_dir}/utils/diagnostic",
"${tint_src_dir}/utils/ice",
"${tint_src_dir}/utils/macros",
"${tint_src_dir}/utils/math",
diff --git a/src/tint/lang/core/ir/transform/prepare_push_constants.h b/src/tint/lang/core/ir/transform/prepare_push_constants.h
index 10e998b..89f91cd 100644
--- a/src/tint/lang/core/ir/transform/prepare_push_constants.h
+++ b/src/tint/lang/core/ir/transform/prepare_push_constants.h
@@ -31,8 +31,8 @@
#include <map>
#include "src/tint/utils/containers/hashmap.h"
+#include "src/tint/utils/diagnostic/diagnostic.h"
#include "src/tint/utils/reflection.h"
-#include "src/tint/utils/result/result.h"
#include "src/tint/utils/symbol/symbol.h"
// Forward declarations.
diff --git a/src/tint/lang/hlsl/type/BUILD.bazel b/src/tint/lang/hlsl/type/BUILD.bazel
index 08c3d32..3e17408 100644
--- a/src/tint/lang/hlsl/type/BUILD.bazel
+++ b/src/tint/lang/hlsl/type/BUILD.bazel
@@ -55,7 +55,6 @@
"//src/tint/lang/core/type",
"//src/tint/utils",
"//src/tint/utils/containers",
- "//src/tint/utils/diagnostic",
"//src/tint/utils/ice",
"//src/tint/utils/macros",
"//src/tint/utils/math",
@@ -83,14 +82,12 @@
"//src/tint/lang/hlsl/type",
"//src/tint/utils",
"//src/tint/utils/containers",
- "//src/tint/utils/diagnostic",
"//src/tint/utils/ice",
"//src/tint/utils/macros",
"//src/tint/utils/math",
"//src/tint/utils/memory",
"//src/tint/utils/result",
"//src/tint/utils/rtti",
- "//src/tint/utils/text",
"@gtest",
"//src/utils",
],
diff --git a/src/tint/lang/hlsl/type/BUILD.cmake b/src/tint/lang/hlsl/type/BUILD.cmake
index dfdd55d..01d84fb 100644
--- a/src/tint/lang/hlsl/type/BUILD.cmake
+++ b/src/tint/lang/hlsl/type/BUILD.cmake
@@ -54,7 +54,6 @@
tint_lang_core_type
tint_utils
tint_utils_containers
- tint_utils_diagnostic
tint_utils_ice
tint_utils_macros
tint_utils_math
@@ -85,14 +84,12 @@
tint_lang_hlsl_type
tint_utils
tint_utils_containers
- tint_utils_diagnostic
tint_utils_ice
tint_utils_macros
tint_utils_math
tint_utils_memory
tint_utils_result
tint_utils_rtti
- tint_utils_text
)
tint_target_add_external_dependencies(tint_lang_hlsl_type_test test
diff --git a/src/tint/lang/hlsl/type/BUILD.gn b/src/tint/lang/hlsl/type/BUILD.gn
index 454f7f0e..6c6057e 100644
--- a/src/tint/lang/hlsl/type/BUILD.gn
+++ b/src/tint/lang/hlsl/type/BUILD.gn
@@ -60,7 +60,6 @@
"${tint_src_dir}/lang/core/type",
"${tint_src_dir}/utils",
"${tint_src_dir}/utils/containers",
- "${tint_src_dir}/utils/diagnostic",
"${tint_src_dir}/utils/ice",
"${tint_src_dir}/utils/macros",
"${tint_src_dir}/utils/math",
@@ -86,14 +85,12 @@
"${tint_src_dir}/lang/hlsl/type",
"${tint_src_dir}/utils",
"${tint_src_dir}/utils/containers",
- "${tint_src_dir}/utils/diagnostic",
"${tint_src_dir}/utils/ice",
"${tint_src_dir}/utils/macros",
"${tint_src_dir}/utils/math",
"${tint_src_dir}/utils/memory",
"${tint_src_dir}/utils/result",
"${tint_src_dir}/utils/rtti",
- "${tint_src_dir}/utils/text",
]
}
}
diff --git a/src/tint/lang/hlsl/writer/common/BUILD.bazel b/src/tint/lang/hlsl/writer/common/BUILD.bazel
index 3e75ce2..ecfeb05 100644
--- a/src/tint/lang/hlsl/writer/common/BUILD.bazel
+++ b/src/tint/lang/hlsl/writer/common/BUILD.bazel
@@ -80,14 +80,12 @@
"//src/tint/lang/hlsl/writer/common",
"//src/tint/utils",
"//src/tint/utils/containers",
- "//src/tint/utils/diagnostic",
"//src/tint/utils/ice",
"//src/tint/utils/macros",
"//src/tint/utils/math",
"//src/tint/utils/memory",
"//src/tint/utils/result",
"//src/tint/utils/rtti",
- "//src/tint/utils/text",
"@gtest",
"//src/utils",
],
diff --git a/src/tint/lang/hlsl/writer/common/BUILD.cmake b/src/tint/lang/hlsl/writer/common/BUILD.cmake
index ec321e9..26431f0 100644
--- a/src/tint/lang/hlsl/writer/common/BUILD.cmake
+++ b/src/tint/lang/hlsl/writer/common/BUILD.cmake
@@ -82,14 +82,12 @@
tint_lang_hlsl_writer_common
tint_utils
tint_utils_containers
- tint_utils_diagnostic
tint_utils_ice
tint_utils_macros
tint_utils_math
tint_utils_memory
tint_utils_result
tint_utils_rtti
- tint_utils_text
)
tint_target_add_external_dependencies(tint_lang_hlsl_writer_common_test test
diff --git a/src/tint/lang/hlsl/writer/common/BUILD.gn b/src/tint/lang/hlsl/writer/common/BUILD.gn
index 8e9ed68..67855a0 100644
--- a/src/tint/lang/hlsl/writer/common/BUILD.gn
+++ b/src/tint/lang/hlsl/writer/common/BUILD.gn
@@ -81,14 +81,12 @@
"${tint_src_dir}/lang/hlsl/writer/common",
"${tint_src_dir}/utils",
"${tint_src_dir}/utils/containers",
- "${tint_src_dir}/utils/diagnostic",
"${tint_src_dir}/utils/ice",
"${tint_src_dir}/utils/macros",
"${tint_src_dir}/utils/math",
"${tint_src_dir}/utils/memory",
"${tint_src_dir}/utils/result",
"${tint_src_dir}/utils/rtti",
- "${tint_src_dir}/utils/text",
]
}
}
diff --git a/src/tint/lang/msl/type/BUILD.bazel b/src/tint/lang/msl/type/BUILD.bazel
index ada0c26..97b0322 100644
--- a/src/tint/lang/msl/type/BUILD.bazel
+++ b/src/tint/lang/msl/type/BUILD.bazel
@@ -53,7 +53,6 @@
"//src/tint/lang/core/type",
"//src/tint/utils",
"//src/tint/utils/containers",
- "//src/tint/utils/diagnostic",
"//src/tint/utils/ice",
"//src/tint/utils/macros",
"//src/tint/utils/math",
diff --git a/src/tint/lang/msl/type/BUILD.cmake b/src/tint/lang/msl/type/BUILD.cmake
index 56ec7d1..4f3272a 100644
--- a/src/tint/lang/msl/type/BUILD.cmake
+++ b/src/tint/lang/msl/type/BUILD.cmake
@@ -52,7 +52,6 @@
tint_lang_core_type
tint_utils
tint_utils_containers
- tint_utils_diagnostic
tint_utils_ice
tint_utils_macros
tint_utils_math
diff --git a/src/tint/lang/msl/type/BUILD.gn b/src/tint/lang/msl/type/BUILD.gn
index ab0c474..fa187ff 100644
--- a/src/tint/lang/msl/type/BUILD.gn
+++ b/src/tint/lang/msl/type/BUILD.gn
@@ -58,7 +58,6 @@
"${tint_src_dir}/lang/core/type",
"${tint_src_dir}/utils",
"${tint_src_dir}/utils/containers",
- "${tint_src_dir}/utils/diagnostic",
"${tint_src_dir}/utils/ice",
"${tint_src_dir}/utils/macros",
"${tint_src_dir}/utils/math",
diff --git a/src/tint/lang/msl/writer/common/BUILD.bazel b/src/tint/lang/msl/writer/common/BUILD.bazel
index 89e8002..f256e0f 100644
--- a/src/tint/lang/msl/writer/common/BUILD.bazel
+++ b/src/tint/lang/msl/writer/common/BUILD.bazel
@@ -85,7 +85,6 @@
"//src/tint/lang/core/type",
"//src/tint/utils",
"//src/tint/utils/containers",
- "//src/tint/utils/diagnostic",
"//src/tint/utils/ice",
"//src/tint/utils/macros",
"//src/tint/utils/math",
diff --git a/src/tint/lang/msl/writer/common/BUILD.cmake b/src/tint/lang/msl/writer/common/BUILD.cmake
index bd173cc..fb7303f 100644
--- a/src/tint/lang/msl/writer/common/BUILD.cmake
+++ b/src/tint/lang/msl/writer/common/BUILD.cmake
@@ -92,7 +92,6 @@
tint_lang_core_type
tint_utils
tint_utils_containers
- tint_utils_diagnostic
tint_utils_ice
tint_utils_macros
tint_utils_math
diff --git a/src/tint/lang/msl/writer/common/BUILD.gn b/src/tint/lang/msl/writer/common/BUILD.gn
index a1fb165..4f31f0c 100644
--- a/src/tint/lang/msl/writer/common/BUILD.gn
+++ b/src/tint/lang/msl/writer/common/BUILD.gn
@@ -90,7 +90,6 @@
"${tint_src_dir}/lang/core/type",
"${tint_src_dir}/utils",
"${tint_src_dir}/utils/containers",
- "${tint_src_dir}/utils/diagnostic",
"${tint_src_dir}/utils/ice",
"${tint_src_dir}/utils/macros",
"${tint_src_dir}/utils/math",
diff --git a/src/tint/lang/spirv/reader/common/BUILD.bazel b/src/tint/lang/spirv/reader/common/BUILD.bazel
index 7ce0971..349e1c9 100644
--- a/src/tint/lang/spirv/reader/common/BUILD.bazel
+++ b/src/tint/lang/spirv/reader/common/BUILD.bazel
@@ -50,14 +50,12 @@
"//src/tint/lang/wgsl/features",
"//src/tint/utils",
"//src/tint/utils/containers",
- "//src/tint/utils/diagnostic",
"//src/tint/utils/ice",
"//src/tint/utils/macros",
"//src/tint/utils/math",
"//src/tint/utils/memory",
"//src/tint/utils/result",
"//src/tint/utils/rtti",
- "//src/tint/utils/text",
"//src/utils",
],
copts = COPTS,
diff --git a/src/tint/lang/spirv/reader/common/BUILD.cmake b/src/tint/lang/spirv/reader/common/BUILD.cmake
index 6184f26..c076638 100644
--- a/src/tint/lang/spirv/reader/common/BUILD.cmake
+++ b/src/tint/lang/spirv/reader/common/BUILD.cmake
@@ -51,14 +51,12 @@
tint_lang_wgsl_features
tint_utils
tint_utils_containers
- tint_utils_diagnostic
tint_utils_ice
tint_utils_macros
tint_utils_math
tint_utils_memory
tint_utils_result
tint_utils_rtti
- tint_utils_text
)
tint_target_add_external_dependencies(tint_lang_spirv_reader_common lib
diff --git a/src/tint/lang/spirv/reader/common/BUILD.gn b/src/tint/lang/spirv/reader/common/BUILD.gn
index 9eef56b..38bd043 100644
--- a/src/tint/lang/spirv/reader/common/BUILD.gn
+++ b/src/tint/lang/spirv/reader/common/BUILD.gn
@@ -55,14 +55,12 @@
"${tint_src_dir}/lang/wgsl/features",
"${tint_src_dir}/utils",
"${tint_src_dir}/utils/containers",
- "${tint_src_dir}/utils/diagnostic",
"${tint_src_dir}/utils/ice",
"${tint_src_dir}/utils/macros",
"${tint_src_dir}/utils/math",
"${tint_src_dir}/utils/memory",
"${tint_src_dir}/utils/result",
"${tint_src_dir}/utils/rtti",
- "${tint_src_dir}/utils/text",
]
}
}
diff --git a/src/tint/lang/spirv/type/BUILD.bazel b/src/tint/lang/spirv/type/BUILD.bazel
index 6dc6a3d..eb94490 100644
--- a/src/tint/lang/spirv/type/BUILD.bazel
+++ b/src/tint/lang/spirv/type/BUILD.bazel
@@ -53,7 +53,6 @@
"//src/tint/lang/core/type",
"//src/tint/utils",
"//src/tint/utils/containers",
- "//src/tint/utils/diagnostic",
"//src/tint/utils/ice",
"//src/tint/utils/macros",
"//src/tint/utils/math",
diff --git a/src/tint/lang/spirv/type/BUILD.cmake b/src/tint/lang/spirv/type/BUILD.cmake
index dbf5659..24e7a2a 100644
--- a/src/tint/lang/spirv/type/BUILD.cmake
+++ b/src/tint/lang/spirv/type/BUILD.cmake
@@ -52,7 +52,6 @@
tint_lang_core_type
tint_utils
tint_utils_containers
- tint_utils_diagnostic
tint_utils_ice
tint_utils_macros
tint_utils_math
diff --git a/src/tint/lang/spirv/type/BUILD.gn b/src/tint/lang/spirv/type/BUILD.gn
index 36a9590..59bc815 100644
--- a/src/tint/lang/spirv/type/BUILD.gn
+++ b/src/tint/lang/spirv/type/BUILD.gn
@@ -58,7 +58,6 @@
"${tint_src_dir}/lang/core/type",
"${tint_src_dir}/utils",
"${tint_src_dir}/utils/containers",
- "${tint_src_dir}/utils/diagnostic",
"${tint_src_dir}/utils/ice",
"${tint_src_dir}/utils/macros",
"${tint_src_dir}/utils/math",
diff --git a/src/tint/lang/wgsl/common/BUILD.bazel b/src/tint/lang/wgsl/common/BUILD.bazel
index c6b0472..253e30c 100644
--- a/src/tint/lang/wgsl/common/BUILD.bazel
+++ b/src/tint/lang/wgsl/common/BUILD.bazel
@@ -49,14 +49,12 @@
"//src/tint/lang/wgsl/features",
"//src/tint/utils",
"//src/tint/utils/containers",
- "//src/tint/utils/diagnostic",
"//src/tint/utils/ice",
"//src/tint/utils/macros",
"//src/tint/utils/math",
"//src/tint/utils/memory",
"//src/tint/utils/result",
"//src/tint/utils/rtti",
- "//src/tint/utils/text",
"//src/utils",
],
copts = COPTS,
@@ -74,14 +72,12 @@
"//src/tint/lang/wgsl/features",
"//src/tint/utils",
"//src/tint/utils/containers",
- "//src/tint/utils/diagnostic",
"//src/tint/utils/ice",
"//src/tint/utils/macros",
"//src/tint/utils/math",
"//src/tint/utils/memory",
"//src/tint/utils/result",
"//src/tint/utils/rtti",
- "//src/tint/utils/text",
"@gtest",
"//src/utils",
],
diff --git a/src/tint/lang/wgsl/common/BUILD.cmake b/src/tint/lang/wgsl/common/BUILD.cmake
index a01fb2b..84e9b08 100644
--- a/src/tint/lang/wgsl/common/BUILD.cmake
+++ b/src/tint/lang/wgsl/common/BUILD.cmake
@@ -48,14 +48,12 @@
tint_lang_wgsl_features
tint_utils
tint_utils_containers
- tint_utils_diagnostic
tint_utils_ice
tint_utils_macros
tint_utils_math
tint_utils_memory
tint_utils_result
tint_utils_rtti
- tint_utils_text
)
tint_target_add_external_dependencies(tint_lang_wgsl_common lib
@@ -76,14 +74,12 @@
tint_lang_wgsl_features
tint_utils
tint_utils_containers
- tint_utils_diagnostic
tint_utils_ice
tint_utils_macros
tint_utils_math
tint_utils_memory
tint_utils_result
tint_utils_rtti
- tint_utils_text
)
tint_target_add_external_dependencies(tint_lang_wgsl_common_test test
diff --git a/src/tint/lang/wgsl/common/BUILD.gn b/src/tint/lang/wgsl/common/BUILD.gn
index 75ba063..097a7dc 100644
--- a/src/tint/lang/wgsl/common/BUILD.gn
+++ b/src/tint/lang/wgsl/common/BUILD.gn
@@ -54,14 +54,12 @@
"${tint_src_dir}/lang/wgsl/features",
"${tint_src_dir}/utils",
"${tint_src_dir}/utils/containers",
- "${tint_src_dir}/utils/diagnostic",
"${tint_src_dir}/utils/ice",
"${tint_src_dir}/utils/macros",
"${tint_src_dir}/utils/math",
"${tint_src_dir}/utils/memory",
"${tint_src_dir}/utils/result",
"${tint_src_dir}/utils/rtti",
- "${tint_src_dir}/utils/text",
]
}
if (tint_build_unittests) {
@@ -75,14 +73,12 @@
"${tint_src_dir}/lang/wgsl/features",
"${tint_src_dir}/utils",
"${tint_src_dir}/utils/containers",
- "${tint_src_dir}/utils/diagnostic",
"${tint_src_dir}/utils/ice",
"${tint_src_dir}/utils/macros",
"${tint_src_dir}/utils/math",
"${tint_src_dir}/utils/memory",
"${tint_src_dir}/utils/result",
"${tint_src_dir}/utils/rtti",
- "${tint_src_dir}/utils/text",
]
}
}
diff --git a/src/tint/lang/wgsl/reader/BUILD.bazel b/src/tint/lang/wgsl/reader/BUILD.bazel
index c146777..e82f8c7 100644
--- a/src/tint/lang/wgsl/reader/BUILD.bazel
+++ b/src/tint/lang/wgsl/reader/BUILD.bazel
@@ -93,14 +93,12 @@
"//src/tint/lang/wgsl/features",
"//src/tint/utils",
"//src/tint/utils/containers",
- "//src/tint/utils/diagnostic",
"//src/tint/utils/ice",
"//src/tint/utils/macros",
"//src/tint/utils/math",
"//src/tint/utils/memory",
"//src/tint/utils/result",
"//src/tint/utils/rtti",
- "//src/tint/utils/text",
"@gtest",
"//src/utils",
] + select({
diff --git a/src/tint/lang/wgsl/reader/BUILD.cmake b/src/tint/lang/wgsl/reader/BUILD.cmake
index 31294d0..f4afca8 100644
--- a/src/tint/lang/wgsl/reader/BUILD.cmake
+++ b/src/tint/lang/wgsl/reader/BUILD.cmake
@@ -105,14 +105,12 @@
tint_lang_wgsl_features
tint_utils
tint_utils_containers
- tint_utils_diagnostic
tint_utils_ice
tint_utils_macros
tint_utils_math
tint_utils_memory
tint_utils_result
tint_utils_rtti
- tint_utils_text
)
tint_target_add_external_dependencies(tint_lang_wgsl_reader_test test
diff --git a/src/tint/lang/wgsl/reader/BUILD.gn b/src/tint/lang/wgsl/reader/BUILD.gn
index df8bf31..379eb22 100644
--- a/src/tint/lang/wgsl/reader/BUILD.gn
+++ b/src/tint/lang/wgsl/reader/BUILD.gn
@@ -97,14 +97,12 @@
"${tint_src_dir}/lang/wgsl/features",
"${tint_src_dir}/utils",
"${tint_src_dir}/utils/containers",
- "${tint_src_dir}/utils/diagnostic",
"${tint_src_dir}/utils/ice",
"${tint_src_dir}/utils/macros",
"${tint_src_dir}/utils/math",
"${tint_src_dir}/utils/memory",
"${tint_src_dir}/utils/result",
"${tint_src_dir}/utils/rtti",
- "${tint_src_dir}/utils/text",
]
if (tint_build_wgsl_reader) {
diff --git a/src/tint/lang/wgsl/reader/lower/lower.h b/src/tint/lang/wgsl/reader/lower/lower.h
index 2e744ee..38678f3 100644
--- a/src/tint/lang/wgsl/reader/lower/lower.h
+++ b/src/tint/lang/wgsl/reader/lower/lower.h
@@ -29,7 +29,7 @@
#define SRC_TINT_LANG_WGSL_READER_LOWER_LOWER_H_
#include "src/tint/lang/core/ir/module.h"
-#include "src/tint/utils/result/result.h"
+#include "src/tint/utils/diagnostic/diagnostic.h"
namespace tint::wgsl::reader {
diff --git a/src/tint/utils/BUILD.bazel b/src/tint/utils/BUILD.bazel
index c17e9c5..532bf30 100644
--- a/src/tint/utils/BUILD.bazel
+++ b/src/tint/utils/BUILD.bazel
@@ -73,14 +73,12 @@
deps = [
"//src/tint/utils",
"//src/tint/utils/containers",
- "//src/tint/utils/diagnostic",
"//src/tint/utils/ice",
"//src/tint/utils/macros",
"//src/tint/utils/math",
"//src/tint/utils/memory",
"//src/tint/utils/result",
"//src/tint/utils/rtti",
- "//src/tint/utils/text",
"@gtest",
"//src/utils",
],
diff --git a/src/tint/utils/BUILD.cmake b/src/tint/utils/BUILD.cmake
index 23441d4..1dad574 100644
--- a/src/tint/utils/BUILD.cmake
+++ b/src/tint/utils/BUILD.cmake
@@ -92,14 +92,12 @@
tint_target_add_dependencies(tint_utils_test test
tint_utils
tint_utils_containers
- tint_utils_diagnostic
tint_utils_ice
tint_utils_macros
tint_utils_math
tint_utils_memory
tint_utils_result
tint_utils_rtti
- tint_utils_text
)
tint_target_add_external_dependencies(tint_utils_test test
diff --git a/src/tint/utils/BUILD.gn b/src/tint/utils/BUILD.gn
index 1ef8cee..cf53ab3 100644
--- a/src/tint/utils/BUILD.gn
+++ b/src/tint/utils/BUILD.gn
@@ -74,14 +74,12 @@
"${tint_src_dir}:gmock_and_gtest",
"${tint_src_dir}/utils",
"${tint_src_dir}/utils/containers",
- "${tint_src_dir}/utils/diagnostic",
"${tint_src_dir}/utils/ice",
"${tint_src_dir}/utils/macros",
"${tint_src_dir}/utils/math",
"${tint_src_dir}/utils/memory",
"${tint_src_dir}/utils/result",
"${tint_src_dir}/utils/rtti",
- "${tint_src_dir}/utils/text",
]
}
}
diff --git a/src/tint/utils/reflection.cc b/src/tint/utils/reflection.cc
index 72bbcf0..33cc6af 100644
--- a/src/tint/utils/reflection.cc
+++ b/src/tint/utils/reflection.cc
@@ -27,21 +27,16 @@
#include "src/tint/utils/reflection.h"
-#include <memory>
-#include <string>
-
#include "src/tint/utils/math/math.h"
#include "src/tint/utils/text/string_stream.h"
namespace tint::reflection::detail {
-diag::Result<SuccessType> CheckAllFieldsReflected(VectorRef<ReflectedFieldInfo> fields,
- std::string_view class_name,
- size_t class_size,
- size_t class_align,
- bool class_is_castable,
- std::string_view reflect_file,
- uint32_t reflect_line) {
+Result<SuccessType> CheckAllFieldsReflected(VectorRef<ReflectedFieldInfo> fields,
+ std::string_view class_name,
+ size_t class_size,
+ size_t class_align,
+ bool class_is_castable) {
size_t calculated_offset = class_is_castable ? sizeof(CastableBase) : 0;
for (auto& field : fields) {
calculated_offset = RoundUp(field.align, calculated_offset);
@@ -51,13 +46,7 @@
<< "'.\n"
"Expected field offset of "
<< calculated_offset << " bytes, but field was at " << field.offset << " bytes";
- diag::Diagnostic err;
- err.message = msg.str();
- err.owned_file = std::make_shared<Source::File>(std::string(reflect_file), "");
- err.source.file = err.owned_file.get();
- err.source.range.begin.line = reflect_line;
- err.source.range.end.line = reflect_line;
- return diag::Failure{std::move(err)};
+ return Failure{msg.str()};
}
calculated_offset += field.size;
}
@@ -68,13 +57,7 @@
<< ", ...) missing fields at end of class\n"
"Expected class size of "
<< calculated_offset << " bytes, but class is " << class_size << " bytes";
- diag::Diagnostic err;
- err.message = msg.str();
- err.owned_file = std::make_shared<Source::File>(std::string(reflect_file), "");
- err.source.file = err.owned_file.get();
- err.source.range.begin.line = reflect_line;
- err.source.range.end.line = reflect_line;
- return diag::Failure{std::move(err)};
+ return Failure{msg.str()};
}
return Success;
}
diff --git a/src/tint/utils/reflection.h b/src/tint/utils/reflection.h
index b3ec51b..7cf800a 100644
--- a/src/tint/utils/reflection.h
+++ b/src/tint/utils/reflection.h
@@ -34,9 +34,9 @@
#include <utility>
#include "src/tint/utils/containers/vector.h"
-#include "src/tint/utils/diagnostic/diagnostic.h"
#include "src/tint/utils/macros/foreach.h"
#include "src/tint/utils/memory/aligned_storage.h"
+#include "src/tint/utils/result/result.h"
/// Forward declarations
namespace tint {
@@ -82,18 +82,16 @@
/// @returns Success if the sequential fields of @p fields have the expected offsets, and aligned
/// sum match the class size @p class_size.
-diag::Result<SuccessType> CheckAllFieldsReflected(VectorRef<ReflectedFieldInfo> fields,
- std::string_view class_name,
- size_t class_size,
- size_t class_align,
- bool class_is_castable,
- std::string_view reflect_file,
- uint32_t reflect_line);
+Result<SuccessType> CheckAllFieldsReflected(VectorRef<ReflectedFieldInfo> fields,
+ std::string_view class_name,
+ size_t class_size,
+ size_t class_align,
+ bool class_is_castable);
/// @returns Success if the TINT_REFLECT() reflected fields of @tparam CLASS match the declaration
/// order, do not have any gaps, and fully account for the entire size of the class.
template <typename CLASS>
-diag::Result<SuccessType> CheckAllFieldsReflected() {
+Result<SuccessType> CheckAllFieldsReflected() {
static_assert(!std::has_virtual_destructor_v<CLASS> || std::is_base_of_v<CastableBase, CLASS>,
"TINT_ASSERT_ALL_FIELDS_REFLECTED() cannot be used on virtual classes, except "
"for types using the tint::Castable framework");
@@ -108,8 +106,7 @@
fields.Push({name, sizeof(T), alignof(T), offset});
});
return CheckAllFieldsReflected(fields, R::Name, sizeof(CLASS), alignof(CLASS),
- std::is_base_of_v<CastableBase, CLASS>, R::ReflectFile,
- R::ReflectLine);
+ std::is_base_of_v<CastableBase, CLASS>);
}
} // namespace tint::reflection::detail
@@ -184,8 +181,6 @@
using Class = CLASS; \
using Fields = std::tuple<TINT_FOREACH(TINT_REFLECT_FIELD_TYPE, __VA_ARGS__) void>; \
[[maybe_unused]] static constexpr std::string_view Name = #CLASS; \
- [[maybe_unused]] static constexpr std::string_view ReflectFile = __FILE__; \
- [[maybe_unused]] static constexpr uint32_t ReflectLine = __LINE__; \
template <typename OBJECT, typename CB> \
[[maybe_unused]] static constexpr void ForeachField(OBJECT&& object, CB&& callback) { \
TINT_FOREACH(TINT_REFLECT_CALLBACK_FIELD, __VA_ARGS__) \
diff --git a/src/tint/utils/reflection_test.cc b/src/tint/utils/reflection_test.cc
index 4671efa..f2c45e8 100644
--- a/src/tint/utils/reflection_test.cc
+++ b/src/tint/utils/reflection_test.cc
@@ -137,24 +137,20 @@
auto missing_first = reflection::detail::CheckAllFieldsReflected<MissingFirst>();
ASSERT_NE(missing_first, Success);
- EXPECT_THAT(missing_first.Failure().reason.Str(), testing::HasSubstr("reflection_test.cc"));
- EXPECT_THAT(missing_first.Failure().reason.Str(),
- testing::HasSubstr(R"(error: TINT_REFLECT(MissingFirst, ...) field mismatch at 'b'.
+ EXPECT_THAT(missing_first.Failure().reason,
+ testing::HasSubstr(R"(TINT_REFLECT(MissingFirst, ...) field mismatch at 'b'.
Expected field offset of 0 bytes, but field was at 4 bytes)"));
auto missing_mid = reflection::detail::CheckAllFieldsReflected<MissingMid>();
ASSERT_NE(missing_mid, Success);
- EXPECT_THAT(missing_mid.Failure().reason.Str(), testing::HasSubstr("reflection_test.cc"));
- EXPECT_THAT(missing_mid.Failure().reason.Str(),
- testing::HasSubstr(R"(error: TINT_REFLECT(MissingMid, ...) field mismatch at 'c'.
+ EXPECT_THAT(missing_mid.Failure().reason,
+ testing::HasSubstr(R"(TINT_REFLECT(MissingMid, ...) field mismatch at 'c'.
Expected field offset of 4 bytes, but field was at 8 bytes)"));
auto missing_last = reflection::detail::CheckAllFieldsReflected<MissingLast>();
ASSERT_NE(missing_last, Success);
- EXPECT_THAT(missing_last.Failure().reason.Str(), testing::HasSubstr("reflection_test.cc"));
- EXPECT_THAT(
- missing_last.Failure().reason.Str(),
- testing::HasSubstr(R"(error: TINT_REFLECT(MissingLast, ...) missing fields at end of class
+ EXPECT_THAT(missing_last.Failure().reason,
+ testing::HasSubstr(R"(TINT_REFLECT(MissingLast, ...) missing fields at end of class
Expected class size of 8 bytes, but class is 12 bytes)"));
}
