[shuffle] Move utils to new structure.
This CL moves the utils folder into the `core` folder and
updates the includes. The namespaces and build groups are not updated in
this CL, just the code move.
Bug: tint:1988
Change-Id: I781545ca24c6f8af208d382db41a9e07b0c20858
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/142161
Reviewed-by: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
diff --git a/src/tint/BUILD.gn b/src/tint/BUILD.gn
index 2060c17..c5705ca 100644
--- a/src/tint/BUILD.gn
+++ b/src/tint/BUILD.gn
@@ -122,19 +122,19 @@
###############################################################################
source_set("tint_utils_io") {
sources = [
- "utils/io/command.h",
- "utils/io/tmpfile.h",
+ "core/io/command.h",
+ "core/io/tmpfile.h",
]
if (is_linux || is_mac) {
- sources += [ "utils/io/command_posix.cc" ]
- sources += [ "utils/io/tmpfile_posix.cc" ]
+ sources += [ "core/io/command_posix.cc" ]
+ sources += [ "core/io/tmpfile_posix.cc" ]
} else if (is_win) {
- sources += [ "utils/io/command_windows.cc" ]
- sources += [ "utils/io/tmpfile_windows.cc" ]
+ sources += [ "core/io/command_windows.cc" ]
+ sources += [ "core/io/tmpfile_windows.cc" ]
} else {
- sources += [ "utils/io/command_other.cc" ]
- sources += [ "utils/io/tmpfile_other.cc" ]
+ sources += [ "core/io/command_other.cc" ]
+ sources += [ "core/io/tmpfile_other.cc" ]
}
deps = [ ":libtint_utils_src" ]
@@ -215,6 +215,43 @@
libtint_source_set("libtint_utils_src") {
sources = [
+ "core/bitcast.h",
+ "core/bitset.h",
+ "core/block_allocator.h",
+ "core/bump_allocator.h",
+ "core/castable.cc",
+ "core/castable.h",
+ "core/cli.cc",
+ "core/cli.h",
+ "core/compiler_macros.h",
+ "core/concat.h",
+ "core/crc32.h",
+ "core/debugger.cc",
+ "core/debugger.h",
+ "core/defer.h",
+ "core/enum_set.h",
+ "core/foreach_macro.h",
+ "core/hash.h",
+ "core/hashmap.h",
+ "core/hashmap_base.h",
+ "core/hashset.h",
+ "core/map.h",
+ "core/math.h",
+ "core/parse_num.cc",
+ "core/parse_num.h",
+ "core/predicates.h",
+ "core/scoped_assignment.h",
+ "core/slice.h",
+ "core/string.cc",
+ "core/string.h",
+ "core/string_stream.cc",
+ "core/string_stream.h",
+ "core/traits.h",
+ "core/unicode.cc",
+ "core/unicode.h",
+ "core/unique_allocator.h",
+ "core/unique_vector.h",
+ "core/vector.h",
"debug.cc",
"debug.h",
"diagnostic/diagnostic.cc",
@@ -226,43 +263,6 @@
"source.cc",
"source.h",
"switch.h",
- "utils/bitcast.h",
- "utils/bitset.h",
- "utils/block_allocator.h",
- "utils/bump_allocator.h",
- "utils/castable.cc",
- "utils/castable.h",
- "utils/cli.cc",
- "utils/cli.h",
- "utils/compiler_macros.h",
- "utils/concat.h",
- "utils/crc32.h",
- "utils/debugger.cc",
- "utils/debugger.h",
- "utils/defer.h",
- "utils/enum_set.h",
- "utils/foreach_macro.h",
- "utils/hash.h",
- "utils/hashmap.h",
- "utils/hashmap_base.h",
- "utils/hashset.h",
- "utils/map.h",
- "utils/math.h",
- "utils/parse_num.cc",
- "utils/parse_num.h",
- "utils/predicates.h",
- "utils/scoped_assignment.h",
- "utils/slice.h",
- "utils/string.cc",
- "utils/string.h",
- "utils/string_stream.cc",
- "utils/string_stream.h",
- "utils/traits.h",
- "utils/unicode.cc",
- "utils/unicode.h",
- "utils/unique_allocator.h",
- "utils/unique_vector.h",
- "utils/vector.h",
]
if (is_linux || is_mac) {
@@ -1923,38 +1923,38 @@
tint_unittests_source_set("tint_unittests_utils_src") {
sources = [
+ "core/bitcast_test.cc",
+ "core/bitset_test.cc",
+ "core/block_allocator_test.cc",
+ "core/bump_allocator_test.cc",
+ "core/castable_test.cc",
+ "core/cli_test.cc",
+ "core/crc32_test.cc",
+ "core/defer_test.cc",
+ "core/enum_set_test.cc",
+ "core/hash_test.cc",
+ "core/hashmap_test.cc",
+ "core/hashset_test.cc",
+ "core/io/command_test.cc",
+ "core/io/tmpfile_test.cc",
+ "core/map_test.cc",
+ "core/math_test.cc",
+ "core/predicates_test.cc",
+ "core/result_test.cc",
+ "core/reverse_test.cc",
+ "core/scoped_assignment_test.cc",
+ "core/slice_test.cc",
+ "core/string_stream_test.cc",
+ "core/string_test.cc",
+ "core/traits_test.cc",
+ "core/transform_test.cc",
+ "core/unicode_test.cc",
+ "core/unique_allocator_test.cc",
+ "core/unique_vector_test.cc",
+ "core/vector_test.cc",
"debug_test.cc",
"source_test.cc",
"switch_test.cc",
- "utils/bitcast_test.cc",
- "utils/bitset_test.cc",
- "utils/block_allocator_test.cc",
- "utils/bump_allocator_test.cc",
- "utils/castable_test.cc",
- "utils/cli_test.cc",
- "utils/crc32_test.cc",
- "utils/defer_test.cc",
- "utils/enum_set_test.cc",
- "utils/hash_test.cc",
- "utils/hashmap_test.cc",
- "utils/hashset_test.cc",
- "utils/io/command_test.cc",
- "utils/io/tmpfile_test.cc",
- "utils/map_test.cc",
- "utils/math_test.cc",
- "utils/predicates_test.cc",
- "utils/result_test.cc",
- "utils/reverse_test.cc",
- "utils/scoped_assignment_test.cc",
- "utils/slice_test.cc",
- "utils/string_stream_test.cc",
- "utils/string_test.cc",
- "utils/traits_test.cc",
- "utils/transform_test.cc",
- "utils/unicode_test.cc",
- "utils/unique_allocator_test.cc",
- "utils/unique_vector_test.cc",
- "utils/vector_test.cc",
]
deps = [ ":libtint_utils_src" ]
}
diff --git a/src/tint/CMakeLists.txt b/src/tint/CMakeLists.txt
index e171120..dc025a8 100644
--- a/src/tint/CMakeLists.txt
+++ b/src/tint/CMakeLists.txt
@@ -66,15 +66,15 @@
diagnostic/printer.h
source.cc
source.h
- utils/debugger.cc
- utils/debugger.h
- utils/unicode.cc
- utils/unicode.h
+ core/debugger.cc
+ core/debugger.h
+ core/unicode.cc
+ core/unicode.h
)
tint_default_compile_options(tint_diagnostic_utils)
if (TINT_ENABLE_BREAK_IN_DEBUGGER)
- set_source_files_properties(utils/debugger.cc
+ set_source_files_properties(core/debugger.cc
PROPERTIES COMPILE_DEFINITIONS "TINT_ENABLE_BREAK_IN_DEBUGGER=1" )
endif()
@@ -530,38 +530,38 @@
type/vector.h
type/void.cc
type/void.h
- utils/bitcast.h
- utils/bitset.h
- utils/block_allocator.h
- utils/bump_allocator.h
- utils/castable.cc
- utils/castable.h
- utils/cli.cc
- utils/cli.h
- utils/compiler_macros.h
- utils/concat.h
- utils/crc32.h
- utils/enum_set.h
- utils/foreach_macro.h
- utils/hash.h
- utils/hashmap_base.h
- utils/hashmap.h
- utils/hashset.h
- utils/map.h
- utils/math.h
- utils/parse_num.cc
- utils/parse_num.h
- utils/predicates.h
- utils/scoped_assignment.h
- utils/slice.h
- utils/string.cc
- utils/string.h
- utils/string_stream.cc
- utils/string_stream.h
- utils/traits.h
- utils/unique_allocator.h
- utils/unique_vector.h
- utils/vector.h
+ core/bitcast.h
+ core/bitset.h
+ core/block_allocator.h
+ core/bump_allocator.h
+ core/castable.cc
+ core/castable.h
+ core/cli.cc
+ core/cli.h
+ core/compiler_macros.h
+ core/concat.h
+ core/crc32.h
+ core/enum_set.h
+ core/foreach_macro.h
+ core/hash.h
+ core/hashmap_base.h
+ core/hashmap.h
+ core/hashset.h
+ core/map.h
+ core/math.h
+ core/parse_num.cc
+ core/parse_num.h
+ core/predicates.h
+ core/scoped_assignment.h
+ core/slice.h
+ core/string.cc
+ core/string.h
+ core/string_stream.cc
+ core/string_stream.h
+ core/traits.h
+ core/unique_allocator.h
+ core/unique_vector.h
+ core/vector.h
writer/append_vector.cc
writer/append_vector.h
writer/array_length_from_uniform_options.cc
@@ -875,10 +875,10 @@
## Tint IO utilities. Used by tint_val.
add_library(tint_utils_io
- utils/io/command_${TINT_OS_CC_SUFFIX}.cc
- utils/io/command.h
- utils/io/tmpfile_${TINT_OS_CC_SUFFIX}.cc
- utils/io/tmpfile.h
+ core/io/command_${TINT_OS_CC_SUFFIX}.cc
+ core/io/command.h
+ core/io/tmpfile_${TINT_OS_CC_SUFFIX}.cc
+ core/io/tmpfile.h
)
tint_default_compile_options(tint_utils_io)
target_link_libraries(tint_utils_io tint_diagnostic_utils)
@@ -1122,35 +1122,35 @@
type/type_test.cc
type/u32_test.cc
type/vector_test.cc
- utils/bitcast_test.cc
- utils/bitset_test.cc
- utils/block_allocator_test.cc
- utils/bump_allocator_test.cc
- utils/cli_test.cc
- utils/castable_test.cc
- utils/crc32_test.cc
- utils/defer_test.cc
- utils/enum_set_test.cc
- utils/hash_test.cc
- utils/io/command_test.cc
- utils/io/tmpfile_test.cc
- utils/hashmap_test.cc
- utils/hashset_test.cc
- utils/map_test.cc
- utils/math_test.cc
- utils/predicates_test.cc
- utils/result_test.cc
- utils/reverse_test.cc
- utils/scoped_assignment_test.cc
- utils/slice_test.cc
- utils/string_stream_test.cc
- utils/string_test.cc
- utils/traits_test.cc
- utils/transform_test.cc
- utils/unicode_test.cc
- utils/unique_allocator_test.cc
- utils/unique_vector_test.cc
- utils/vector_test.cc
+ core/bitcast_test.cc
+ core/bitset_test.cc
+ core/block_allocator_test.cc
+ core/bump_allocator_test.cc
+ core/cli_test.cc
+ core/castable_test.cc
+ core/crc32_test.cc
+ core/defer_test.cc
+ core/enum_set_test.cc
+ core/hash_test.cc
+ core/io/command_test.cc
+ core/io/tmpfile_test.cc
+ core/hashmap_test.cc
+ core/hashset_test.cc
+ core/map_test.cc
+ core/math_test.cc
+ core/predicates_test.cc
+ core/result_test.cc
+ core/reverse_test.cc
+ core/scoped_assignment_test.cc
+ core/slice_test.cc
+ core/string_stream_test.cc
+ core/string_test.cc
+ core/traits_test.cc
+ core/transform_test.cc
+ core/unicode_test.cc
+ core/unique_allocator_test.cc
+ core/unique_vector_test.cc
+ core/vector_test.cc
writer/append_vector_test.cc
writer/ast_text_generator_test.cc
writer/check_supported_extensions_test.cc
diff --git a/src/tint/bench/benchmark.cc b/src/tint/bench/benchmark.cc
index 115d0b2..993aafc 100644
--- a/src/tint/bench/benchmark.cc
+++ b/src/tint/bench/benchmark.cc
@@ -19,8 +19,8 @@
#include <utility>
#include <vector>
-#include "src/tint/utils/string.h"
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string.h"
+#include "src/tint/core/string_stream.h"
namespace tint::bench {
namespace {
diff --git a/src/tint/bench/benchmark.h b/src/tint/bench/benchmark.h
index 9d7a8c3..fd4dc95 100644
--- a/src/tint/bench/benchmark.h
+++ b/src/tint/bench/benchmark.h
@@ -20,7 +20,7 @@
#include <variant>
#include "benchmark/benchmark.h"
-#include "src/tint/utils/concat.h"
+#include "src/tint/core/concat.h"
#include "tint/tint.h"
namespace tint::bench {
diff --git a/src/tint/builtin/access.h b/src/tint/builtin/access.h
index afc0867..72330e6 100644
--- a/src/tint/builtin/access.h
+++ b/src/tint/builtin/access.h
@@ -23,7 +23,7 @@
#ifndef SRC_TINT_BUILTIN_ACCESS_H_
#define SRC_TINT_BUILTIN_ACCESS_H_
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::builtin {
diff --git a/src/tint/builtin/access.h.tmpl b/src/tint/builtin/access.h.tmpl
index dd5b034..df2a64f 100644
--- a/src/tint/builtin/access.h.tmpl
+++ b/src/tint/builtin/access.h.tmpl
@@ -17,7 +17,7 @@
#ifndef SRC_TINT_BUILTIN_ACCESS_H_
#define SRC_TINT_BUILTIN_ACCESS_H_
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::builtin {
diff --git a/src/tint/builtin/access_test.cc b/src/tint/builtin/access_test.cc
index 91786ef..c4ba77f 100644
--- a/src/tint/builtin/access_test.cc
+++ b/src/tint/builtin/access_test.cc
@@ -26,7 +26,7 @@
#include <string>
-#include "src/tint/utils/string.h"
+#include "src/tint/core/string.h"
namespace tint::builtin {
namespace {
diff --git a/src/tint/builtin/access_test.cc.tmpl b/src/tint/builtin/access_test.cc.tmpl
index 44cd3e7..fd884f7 100644
--- a/src/tint/builtin/access_test.cc.tmpl
+++ b/src/tint/builtin/access_test.cc.tmpl
@@ -20,7 +20,7 @@
#include <string>
-#include "src/tint/utils/string.h"
+#include "src/tint/core/string.h"
namespace tint::builtin {
namespace {
diff --git a/src/tint/builtin/address_space.h b/src/tint/builtin/address_space.h
index 5334301..40a7019 100644
--- a/src/tint/builtin/address_space.h
+++ b/src/tint/builtin/address_space.h
@@ -23,7 +23,7 @@
#ifndef SRC_TINT_BUILTIN_ADDRESS_SPACE_H_
#define SRC_TINT_BUILTIN_ADDRESS_SPACE_H_
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::builtin {
diff --git a/src/tint/builtin/address_space.h.tmpl b/src/tint/builtin/address_space.h.tmpl
index 44472d6..6407c2c 100644
--- a/src/tint/builtin/address_space.h.tmpl
+++ b/src/tint/builtin/address_space.h.tmpl
@@ -17,7 +17,7 @@
#ifndef SRC_TINT_BUILTIN_ADDRESS_SPACE_H_
#define SRC_TINT_BUILTIN_ADDRESS_SPACE_H_
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::builtin {
diff --git a/src/tint/builtin/address_space_test.cc b/src/tint/builtin/address_space_test.cc
index 1ca7023..b5c612a 100644
--- a/src/tint/builtin/address_space_test.cc
+++ b/src/tint/builtin/address_space_test.cc
@@ -26,7 +26,7 @@
#include <string>
-#include "src/tint/utils/string.h"
+#include "src/tint/core/string.h"
namespace tint::builtin {
namespace {
diff --git a/src/tint/builtin/address_space_test.cc.tmpl b/src/tint/builtin/address_space_test.cc.tmpl
index 586e7dd..9f6080e 100644
--- a/src/tint/builtin/address_space_test.cc.tmpl
+++ b/src/tint/builtin/address_space_test.cc.tmpl
@@ -20,7 +20,7 @@
#include <string>
-#include "src/tint/utils/string.h"
+#include "src/tint/core/string.h"
namespace tint::builtin {
namespace {
diff --git a/src/tint/builtin/attribute.h b/src/tint/builtin/attribute.h
index f9a1868..71393e8 100644
--- a/src/tint/builtin/attribute.h
+++ b/src/tint/builtin/attribute.h
@@ -23,7 +23,7 @@
#ifndef SRC_TINT_BUILTIN_ATTRIBUTE_H_
#define SRC_TINT_BUILTIN_ATTRIBUTE_H_
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
/// \cond DO_NOT_DOCUMENT
/// There is a bug in doxygen where this enum conflicts with the ast::Attribute
diff --git a/src/tint/builtin/attribute.h.tmpl b/src/tint/builtin/attribute.h.tmpl
index 5602c8f..172545f 100644
--- a/src/tint/builtin/attribute.h.tmpl
+++ b/src/tint/builtin/attribute.h.tmpl
@@ -17,7 +17,7 @@
#ifndef SRC_TINT_BUILTIN_ATTRIBUTE_H_
#define SRC_TINT_BUILTIN_ATTRIBUTE_H_
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
/// \cond DO_NOT_DOCUMENT
/// There is a bug in doxygen where this enum conflicts with the ast::Attribute
diff --git a/src/tint/builtin/attribute_test.cc b/src/tint/builtin/attribute_test.cc
index 33f557e..097ae69 100644
--- a/src/tint/builtin/attribute_test.cc
+++ b/src/tint/builtin/attribute_test.cc
@@ -26,7 +26,7 @@
#include <string>
-#include "src/tint/utils/string.h"
+#include "src/tint/core/string.h"
namespace tint::builtin {
namespace {
diff --git a/src/tint/builtin/attribute_test.cc.tmpl b/src/tint/builtin/attribute_test.cc.tmpl
index 0895d2a..93fa0de 100644
--- a/src/tint/builtin/attribute_test.cc.tmpl
+++ b/src/tint/builtin/attribute_test.cc.tmpl
@@ -20,7 +20,7 @@
#include <string>
-#include "src/tint/utils/string.h"
+#include "src/tint/core/string.h"
namespace tint::builtin {
namespace {
diff --git a/src/tint/builtin/builtin.h b/src/tint/builtin/builtin.h
index d891294..10a126a 100644
--- a/src/tint/builtin/builtin.h
+++ b/src/tint/builtin/builtin.h
@@ -23,7 +23,7 @@
#ifndef SRC_TINT_BUILTIN_BUILTIN_H_
#define SRC_TINT_BUILTIN_BUILTIN_H_
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::builtin {
diff --git a/src/tint/builtin/builtin.h.tmpl b/src/tint/builtin/builtin.h.tmpl
index 232cdb2..79fd6b3 100644
--- a/src/tint/builtin/builtin.h.tmpl
+++ b/src/tint/builtin/builtin.h.tmpl
@@ -18,7 +18,7 @@
#ifndef SRC_TINT_BUILTIN_BUILTIN_H_
#define SRC_TINT_BUILTIN_BUILTIN_H_
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::builtin {
diff --git a/src/tint/builtin/builtin_test.cc b/src/tint/builtin/builtin_test.cc
index ab8c4c6..69cb0c5 100644
--- a/src/tint/builtin/builtin_test.cc
+++ b/src/tint/builtin/builtin_test.cc
@@ -26,7 +26,7 @@
#include "gtest/gtest.h"
-#include "src/tint/utils/string.h"
+#include "src/tint/core/string.h"
namespace tint::builtin {
namespace {
diff --git a/src/tint/builtin/builtin_test.cc.tmpl b/src/tint/builtin/builtin_test.cc.tmpl
index ad463e3..968b4fc 100644
--- a/src/tint/builtin/builtin_test.cc.tmpl
+++ b/src/tint/builtin/builtin_test.cc.tmpl
@@ -21,7 +21,7 @@
#include "gtest/gtest.h"
-#include "src/tint/utils/string.h"
+#include "src/tint/core/string.h"
namespace tint::builtin {
namespace {
diff --git a/src/tint/builtin/builtin_value.h b/src/tint/builtin/builtin_value.h
index fc1f39b..42e96b9 100644
--- a/src/tint/builtin/builtin_value.h
+++ b/src/tint/builtin/builtin_value.h
@@ -23,7 +23,7 @@
#ifndef SRC_TINT_BUILTIN_BUILTIN_VALUE_H_
#define SRC_TINT_BUILTIN_BUILTIN_VALUE_H_
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::builtin {
diff --git a/src/tint/builtin/builtin_value.h.tmpl b/src/tint/builtin/builtin_value.h.tmpl
index 2c554b1..c29d8ec 100644
--- a/src/tint/builtin/builtin_value.h.tmpl
+++ b/src/tint/builtin/builtin_value.h.tmpl
@@ -14,7 +14,7 @@
#ifndef SRC_TINT_BUILTIN_BUILTIN_VALUE_H_
#define SRC_TINT_BUILTIN_BUILTIN_VALUE_H_
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::builtin {
diff --git a/src/tint/builtin/builtin_value_test.cc b/src/tint/builtin/builtin_value_test.cc
index ae615bc..9811c90 100644
--- a/src/tint/builtin/builtin_value_test.cc
+++ b/src/tint/builtin/builtin_value_test.cc
@@ -26,7 +26,7 @@
#include <string>
-#include "src/tint/utils/string.h"
+#include "src/tint/core/string.h"
namespace tint::builtin {
namespace {
diff --git a/src/tint/builtin/builtin_value_test.cc.tmpl b/src/tint/builtin/builtin_value_test.cc.tmpl
index 255ffe0..21d5d43 100644
--- a/src/tint/builtin/builtin_value_test.cc.tmpl
+++ b/src/tint/builtin/builtin_value_test.cc.tmpl
@@ -17,7 +17,7 @@
#include <string>
-#include "src/tint/utils/string.h"
+#include "src/tint/core/string.h"
namespace tint::builtin {
namespace {
diff --git a/src/tint/builtin/diagnostic_rule.cc b/src/tint/builtin/diagnostic_rule.cc
index 334a88a..a5fc140 100644
--- a/src/tint/builtin/diagnostic_rule.cc
+++ b/src/tint/builtin/diagnostic_rule.cc
@@ -24,7 +24,7 @@
#include <string>
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::builtin {
diff --git a/src/tint/builtin/diagnostic_rule.cc.tmpl b/src/tint/builtin/diagnostic_rule.cc.tmpl
index 0c00566..ecc28d1 100644
--- a/src/tint/builtin/diagnostic_rule.cc.tmpl
+++ b/src/tint/builtin/diagnostic_rule.cc.tmpl
@@ -14,7 +14,7 @@
#include <string>
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::builtin {
diff --git a/src/tint/builtin/diagnostic_rule.h b/src/tint/builtin/diagnostic_rule.h
index aa641b0..a8be65f 100644
--- a/src/tint/builtin/diagnostic_rule.h
+++ b/src/tint/builtin/diagnostic_rule.h
@@ -26,7 +26,7 @@
#include <string>
#include <variant>
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::builtin {
diff --git a/src/tint/builtin/diagnostic_rule.h.tmpl b/src/tint/builtin/diagnostic_rule.h.tmpl
index 96448d0..0dc952c 100644
--- a/src/tint/builtin/diagnostic_rule.h.tmpl
+++ b/src/tint/builtin/diagnostic_rule.h.tmpl
@@ -16,7 +16,7 @@
#include <string>
#include <variant>
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::builtin {
diff --git a/src/tint/builtin/diagnostic_rule_test.cc b/src/tint/builtin/diagnostic_rule_test.cc
index 78bd3f3..9c4e00f 100644
--- a/src/tint/builtin/diagnostic_rule_test.cc
+++ b/src/tint/builtin/diagnostic_rule_test.cc
@@ -24,7 +24,7 @@
#include "gtest/gtest-spi.h"
#include "src/tint/builtin/diagnostic_rule.h"
-#include "src/tint/utils/string.h"
+#include "src/tint/core/string.h"
namespace tint::builtin {
namespace {
diff --git a/src/tint/builtin/diagnostic_rule_test.cc.tmpl b/src/tint/builtin/diagnostic_rule_test.cc.tmpl
index d0c1776..6572658 100644
--- a/src/tint/builtin/diagnostic_rule_test.cc.tmpl
+++ b/src/tint/builtin/diagnostic_rule_test.cc.tmpl
@@ -14,7 +14,7 @@
#include "gtest/gtest-spi.h"
#include "src/tint/builtin/diagnostic_rule.h"
-#include "src/tint/utils/string.h"
+#include "src/tint/core/string.h"
namespace tint::builtin {
namespace {
diff --git a/src/tint/builtin/diagnostic_severity.h b/src/tint/builtin/diagnostic_severity.h
index 44a3b41..dc73fc5 100644
--- a/src/tint/builtin/diagnostic_severity.h
+++ b/src/tint/builtin/diagnostic_severity.h
@@ -27,8 +27,8 @@
#include <unordered_map>
#include "src/tint/builtin/diagnostic_rule.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/diagnostic/diagnostic.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::builtin {
diff --git a/src/tint/builtin/diagnostic_severity.h.tmpl b/src/tint/builtin/diagnostic_severity.h.tmpl
index d1ceec5..a57af0c 100644
--- a/src/tint/builtin/diagnostic_severity.h.tmpl
+++ b/src/tint/builtin/diagnostic_severity.h.tmpl
@@ -16,7 +16,7 @@
#include <string>
#include <unordered_map>
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/builtin/diagnostic_rule.h"
#include "src/tint/diagnostic/diagnostic.h"
diff --git a/src/tint/builtin/diagnostic_severity_test.cc b/src/tint/builtin/diagnostic_severity_test.cc
index bfd51b4..1a8133f 100644
--- a/src/tint/builtin/diagnostic_severity_test.cc
+++ b/src/tint/builtin/diagnostic_severity_test.cc
@@ -24,7 +24,7 @@
#include "gtest/gtest-spi.h"
#include "src/tint/builtin/diagnostic_severity.h"
-#include "src/tint/utils/string.h"
+#include "src/tint/core/string.h"
namespace tint::builtin {
namespace {
diff --git a/src/tint/builtin/diagnostic_severity_test.cc.tmpl b/src/tint/builtin/diagnostic_severity_test.cc.tmpl
index 8b28bae..6669460 100644
--- a/src/tint/builtin/diagnostic_severity_test.cc.tmpl
+++ b/src/tint/builtin/diagnostic_severity_test.cc.tmpl
@@ -14,7 +14,7 @@
#include "gtest/gtest-spi.h"
#include "src/tint/builtin/diagnostic_severity.h"
-#include "src/tint/utils/string.h"
+#include "src/tint/core/string.h"
namespace tint::builtin {
namespace {
diff --git a/src/tint/builtin/extension.h b/src/tint/builtin/extension.h
index 6883f4b..a2fee8b 100644
--- a/src/tint/builtin/extension.h
+++ b/src/tint/builtin/extension.h
@@ -23,8 +23,8 @@
#ifndef SRC_TINT_BUILTIN_EXTENSION_H_
#define SRC_TINT_BUILTIN_EXTENSION_H_
-#include "src/tint/utils/string_stream.h"
-#include "src/tint/utils/unique_vector.h"
+#include "src/tint/core/string_stream.h"
+#include "src/tint/core/unique_vector.h"
namespace tint::builtin {
diff --git a/src/tint/builtin/extension.h.tmpl b/src/tint/builtin/extension.h.tmpl
index 02be362..e64b678 100644
--- a/src/tint/builtin/extension.h.tmpl
+++ b/src/tint/builtin/extension.h.tmpl
@@ -14,8 +14,8 @@
#ifndef SRC_TINT_BUILTIN_EXTENSION_H_
#define SRC_TINT_BUILTIN_EXTENSION_H_
-#include "src/tint/utils/string_stream.h"
-#include "src/tint/utils/unique_vector.h"
+#include "src/tint/core/string_stream.h"
+#include "src/tint/core/unique_vector.h"
namespace tint::builtin {
diff --git a/src/tint/builtin/extension_test.cc b/src/tint/builtin/extension_test.cc
index cc13b13..c7c5564 100644
--- a/src/tint/builtin/extension_test.cc
+++ b/src/tint/builtin/extension_test.cc
@@ -26,7 +26,7 @@
#include <string>
-#include "src/tint/utils/string.h"
+#include "src/tint/core/string.h"
namespace tint::builtin {
namespace {
diff --git a/src/tint/builtin/extension_test.cc.tmpl b/src/tint/builtin/extension_test.cc.tmpl
index 5ab9c40..8c687f5 100644
--- a/src/tint/builtin/extension_test.cc.tmpl
+++ b/src/tint/builtin/extension_test.cc.tmpl
@@ -17,7 +17,7 @@
#include <string>
-#include "src/tint/utils/string.h"
+#include "src/tint/core/string.h"
namespace tint::builtin {
namespace {
diff --git a/src/tint/builtin/function.h b/src/tint/builtin/function.h
index 4643157..80bfbfe 100644
--- a/src/tint/builtin/function.h
+++ b/src/tint/builtin/function.h
@@ -25,7 +25,7 @@
#include <string>
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
// \cond DO_NOT_DOCUMENT
namespace tint::builtin {
diff --git a/src/tint/builtin/function.h.tmpl b/src/tint/builtin/function.h.tmpl
index 2dc35d3..e7f1778 100644
--- a/src/tint/builtin/function.h.tmpl
+++ b/src/tint/builtin/function.h.tmpl
@@ -16,7 +16,7 @@
#include <string>
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
// \cond DO_NOT_DOCUMENT
namespace tint::builtin {
diff --git a/src/tint/builtin/interpolation_sampling.h b/src/tint/builtin/interpolation_sampling.h
index 78a9d51..c494949 100644
--- a/src/tint/builtin/interpolation_sampling.h
+++ b/src/tint/builtin/interpolation_sampling.h
@@ -25,7 +25,7 @@
#include <string>
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::builtin {
diff --git a/src/tint/builtin/interpolation_sampling.h.tmpl b/src/tint/builtin/interpolation_sampling.h.tmpl
index 4b5058a..af726c2 100644
--- a/src/tint/builtin/interpolation_sampling.h.tmpl
+++ b/src/tint/builtin/interpolation_sampling.h.tmpl
@@ -15,7 +15,7 @@
#include <string>
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::builtin {
diff --git a/src/tint/builtin/interpolation_sampling_test.cc b/src/tint/builtin/interpolation_sampling_test.cc
index db497a8..ba0a1b5 100644
--- a/src/tint/builtin/interpolation_sampling_test.cc
+++ b/src/tint/builtin/interpolation_sampling_test.cc
@@ -25,7 +25,7 @@
#include <gtest/gtest.h>
#include <string>
-#include "src/tint/utils/string.h"
+#include "src/tint/core/string.h"
namespace tint::builtin {
namespace {
diff --git a/src/tint/builtin/interpolation_sampling_test.cc.tmpl b/src/tint/builtin/interpolation_sampling_test.cc.tmpl
index 8c0d095..00a0d5d 100644
--- a/src/tint/builtin/interpolation_sampling_test.cc.tmpl
+++ b/src/tint/builtin/interpolation_sampling_test.cc.tmpl
@@ -15,7 +15,7 @@
#include <gtest/gtest.h>
#include <string>
-#include "src/tint/utils/string.h"
+#include "src/tint/core/string.h"
namespace tint::builtin {
namespace {
diff --git a/src/tint/builtin/interpolation_type.h b/src/tint/builtin/interpolation_type.h
index bd32923..a9ba2e8 100644
--- a/src/tint/builtin/interpolation_type.h
+++ b/src/tint/builtin/interpolation_type.h
@@ -25,7 +25,7 @@
#include <string>
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::builtin {
diff --git a/src/tint/builtin/interpolation_type.h.tmpl b/src/tint/builtin/interpolation_type.h.tmpl
index 66ee755..1f6e062 100644
--- a/src/tint/builtin/interpolation_type.h.tmpl
+++ b/src/tint/builtin/interpolation_type.h.tmpl
@@ -15,7 +15,7 @@
#include <string>
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::builtin {
diff --git a/src/tint/builtin/interpolation_type_test.cc b/src/tint/builtin/interpolation_type_test.cc
index 96e7094..3f36b6d 100644
--- a/src/tint/builtin/interpolation_type_test.cc
+++ b/src/tint/builtin/interpolation_type_test.cc
@@ -25,7 +25,7 @@
#include <gtest/gtest.h>
#include <string>
-#include "src/tint/utils/string.h"
+#include "src/tint/core/string.h"
namespace tint::builtin {
namespace {
diff --git a/src/tint/builtin/interpolation_type_test.cc.tmpl b/src/tint/builtin/interpolation_type_test.cc.tmpl
index 281e269..cc2c84d 100644
--- a/src/tint/builtin/interpolation_type_test.cc.tmpl
+++ b/src/tint/builtin/interpolation_type_test.cc.tmpl
@@ -15,7 +15,7 @@
#include <gtest/gtest.h>
#include <string>
-#include "src/tint/utils/string.h"
+#include "src/tint/core/string.h"
namespace tint::builtin {
namespace {
diff --git a/src/tint/builtin/number.cc b/src/tint/builtin/number.cc
index bf15fef..a40100d 100644
--- a/src/tint/builtin/number.cc
+++ b/src/tint/builtin/number.cc
@@ -18,9 +18,9 @@
#include <cmath>
#include <cstring>
+#include "src/tint/core/bitcast.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/debug.h"
-#include "src/tint/utils/bitcast.h"
-#include "src/tint/utils/string_stream.h"
namespace tint {
namespace {
diff --git a/src/tint/builtin/number.h b/src/tint/builtin/number.h
index 23b9d0e..9529693 100644
--- a/src/tint/builtin/number.h
+++ b/src/tint/builtin/number.h
@@ -21,10 +21,10 @@
#include <limits>
#include <optional>
-#include "src/tint/utils/compiler_macros.h"
-#include "src/tint/utils/result.h"
-#include "src/tint/utils/string_stream.h"
-#include "src/tint/utils/traits.h"
+#include "src/tint/core/compiler_macros.h"
+#include "src/tint/core/result.h"
+#include "src/tint/core/string_stream.h"
+#include "src/tint/core/traits.h"
// Forward declaration
namespace tint {
diff --git a/src/tint/builtin/number_test.cc b/src/tint/builtin/number_test.cc
index 7ae5e37..dd9535a 100644
--- a/src/tint/builtin/number_test.cc
+++ b/src/tint/builtin/number_test.cc
@@ -17,9 +17,9 @@
#include <variant>
#include <vector>
+#include "src/tint/core/compiler_macros.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/program_builder.h"
-#include "src/tint/utils/compiler_macros.h"
-#include "src/tint/utils/string_stream.h"
#include "gtest/gtest.h"
diff --git a/src/tint/builtin/texel_format.h b/src/tint/builtin/texel_format.h
index 6643523..e72dae7 100644
--- a/src/tint/builtin/texel_format.h
+++ b/src/tint/builtin/texel_format.h
@@ -23,7 +23,7 @@
#ifndef SRC_TINT_BUILTIN_TEXEL_FORMAT_H_
#define SRC_TINT_BUILTIN_TEXEL_FORMAT_H_
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::builtin {
diff --git a/src/tint/builtin/texel_format.h.tmpl b/src/tint/builtin/texel_format.h.tmpl
index f656008..9d36344 100644
--- a/src/tint/builtin/texel_format.h.tmpl
+++ b/src/tint/builtin/texel_format.h.tmpl
@@ -14,7 +14,7 @@
#ifndef SRC_TINT_BUILTIN_TEXEL_FORMAT_H_
#define SRC_TINT_BUILTIN_TEXEL_FORMAT_H_
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::builtin {
diff --git a/src/tint/builtin/texel_format_test.cc b/src/tint/builtin/texel_format_test.cc
index 453224c..537a105 100644
--- a/src/tint/builtin/texel_format_test.cc
+++ b/src/tint/builtin/texel_format_test.cc
@@ -26,7 +26,7 @@
#include <string>
-#include "src/tint/utils/string.h"
+#include "src/tint/core/string.h"
namespace tint::builtin {
namespace {
diff --git a/src/tint/builtin/texel_format_test.cc.tmpl b/src/tint/builtin/texel_format_test.cc.tmpl
index 4f8b994..2622315 100644
--- a/src/tint/builtin/texel_format_test.cc.tmpl
+++ b/src/tint/builtin/texel_format_test.cc.tmpl
@@ -17,7 +17,7 @@
#include <string>
-#include "src/tint/utils/string.h"
+#include "src/tint/core/string.h"
namespace tint::builtin {
namespace {
diff --git a/src/tint/clone_context.cc b/src/tint/clone_context.cc
index f2988d1..836c859 100644
--- a/src/tint/clone_context.cc
+++ b/src/tint/clone_context.cc
@@ -16,8 +16,8 @@
#include <string>
+#include "src/tint/core/map.h"
#include "src/tint/program_builder.h"
-#include "src/tint/utils/map.h"
TINT_INSTANTIATE_TYPEINFO(tint::Cloneable);
diff --git a/src/tint/clone_context.h b/src/tint/clone_context.h
index 5f0073c..3abc66d 100644
--- a/src/tint/clone_context.h
+++ b/src/tint/clone_context.h
@@ -21,15 +21,15 @@
#include <utility>
#include <vector>
+#include "src/tint/core/castable.h"
+#include "src/tint/core/compiler_macros.h"
+#include "src/tint/core/hashmap.h"
+#include "src/tint/core/hashset.h"
+#include "src/tint/core/traits.h"
+#include "src/tint/core/vector.h"
#include "src/tint/debug.h"
#include "src/tint/program_id.h"
#include "src/tint/symbol.h"
-#include "src/tint/utils/castable.h"
-#include "src/tint/utils/compiler_macros.h"
-#include "src/tint/utils/hashmap.h"
-#include "src/tint/utils/hashset.h"
-#include "src/tint/utils/traits.h"
-#include "src/tint/utils/vector.h"
// Forward declarations
namespace tint {
diff --git a/src/tint/cmd/helper.cc b/src/tint/cmd/helper.cc
index 2e2398c..23b6eb2 100644
--- a/src/tint/cmd/helper.cc
+++ b/src/tint/cmd/helper.cc
@@ -22,7 +22,7 @@
#include "spirv-tools/libspirv.hpp"
#endif
-#include "src/tint/utils/string.h"
+#include "src/tint/core/string.h"
namespace tint::cmd {
namespace {
diff --git a/src/tint/cmd/info.cc b/src/tint/cmd/info.cc
index 0022474..688bd43 100644
--- a/src/tint/cmd/info.cc
+++ b/src/tint/cmd/info.cc
@@ -20,11 +20,11 @@
#endif // TINT_BUILD_SPV_READER
#include "src/tint/cmd/helper.h"
+#include "src/tint/core/io/command.h"
+#include "src/tint/core/string.h"
+#include "src/tint/core/transform.h"
#include "src/tint/lang/wgsl/ast/module.h"
#include "src/tint/type/struct.h"
-#include "src/tint/utils/io/command.h"
-#include "src/tint/utils/string.h"
-#include "src/tint/utils/transform.h"
#include "src/tint/val/val.h"
#include "tint/tint.h"
diff --git a/src/tint/cmd/main.cc b/src/tint/cmd/main.cc
index cca77d4..dd339de 100644
--- a/src/tint/cmd/main.cc
+++ b/src/tint/cmd/main.cc
@@ -40,13 +40,13 @@
#include "src/tint/cmd/generate_external_texture_bindings.h"
#include "src/tint/cmd/helper.h"
+#include "src/tint/core/cli.h"
+#include "src/tint/core/defer.h"
+#include "src/tint/core/io/command.h"
+#include "src/tint/core/string.h"
+#include "src/tint/core/string_stream.h"
+#include "src/tint/core/transform.h"
#include "src/tint/lang/wgsl/ast/module.h"
-#include "src/tint/utils/cli.h"
-#include "src/tint/utils/defer.h"
-#include "src/tint/utils/io/command.h"
-#include "src/tint/utils/string.h"
-#include "src/tint/utils/string_stream.h"
-#include "src/tint/utils/transform.h"
#include "src/tint/val/val.h"
#include "tint/tint.h"
diff --git a/src/tint/constant/composite.h b/src/tint/constant/composite.h
index c2f264c..557ed7e 100644
--- a/src/tint/constant/composite.h
+++ b/src/tint/constant/composite.h
@@ -17,10 +17,10 @@
#include "src/tint/builtin/number.h"
#include "src/tint/constant/value.h"
+#include "src/tint/core/castable.h"
+#include "src/tint/core/hash.h"
+#include "src/tint/core/vector.h"
#include "src/tint/type/type.h"
-#include "src/tint/utils/castable.h"
-#include "src/tint/utils/hash.h"
-#include "src/tint/utils/vector.h"
namespace tint::constant {
diff --git a/src/tint/constant/manager.cc b/src/tint/constant/manager.cc
index 829edb2..1774d9f 100644
--- a/src/tint/constant/manager.cc
+++ b/src/tint/constant/manager.cc
@@ -17,6 +17,7 @@
#include "src/tint/constant/composite.h"
#include "src/tint/constant/scalar.h"
#include "src/tint/constant/splat.h"
+#include "src/tint/core/predicates.h"
#include "src/tint/type/abstract_float.h"
#include "src/tint/type/abstract_int.h"
#include "src/tint/type/bool.h"
@@ -25,7 +26,6 @@
#include "src/tint/type/i32.h"
#include "src/tint/type/manager.h"
#include "src/tint/type/u32.h"
-#include "src/tint/utils/predicates.h"
namespace tint::constant {
diff --git a/src/tint/constant/manager.h b/src/tint/constant/manager.h
index 43d50496..b91897d 100644
--- a/src/tint/constant/manager.h
+++ b/src/tint/constant/manager.h
@@ -19,9 +19,9 @@
#include "src/tint/builtin/number.h"
#include "src/tint/constant/value.h"
+#include "src/tint/core/hash.h"
+#include "src/tint/core/unique_allocator.h"
#include "src/tint/type/manager.h"
-#include "src/tint/utils/hash.h"
-#include "src/tint/utils/unique_allocator.h"
namespace tint::constant {
class Splat;
diff --git a/src/tint/constant/node.h b/src/tint/constant/node.h
index 54ef94d..64e58c3 100644
--- a/src/tint/constant/node.h
+++ b/src/tint/constant/node.h
@@ -15,7 +15,7 @@
#ifndef SRC_TINT_CONSTANT_NODE_H_
#define SRC_TINT_CONSTANT_NODE_H_
-#include "src/tint/utils/castable.h"
+#include "src/tint/core/castable.h"
namespace tint::constant {
diff --git a/src/tint/constant/scalar.h b/src/tint/constant/scalar.h
index 442bc59..5218762 100644
--- a/src/tint/constant/scalar.h
+++ b/src/tint/constant/scalar.h
@@ -18,9 +18,9 @@
#include "src/tint/builtin/number.h"
#include "src/tint/constant/manager.h"
#include "src/tint/constant/value.h"
+#include "src/tint/core/castable.h"
+#include "src/tint/core/hash.h"
#include "src/tint/type/type.h"
-#include "src/tint/utils/castable.h"
-#include "src/tint/utils/hash.h"
namespace tint::constant {
diff --git a/src/tint/constant/splat.h b/src/tint/constant/splat.h
index 2bf82dd..a85d5e2 100644
--- a/src/tint/constant/splat.h
+++ b/src/tint/constant/splat.h
@@ -16,9 +16,9 @@
#define SRC_TINT_CONSTANT_SPLAT_H_
#include "src/tint/constant/composite.h"
+#include "src/tint/core/castable.h"
+#include "src/tint/core/vector.h"
#include "src/tint/type/type.h"
-#include "src/tint/utils/castable.h"
-#include "src/tint/utils/vector.h"
namespace tint::constant {
diff --git a/src/tint/constant/value.h b/src/tint/constant/value.h
index 34ca335..8bb3b50 100644
--- a/src/tint/constant/value.h
+++ b/src/tint/constant/value.h
@@ -20,8 +20,8 @@
#include "src/tint/builtin/number.h"
#include "src/tint/constant/clone_context.h"
#include "src/tint/constant/node.h"
+#include "src/tint/core/castable.h"
#include "src/tint/type/type.h"
-#include "src/tint/utils/castable.h"
namespace tint::constant {
diff --git a/src/tint/utils/bitcast.h b/src/tint/core/bitcast.h
similarity index 94%
rename from src/tint/utils/bitcast.h
rename to src/tint/core/bitcast.h
index 4f72bb8..8f10b2c 100644
--- a/src/tint/utils/bitcast.h
+++ b/src/tint/core/bitcast.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_BITCAST_H_
-#define SRC_TINT_UTILS_BITCAST_H_
+#ifndef SRC_TINT_CORE_BITCAST_H_
+#define SRC_TINT_CORE_BITCAST_H_
#include <cstddef>
#include <cstring>
@@ -50,4 +50,4 @@
} // namespace tint::utils
-#endif // SRC_TINT_UTILS_BITCAST_H_
+#endif // SRC_TINT_CORE_BITCAST_H_
diff --git a/src/tint/utils/bitcast_test.cc b/src/tint/core/bitcast_test.cc
similarity index 96%
rename from src/tint/utils/bitcast_test.cc
rename to src/tint/core/bitcast_test.cc
index 2364899..3ec2491 100644
--- a/src/tint/utils/bitcast_test.cc
+++ b/src/tint/core/bitcast_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/bitcast.h"
+#include "src/tint/core/bitcast.h"
#include <stdint.h>
diff --git a/src/tint/utils/bitset.h b/src/tint/core/bitset.h
similarity index 95%
rename from src/tint/utils/bitset.h
rename to src/tint/core/bitset.h
index a37f9a2..6b50d31 100644
--- a/src/tint/utils/bitset.h
+++ b/src/tint/core/bitset.h
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_BITSET_H_
-#define SRC_TINT_UTILS_BITSET_H_
+#ifndef SRC_TINT_CORE_BITSET_H_
+#define SRC_TINT_CORE_BITSET_H_
#include <stdint.h>
-#include "src/tint/utils/vector.h"
+#include "src/tint/core/vector.h"
namespace tint::utils {
@@ -118,4 +118,4 @@
} // namespace tint::utils
-#endif // SRC_TINT_UTILS_BITSET_H_
+#endif // SRC_TINT_CORE_BITSET_H_
diff --git a/src/tint/utils/bitset_test.cc b/src/tint/core/bitset_test.cc
similarity index 98%
rename from src/tint/utils/bitset_test.cc
rename to src/tint/core/bitset_test.cc
index 550d946..1193895 100644
--- a/src/tint/utils/bitset_test.cc
+++ b/src/tint/core/bitset_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/bitset.h"
+#include "src/tint/core/bitset.h"
#include "gtest/gtest.h"
diff --git a/src/tint/utils/block_allocator.h b/src/tint/core/block_allocator.h
similarity index 98%
rename from src/tint/utils/block_allocator.h
rename to src/tint/core/block_allocator.h
index b1465cb..b3a19b8 100644
--- a/src/tint/utils/block_allocator.h
+++ b/src/tint/core/block_allocator.h
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_BLOCK_ALLOCATOR_H_
-#define SRC_TINT_UTILS_BLOCK_ALLOCATOR_H_
+#ifndef SRC_TINT_CORE_BLOCK_ALLOCATOR_H_
+#define SRC_TINT_CORE_BLOCK_ALLOCATOR_H_
#include <array>
#include <cstring>
#include <utility>
-#include "src/tint/utils/bitcast.h"
-#include "src/tint/utils/math.h"
+#include "src/tint/core/bitcast.h"
+#include "src/tint/core/math.h"
namespace tint::utils {
@@ -338,4 +338,4 @@
} // namespace tint::utils
-#endif // SRC_TINT_UTILS_BLOCK_ALLOCATOR_H_
+#endif // SRC_TINT_CORE_BLOCK_ALLOCATOR_H_
diff --git a/src/tint/utils/block_allocator_test.cc b/src/tint/core/block_allocator_test.cc
similarity index 98%
rename from src/tint/utils/block_allocator_test.cc
rename to src/tint/core/block_allocator_test.cc
index 1684755..bcd3055 100644
--- a/src/tint/utils/block_allocator_test.cc
+++ b/src/tint/core/block_allocator_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/block_allocator.h"
+#include "src/tint/core/block_allocator.h"
#include "gtest/gtest.h"
diff --git a/src/tint/utils/bump_allocator.h b/src/tint/core/bump_allocator.h
similarity index 94%
rename from src/tint/utils/bump_allocator.h
rename to src/tint/core/bump_allocator.h
index 302f924..ff96fa6 100644
--- a/src/tint/utils/bump_allocator.h
+++ b/src/tint/core/bump_allocator.h
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_BUMP_ALLOCATOR_H_
-#define SRC_TINT_UTILS_BUMP_ALLOCATOR_H_
+#ifndef SRC_TINT_CORE_BUMP_ALLOCATOR_H_
+#define SRC_TINT_CORE_BUMP_ALLOCATOR_H_
#include <array>
#include <cstring>
#include <utility>
-#include "src/tint/utils/bitcast.h"
-#include "src/tint/utils/math.h"
+#include "src/tint/core/bitcast.h"
+#include "src/tint/core/math.h"
namespace tint::utils {
@@ -124,4 +124,4 @@
} // namespace tint::utils
-#endif // SRC_TINT_UTILS_BUMP_ALLOCATOR_H_
+#endif // SRC_TINT_CORE_BUMP_ALLOCATOR_H_
diff --git a/src/tint/utils/bump_allocator_test.cc b/src/tint/core/bump_allocator_test.cc
similarity index 96%
rename from src/tint/utils/bump_allocator_test.cc
rename to src/tint/core/bump_allocator_test.cc
index 4f22455..dd55691 100644
--- a/src/tint/utils/bump_allocator_test.cc
+++ b/src/tint/core/bump_allocator_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/bump_allocator.h"
+#include "src/tint/core/bump_allocator.h"
#include "gtest/gtest.h"
diff --git a/src/tint/utils/castable.cc b/src/tint/core/castable.cc
similarity index 96%
rename from src/tint/utils/castable.cc
rename to src/tint/core/castable.cc
index 484014f..96a315c 100644
--- a/src/tint/utils/castable.cc
+++ b/src/tint/core/castable.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/castable.h"
+#include "src/tint/core/castable.h"
namespace tint::utils {
diff --git a/src/tint/utils/castable.h b/src/tint/core/castable.h
similarity index 98%
rename from src/tint/utils/castable.h
rename to src/tint/core/castable.h
index 176b107..4bd0f80 100644
--- a/src/tint/utils/castable.h
+++ b/src/tint/core/castable.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_CASTABLE_H_
-#define SRC_TINT_UTILS_CASTABLE_H_
+#ifndef SRC_TINT_CORE_CASTABLE_H_
+#define SRC_TINT_CORE_CASTABLE_H_
#include <stdint.h>
#include <functional>
@@ -21,8 +21,8 @@
#include <type_traits>
#include <utility>
-#include "src/tint/utils/crc32.h"
-#include "src/tint/utils/traits.h"
+#include "src/tint/core/crc32.h"
+#include "src/tint/core/traits.h"
#if defined(__clang__)
/// Temporarily disable certain warnings when using Castable API
@@ -550,4 +550,4 @@
TINT_CASTABLE_POP_DISABLE_WARNINGS();
-#endif // SRC_TINT_UTILS_CASTABLE_H_
+#endif // SRC_TINT_CORE_CASTABLE_H_
diff --git a/src/tint/utils/castable_test.cc b/src/tint/core/castable_test.cc
similarity index 99%
rename from src/tint/utils/castable_test.cc
rename to src/tint/core/castable_test.cc
index 419e506..b7ec5457 100644
--- a/src/tint/utils/castable_test.cc
+++ b/src/tint/core/castable_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/castable.h"
+#include "src/tint/core/castable.h"
#include <memory>
#include <string>
diff --git a/src/tint/utils/cli.cc b/src/tint/core/cli.cc
similarity index 97%
rename from src/tint/utils/cli.cc
rename to src/tint/core/cli.cc
index 2d3fd52..9e87bd3 100644
--- a/src/tint/utils/cli.cc
+++ b/src/tint/core/cli.cc
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/cli.h"
+#include "src/tint/core/cli.h"
#include <algorithm>
#include <sstream>
#include <utility>
-#include "src/tint/utils/hashset.h"
-#include "src/tint/utils/string.h"
-#include "src/tint/utils/transform.h"
+#include "src/tint/core/hashset.h"
+#include "src/tint/core/string.h"
+#include "src/tint/core/transform.h"
namespace tint::utils::cli {
diff --git a/src/tint/utils/cli.h b/src/tint/core/cli.h
similarity index 97%
rename from src/tint/utils/cli.h
rename to src/tint/core/cli.h
index c1c3030..688b467 100644
--- a/src/tint/utils/cli.h
+++ b/src/tint/core/cli.h
@@ -12,20 +12,20 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_CLI_H_
-#define SRC_TINT_UTILS_CLI_H_
+#ifndef SRC_TINT_CORE_CLI_H_
+#define SRC_TINT_CORE_CLI_H_
#include <deque>
#include <optional>
#include <string>
#include <utility>
-#include "src/tint/utils/block_allocator.h"
-#include "src/tint/utils/compiler_macros.h"
-#include "src/tint/utils/parse_num.h"
-#include "src/tint/utils/result.h"
-#include "src/tint/utils/string.h"
-#include "src/tint/utils/vector.h"
+#include "src/tint/core/block_allocator.h"
+#include "src/tint/core/compiler_macros.h"
+#include "src/tint/core/parse_num.h"
+#include "src/tint/core/result.h"
+#include "src/tint/core/string.h"
+#include "src/tint/core/vector.h"
namespace tint::utils::cli {
@@ -407,4 +407,4 @@
} // namespace tint::utils::cli
-#endif // SRC_TINT_UTILS_CLI_H_
+#endif // SRC_TINT_CORE_CLI_H_
diff --git a/src/tint/utils/cli_test.cc b/src/tint/core/cli_test.cc
similarity index 98%
rename from src/tint/utils/cli_test.cc
rename to src/tint/core/cli_test.cc
index cabbf14..5d40773 100644
--- a/src/tint/utils/cli_test.cc
+++ b/src/tint/core/cli_test.cc
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/cli.h"
+#include "src/tint/core/cli.h"
#include <sstream>
#include "gmock/gmock.h"
-#include "src/tint/utils/string.h"
+#include "src/tint/core/string.h"
-#include "src/tint/utils/transform.h" // Used by ToStringList()
+#include "src/tint/core/transform.h" // Used by ToStringList()
namespace tint::utils::cli {
namespace {
diff --git a/src/tint/utils/compiler_macros.h b/src/tint/core/compiler_macros.h
similarity index 96%
rename from src/tint/utils/compiler_macros.h
rename to src/tint/core/compiler_macros.h
index 087a02f..6748ed5 100644
--- a/src/tint/utils/compiler_macros.h
+++ b/src/tint/core/compiler_macros.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/concat.h"
+#include "src/tint/core/concat.h"
-#ifndef SRC_TINT_UTILS_COMPILER_MACROS_H_
-#define SRC_TINT_UTILS_COMPILER_MACROS_H_
+#ifndef SRC_TINT_CORE_COMPILER_MACROS_H_
+#define SRC_TINT_CORE_COMPILER_MACROS_H_
#define TINT_REQUIRE_SEMICOLON static_assert(true)
@@ -107,4 +107,4 @@
#endif
-#endif // SRC_TINT_UTILS_COMPILER_MACROS_H_
+#endif // SRC_TINT_CORE_COMPILER_MACROS_H_
diff --git a/src/tint/utils/concat.h b/src/tint/core/concat.h
similarity index 86%
rename from src/tint/utils/concat.h
rename to src/tint/core/concat.h
index c291da9..66df8d1 100644
--- a/src/tint/utils/concat.h
+++ b/src/tint/core/concat.h
@@ -13,10 +13,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_CONCAT_H_
-#define SRC_TINT_UTILS_CONCAT_H_
+#ifndef SRC_TINT_CORE_CONCAT_H_
+#define SRC_TINT_CORE_CONCAT_H_
#define TINT_CONCAT_2(a, b) a##b
#define TINT_CONCAT(a, b) TINT_CONCAT_2(a, b)
-#endif // SRC_TINT_UTILS_CONCAT_H_
+#endif // SRC_TINT_CORE_CONCAT_H_
diff --git a/src/tint/utils/crc32.h b/src/tint/core/crc32.h
similarity index 97%
rename from src/tint/utils/crc32.h
rename to src/tint/core/crc32.h
index c9697b7..8125e45 100644
--- a/src/tint/utils/crc32.h
+++ b/src/tint/core/crc32.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_CRC32_H_
-#define SRC_TINT_UTILS_CRC32_H_
+#ifndef SRC_TINT_CORE_CRC32_H_
+#define SRC_TINT_CORE_CRC32_H_
#include <stdint.h>
#include <cstddef>
@@ -78,4 +78,4 @@
} // namespace tint::utils
-#endif // SRC_TINT_UTILS_CRC32_H_
+#endif // SRC_TINT_CORE_CRC32_H_
diff --git a/src/tint/utils/crc32_test.cc b/src/tint/core/crc32_test.cc
similarity index 96%
rename from src/tint/utils/crc32_test.cc
rename to src/tint/core/crc32_test.cc
index 28dd16f..b6088b1 100644
--- a/src/tint/utils/crc32_test.cc
+++ b/src/tint/core/crc32_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/crc32.h"
+#include "src/tint/core/crc32.h"
#include "gtest/gtest.h"
diff --git a/src/tint/utils/debugger.cc b/src/tint/core/debugger.cc
similarity index 97%
rename from src/tint/utils/debugger.cc
rename to src/tint/core/debugger.cc
index 3e05bdc..8a3d3d2 100644
--- a/src/tint/utils/debugger.cc
+++ b/src/tint/core/debugger.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/debugger.h"
+#include "src/tint/core/debugger.h"
#ifdef TINT_ENABLE_BREAK_IN_DEBUGGER
diff --git a/src/tint/utils/debugger.h b/src/tint/core/debugger.h
similarity index 88%
rename from src/tint/utils/debugger.h
rename to src/tint/core/debugger.h
index 240a8d9..30f8882 100644
--- a/src/tint/utils/debugger.h
+++ b/src/tint/core/debugger.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_DEBUGGER_H_
-#define SRC_TINT_UTILS_DEBUGGER_H_
+#ifndef SRC_TINT_CORE_DEBUGGER_H_
+#define SRC_TINT_CORE_DEBUGGER_H_
namespace tint::debugger {
@@ -24,4 +24,4 @@
} // namespace tint::debugger
-#endif // SRC_TINT_UTILS_DEBUGGER_H_
+#endif // SRC_TINT_CORE_DEBUGGER_H_
diff --git a/src/tint/utils/defer.h b/src/tint/core/defer.h
similarity index 91%
rename from src/tint/utils/defer.h
rename to src/tint/core/defer.h
index f073fb9..55a2562 100644
--- a/src/tint/utils/defer.h
+++ b/src/tint/core/defer.h
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_DEFER_H_
-#define SRC_TINT_UTILS_DEFER_H_
+#ifndef SRC_TINT_CORE_DEFER_H_
+#define SRC_TINT_CORE_DEFER_H_
#include <utility>
-#include "src/tint/utils/concat.h"
+#include "src/tint/core/concat.h"
namespace tint::utils {
@@ -57,4 +57,4 @@
#define TINT_DEFER(S) \
auto TINT_CONCAT(tint_defer_, __COUNTER__) = ::tint::utils::MakeDefer([&] { S; })
-#endif // SRC_TINT_UTILS_DEFER_H_
+#endif // SRC_TINT_CORE_DEFER_H_
diff --git a/src/tint/utils/defer_test.cc b/src/tint/core/defer_test.cc
similarity index 96%
rename from src/tint/utils/defer_test.cc
rename to src/tint/core/defer_test.cc
index 8a0bddb..aac6237 100644
--- a/src/tint/utils/defer_test.cc
+++ b/src/tint/core/defer_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/defer.h"
+#include "src/tint/core/defer.h"
#include "gtest/gtest.h"
diff --git a/src/tint/utils/enum_set.h b/src/tint/core/enum_set.h
similarity index 97%
rename from src/tint/utils/enum_set.h
rename to src/tint/core/enum_set.h
index c156d50..8eefa97 100644
--- a/src/tint/utils/enum_set.h
+++ b/src/tint/core/enum_set.h
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_ENUM_SET_H_
-#define SRC_TINT_UTILS_ENUM_SET_H_
+#ifndef SRC_TINT_CORE_ENUM_SET_H_
+#define SRC_TINT_CORE_ENUM_SET_H_
#include <cstdint>
#include <functional>
#include <type_traits>
#include <utility>
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::utils {
@@ -258,4 +258,4 @@
} // namespace std
-#endif // SRC_TINT_UTILS_ENUM_SET_H_
+#endif // SRC_TINT_CORE_ENUM_SET_H_
diff --git a/src/tint/utils/enum_set_test.cc b/src/tint/core/enum_set_test.cc
similarity index 98%
rename from src/tint/utils/enum_set_test.cc
rename to src/tint/core/enum_set_test.cc
index cf0496a..03d8f28 100644
--- a/src/tint/utils/enum_set_test.cc
+++ b/src/tint/core/enum_set_test.cc
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/enum_set.h"
+#include "src/tint/core/enum_set.h"
#include <vector>
#include "gmock/gmock.h"
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::utils {
namespace {
diff --git a/src/tint/utils/foreach_macro.h b/src/tint/core/foreach_macro.h
similarity index 96%
rename from src/tint/utils/foreach_macro.h
rename to src/tint/core/foreach_macro.h
index c76bfb3..50bc63d 100644
--- a/src/tint/utils/foreach_macro.h
+++ b/src/tint/core/foreach_macro.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_FOREACH_MACRO_H_
-#define SRC_TINT_UTILS_FOREACH_MACRO_H_
+#ifndef SRC_TINT_CORE_FOREACH_MACRO_H_
+#define SRC_TINT_CORE_FOREACH_MACRO_H_
// Macro magic to perform macro variadic dispatch.
// See:
@@ -88,4 +88,4 @@
TINT_FOREACH_11(CB, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14) \
CB(_15)
-#endif // SRC_TINT_UTILS_FOREACH_MACRO_H_
+#endif // SRC_TINT_CORE_FOREACH_MACRO_H_
diff --git a/src/tint/utils/hash.h b/src/tint/core/hash.h
similarity index 98%
rename from src/tint/utils/hash.h
rename to src/tint/core/hash.h
index f02c777..1c7c78b 100644
--- a/src/tint/utils/hash.h
+++ b/src/tint/core/hash.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_HASH_H_
-#define SRC_TINT_UTILS_HASH_H_
+#ifndef SRC_TINT_CORE_HASH_H_
+#define SRC_TINT_CORE_HASH_H_
#include <stdint.h>
#include <cstdio>
@@ -24,8 +24,8 @@
#include <variant>
#include <vector>
-#include "src/tint/utils/crc32.h"
-#include "src/tint/utils/vector.h"
+#include "src/tint/core/crc32.h"
+#include "src/tint/core/vector.h"
namespace tint::utils {
namespace detail {
@@ -298,4 +298,4 @@
} // namespace std
-#endif // SRC_TINT_UTILS_HASH_H_
+#endif // SRC_TINT_CORE_HASH_H_
diff --git a/src/tint/utils/hash_test.cc b/src/tint/core/hash_test.cc
similarity index 98%
rename from src/tint/utils/hash_test.cc
rename to src/tint/core/hash_test.cc
index 80595d41..2910e6e 100644
--- a/src/tint/utils/hash_test.cc
+++ b/src/tint/core/hash_test.cc
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/hash.h"
+#include "src/tint/core/hash.h"
#include <string>
#include <tuple>
#include <unordered_map>
#include "gtest/gtest.h"
-#include "src/tint/utils/vector.h"
+#include "src/tint/core/vector.h"
namespace tint::utils {
namespace {
diff --git a/src/tint/utils/hashmap.h b/src/tint/core/hashmap.h
similarity index 97%
rename from src/tint/utils/hashmap.h
rename to src/tint/core/hashmap.h
index 98317c9..9e442f4 100644
--- a/src/tint/utils/hashmap.h
+++ b/src/tint/core/hashmap.h
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_HASHMAP_H_
-#define SRC_TINT_UTILS_HASHMAP_H_
+#ifndef SRC_TINT_CORE_HASHMAP_H_
+#define SRC_TINT_CORE_HASHMAP_H_
#include <functional>
#include <optional>
#include <utility>
+#include "src/tint/core/hash.h"
+#include "src/tint/core/hashmap_base.h"
+#include "src/tint/core/vector.h"
#include "src/tint/debug.h"
-#include "src/tint/utils/hash.h"
-#include "src/tint/utils/hashmap_base.h"
-#include "src/tint/utils/vector.h"
namespace tint::utils {
@@ -287,4 +287,4 @@
} // namespace tint::utils
-#endif // SRC_TINT_UTILS_HASHMAP_H_
+#endif // SRC_TINT_CORE_HASHMAP_H_
diff --git a/src/tint/utils/hashmap_base.h b/src/tint/core/hashmap_base.h
similarity index 98%
rename from src/tint/utils/hashmap_base.h
rename to src/tint/core/hashmap_base.h
index cb5f957..843bd9d 100644
--- a/src/tint/utils/hashmap_base.h
+++ b/src/tint/core/hashmap_base.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_HASHMAP_BASE_H_
-#define SRC_TINT_UTILS_HASHMAP_BASE_H_
+#ifndef SRC_TINT_CORE_HASHMAP_BASE_H_
+#define SRC_TINT_CORE_HASHMAP_BASE_H_
#include <algorithm>
#include <functional>
@@ -21,9 +21,9 @@
#include <tuple>
#include <utility>
+#include "src/tint/core/hash.h"
+#include "src/tint/core/vector.h"
#include "src/tint/debug.h"
-#include "src/tint/utils/hash.h"
-#include "src/tint/utils/vector.h"
#define TINT_ASSERT_ITERATORS_NOT_INVALIDATED
@@ -633,4 +633,4 @@
} // namespace tint::utils
-#endif // SRC_TINT_UTILS_HASHMAP_BASE_H_
+#endif // SRC_TINT_CORE_HASHMAP_BASE_H_
diff --git a/src/tint/utils/hashmap_test.cc b/src/tint/core/hashmap_test.cc
similarity index 99%
rename from src/tint/utils/hashmap_test.cc
rename to src/tint/core/hashmap_test.cc
index f27875c..b5f5611 100644
--- a/src/tint/utils/hashmap_test.cc
+++ b/src/tint/core/hashmap_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/hashmap.h"
+#include "src/tint/core/hashmap.h"
#include <array>
#include <random>
diff --git a/src/tint/utils/hashset.h b/src/tint/core/hashset.h
similarity index 94%
rename from src/tint/utils/hashset.h
rename to src/tint/core/hashset.h
index 5339565..a3684cf 100644
--- a/src/tint/utils/hashset.h
+++ b/src/tint/core/hashset.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_HASHSET_H_
-#define SRC_TINT_UTILS_HASHSET_H_
+#ifndef SRC_TINT_CORE_HASHSET_H_
+#define SRC_TINT_CORE_HASHSET_H_
#include <stddef.h>
#include <algorithm>
@@ -22,9 +22,9 @@
#include <tuple>
#include <utility>
+#include "src/tint/core/hashmap.h"
+#include "src/tint/core/vector.h"
#include "src/tint/debug.h"
-#include "src/tint/utils/hashmap.h"
-#include "src/tint/utils/vector.h"
namespace tint::utils {
@@ -94,4 +94,4 @@
} // namespace tint::utils
-#endif // SRC_TINT_UTILS_HASHSET_H_
+#endif // SRC_TINT_CORE_HASHSET_H_
diff --git a/src/tint/utils/hashset_test.cc b/src/tint/core/hashset_test.cc
similarity index 98%
rename from src/tint/utils/hashset_test.cc
rename to src/tint/core/hashset_test.cc
index 31a025a..f41eb68 100644
--- a/src/tint/utils/hashset_test.cc
+++ b/src/tint/core/hashset_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/hashset.h"
+#include "src/tint/core/hashset.h"
#include <array>
#include <random>
@@ -21,7 +21,7 @@
#include <unordered_set>
#include "gmock/gmock.h"
-#include "src/tint/utils/predicates.h"
+#include "src/tint/core/predicates.h"
namespace tint::utils {
namespace {
diff --git a/src/tint/utils/io/command.h b/src/tint/core/io/command.h
similarity index 95%
rename from src/tint/utils/io/command.h
rename to src/tint/core/io/command.h
index 8aae691..4a10390 100644
--- a/src/tint/utils/io/command.h
+++ b/src/tint/core/io/command.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_IO_COMMAND_H_
-#define SRC_TINT_UTILS_IO_COMMAND_H_
+#ifndef SRC_TINT_CORE_IO_COMMAND_H_
+#define SRC_TINT_CORE_IO_COMMAND_H_
#include <string>
#include <utility>
@@ -79,4 +79,4 @@
} // namespace tint::utils
-#endif // SRC_TINT_UTILS_IO_COMMAND_H_
+#endif // SRC_TINT_CORE_IO_COMMAND_H_
diff --git a/src/tint/utils/io/command_other.cc b/src/tint/core/io/command_other.cc
similarity index 95%
rename from src/tint/utils/io/command_other.cc
rename to src/tint/core/io/command_other.cc
index cc1997b..9d4f96a 100644
--- a/src/tint/utils/io/command_other.cc
+++ b/src/tint/core/io/command_other.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/io/command.h"
+#include "src/tint/core/io/command.h"
namespace tint::utils {
diff --git a/src/tint/utils/io/command_posix.cc b/src/tint/core/io/command_posix.cc
similarity index 99%
rename from src/tint/utils/io/command_posix.cc
rename to src/tint/core/io/command_posix.cc
index b3371e7..3d91ef1 100644
--- a/src/tint/utils/io/command_posix.cc
+++ b/src/tint/core/io/command_posix.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/io/command.h"
+#include "src/tint/core/io/command.h"
#include <sys/poll.h>
#include <sys/stat.h>
diff --git a/src/tint/utils/io/command_test.cc b/src/tint/core/io/command_test.cc
similarity index 97%
rename from src/tint/utils/io/command_test.cc
rename to src/tint/core/io/command_test.cc
index ed7e29a..b7b44a2 100644
--- a/src/tint/utils/io/command_test.cc
+++ b/src/tint/core/io/command_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/io/command.h"
+#include "src/tint/core/io/command.h"
#include "gtest/gtest.h"
diff --git a/src/tint/utils/io/command_windows.cc b/src/tint/core/io/command_windows.cc
similarity index 98%
rename from src/tint/utils/io/command_windows.cc
rename to src/tint/core/io/command_windows.cc
index fc5df2c..dc19aec 100644
--- a/src/tint/utils/io/command_windows.cc
+++ b/src/tint/core/io/command_windows.cc
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/io/command.h"
+#include "src/tint/core/io/command.h"
#define WIN32_LEAN_AND_MEAN 1
#include <Windows.h>
#include <dbghelp.h>
#include <string>
-#include "src/tint/utils/defer.h"
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/defer.h"
+#include "src/tint/core/string_stream.h"
namespace tint::utils {
diff --git a/src/tint/utils/io/tmpfile.h b/src/tint/core/io/tmpfile.h
similarity index 93%
rename from src/tint/utils/io/tmpfile.h
rename to src/tint/core/io/tmpfile.h
index 016ac08..109c2ee 100644
--- a/src/tint/utils/io/tmpfile.h
+++ b/src/tint/core/io/tmpfile.h
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_IO_TMPFILE_H_
-#define SRC_TINT_UTILS_IO_TMPFILE_H_
+#ifndef SRC_TINT_CORE_IO_TMPFILE_H_
+#define SRC_TINT_CORE_IO_TMPFILE_H_
#include <string>
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::utils {
@@ -72,4 +72,4 @@
} // namespace tint::utils
-#endif // SRC_TINT_UTILS_IO_TMPFILE_H_
+#endif // SRC_TINT_CORE_IO_TMPFILE_H_
diff --git a/src/tint/utils/io/tmpfile_other.cc b/src/tint/core/io/tmpfile_other.cc
similarity index 94%
rename from src/tint/utils/io/tmpfile_other.cc
rename to src/tint/core/io/tmpfile_other.cc
index 14c8660..8c81345 100644
--- a/src/tint/utils/io/tmpfile_other.cc
+++ b/src/tint/core/io/tmpfile_other.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/io/tmpfile.h"
+#include "src/tint/core/io/tmpfile.h"
namespace tint::utils {
diff --git a/src/tint/utils/io/tmpfile_posix.cc b/src/tint/core/io/tmpfile_posix.cc
similarity index 97%
rename from src/tint/utils/io/tmpfile_posix.cc
rename to src/tint/core/io/tmpfile_posix.cc
index ba84afd..548cd08 100644
--- a/src/tint/utils/io/tmpfile_posix.cc
+++ b/src/tint/core/io/tmpfile_posix.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/io/tmpfile.h"
+#include "src/tint/core/io/tmpfile.h"
#include <unistd.h>
#include <limits>
diff --git a/src/tint/utils/io/tmpfile_test.cc b/src/tint/core/io/tmpfile_test.cc
similarity index 98%
rename from src/tint/utils/io/tmpfile_test.cc
rename to src/tint/core/io/tmpfile_test.cc
index 4fe103d..2c0644d 100644
--- a/src/tint/utils/io/tmpfile_test.cc
+++ b/src/tint/core/io/tmpfile_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/io/tmpfile.h"
+#include "src/tint/core/io/tmpfile.h"
#include <fstream>
diff --git a/src/tint/utils/io/tmpfile_windows.cc b/src/tint/core/io/tmpfile_windows.cc
similarity index 97%
rename from src/tint/utils/io/tmpfile_windows.cc
rename to src/tint/core/io/tmpfile_windows.cc
index 3c8e5f7..3b97273 100644
--- a/src/tint/utils/io/tmpfile_windows.cc
+++ b/src/tint/core/io/tmpfile_windows.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/io/tmpfile.h"
+#include "src/tint/core/io/tmpfile.h"
#include <stdio.h>
#include <cstdio>
diff --git a/src/tint/utils/map.h b/src/tint/core/map.h
similarity index 95%
rename from src/tint/utils/map.h
rename to src/tint/core/map.h
index 0a13730..d4ff481 100644
--- a/src/tint/utils/map.h
+++ b/src/tint/core/map.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_MAP_H_
-#define SRC_TINT_UTILS_MAP_H_
+#ifndef SRC_TINT_CORE_MAP_H_
+#define SRC_TINT_CORE_MAP_H_
#include <unordered_map>
@@ -53,4 +53,4 @@
} // namespace tint::utils
-#endif // SRC_TINT_UTILS_MAP_H_
+#endif // SRC_TINT_CORE_MAP_H_
diff --git a/src/tint/utils/map_test.cc b/src/tint/core/map_test.cc
similarity index 97%
rename from src/tint/utils/map_test.cc
rename to src/tint/core/map_test.cc
index f0d9392..427275a 100644
--- a/src/tint/utils/map_test.cc
+++ b/src/tint/core/map_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/map.h"
+#include "src/tint/core/map.h"
#include <unordered_map>
diff --git a/src/tint/utils/math.h b/src/tint/core/math.h
similarity index 96%
rename from src/tint/utils/math.h
rename to src/tint/core/math.h
index 311ec16..d14e43d 100644
--- a/src/tint/utils/math.h
+++ b/src/tint/core/math.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_MATH_H_
-#define SRC_TINT_UTILS_MATH_H_
+#ifndef SRC_TINT_CORE_MATH_H_
+#define SRC_TINT_CORE_MATH_H_
#include <stdint.h>
@@ -100,4 +100,4 @@
} // namespace tint::utils
-#endif // SRC_TINT_UTILS_MATH_H_
+#endif // SRC_TINT_CORE_MATH_H_
diff --git a/src/tint/utils/math_test.cc b/src/tint/core/math_test.cc
similarity index 98%
rename from src/tint/utils/math_test.cc
rename to src/tint/core/math_test.cc
index e8db5f7..7e3e3e8 100644
--- a/src/tint/utils/math_test.cc
+++ b/src/tint/core/math_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/math.h"
+#include "src/tint/core/math.h"
#include "gtest/gtest.h"
diff --git a/src/tint/utils/parse_num.cc b/src/tint/core/parse_num.cc
similarity index 98%
rename from src/tint/utils/parse_num.cc
rename to src/tint/core/parse_num.cc
index fa04344..cd907a6 100644
--- a/src/tint/utils/parse_num.cc
+++ b/src/tint/core/parse_num.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/parse_num.h"
+#include "src/tint/core/parse_num.h"
#include <charconv>
diff --git a/src/tint/utils/parse_num.h b/src/tint/core/parse_num.h
similarity index 95%
rename from src/tint/utils/parse_num.h
rename to src/tint/core/parse_num.h
index 7c4ff7e..04d1876 100644
--- a/src/tint/utils/parse_num.h
+++ b/src/tint/core/parse_num.h
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_PARSE_NUM_H_
-#define SRC_TINT_UTILS_PARSE_NUM_H_
+#ifndef SRC_TINT_CORE_PARSE_NUM_H_
+#define SRC_TINT_CORE_PARSE_NUM_H_
#include <optional>
#include <string>
-#include "src/tint/utils/compiler_macros.h"
-#include "src/tint/utils/result.h"
+#include "src/tint/core/compiler_macros.h"
+#include "src/tint/core/result.h"
namespace tint::utils {
@@ -128,4 +128,4 @@
} // namespace tint::utils
-#endif // SRC_TINT_UTILS_PARSE_NUM_H_
+#endif // SRC_TINT_CORE_PARSE_NUM_H_
diff --git a/src/tint/utils/predicates.h b/src/tint/core/predicates.h
similarity index 95%
rename from src/tint/utils/predicates.h
rename to src/tint/core/predicates.h
index 0769b30..fabd3fd 100644
--- a/src/tint/utils/predicates.h
+++ b/src/tint/core/predicates.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_PREDICATES_H_
-#define SRC_TINT_UTILS_PREDICATES_H_
+#ifndef SRC_TINT_CORE_PREDICATES_H_
+#define SRC_TINT_CORE_PREDICATES_H_
namespace tint::utils {
@@ -75,4 +75,4 @@
} // namespace tint::utils
-#endif // SRC_TINT_UTILS_PREDICATES_H_
+#endif // SRC_TINT_CORE_PREDICATES_H_
diff --git a/src/tint/utils/predicates_test.cc b/src/tint/core/predicates_test.cc
similarity index 97%
rename from src/tint/utils/predicates_test.cc
rename to src/tint/core/predicates_test.cc
index 7733cf7..4d275bc 100644
--- a/src/tint/utils/predicates_test.cc
+++ b/src/tint/core/predicates_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/predicates.h"
+#include "src/tint/core/predicates.h"
#include "gtest/gtest.h"
diff --git a/src/tint/utils/result.h b/src/tint/core/result.h
similarity index 97%
rename from src/tint/utils/result.h
rename to src/tint/core/result.h
index 0254149..ec6dcbe 100644
--- a/src/tint/utils/result.h
+++ b/src/tint/core/result.h
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_RESULT_H_
-#define SRC_TINT_UTILS_RESULT_H_
+#ifndef SRC_TINT_CORE_RESULT_H_
+#define SRC_TINT_CORE_RESULT_H_
#include <utility>
#include <variant>
+#include "src/tint/core/string_stream.h"
#include "src/tint/debug.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::utils {
@@ -163,4 +163,4 @@
} // namespace tint::utils
-#endif // SRC_TINT_UTILS_RESULT_H_
+#endif // SRC_TINT_CORE_RESULT_H_
diff --git a/src/tint/utils/result_test.cc b/src/tint/core/result_test.cc
similarity index 97%
rename from src/tint/utils/result_test.cc
rename to src/tint/core/result_test.cc
index 6614028..8b08674 100644
--- a/src/tint/utils/result_test.cc
+++ b/src/tint/core/result_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/result.h"
+#include "src/tint/core/result.h"
#include <string>
diff --git a/src/tint/utils/reverse.h b/src/tint/core/reverse.h
similarity index 93%
rename from src/tint/utils/reverse.h
rename to src/tint/core/reverse.h
index f28eedd..0b568e3 100644
--- a/src/tint/utils/reverse.h
+++ b/src/tint/core/reverse.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_REVERSE_H_
-#define SRC_TINT_UTILS_REVERSE_H_
+#ifndef SRC_TINT_CORE_REVERSE_H_
+#define SRC_TINT_CORE_REVERSE_H_
#include <iterator>
@@ -59,4 +59,4 @@
} // namespace tint::utils
-#endif // SRC_TINT_UTILS_REVERSE_H_
+#endif // SRC_TINT_CORE_REVERSE_H_
diff --git a/src/tint/utils/reverse_test.cc b/src/tint/core/reverse_test.cc
similarity index 96%
rename from src/tint/utils/reverse_test.cc
rename to src/tint/core/reverse_test.cc
index 9bef6de..c0139a9 100644
--- a/src/tint/utils/reverse_test.cc
+++ b/src/tint/core/reverse_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/reverse.h"
+#include "src/tint/core/reverse.h"
#include <vector>
diff --git a/src/tint/utils/scoped_assignment.h b/src/tint/core/scoped_assignment.h
similarity index 92%
rename from src/tint/utils/scoped_assignment.h
rename to src/tint/core/scoped_assignment.h
index 6149454..cd2343c 100644
--- a/src/tint/utils/scoped_assignment.h
+++ b/src/tint/core/scoped_assignment.h
@@ -13,12 +13,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_SCOPED_ASSIGNMENT_H_
-#define SRC_TINT_UTILS_SCOPED_ASSIGNMENT_H_
+#ifndef SRC_TINT_CORE_SCOPED_ASSIGNMENT_H_
+#define SRC_TINT_CORE_SCOPED_ASSIGNMENT_H_
#include <type_traits>
-#include "src/tint/utils/concat.h"
+#include "src/tint/core/concat.h"
namespace tint::utils {
@@ -59,4 +59,4 @@
var, val \
}
-#endif // SRC_TINT_UTILS_SCOPED_ASSIGNMENT_H_
+#endif // SRC_TINT_CORE_SCOPED_ASSIGNMENT_H_
diff --git a/src/tint/utils/scoped_assignment_test.cc b/src/tint/core/scoped_assignment_test.cc
similarity index 95%
rename from src/tint/utils/scoped_assignment_test.cc
rename to src/tint/core/scoped_assignment_test.cc
index 3c0c548..04142f9 100644
--- a/src/tint/utils/scoped_assignment_test.cc
+++ b/src/tint/core/scoped_assignment_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/scoped_assignment.h"
+#include "src/tint/core/scoped_assignment.h"
#include "gtest/gtest.h"
diff --git a/src/tint/utils/slice.h b/src/tint/core/slice.h
similarity index 97%
rename from src/tint/utils/slice.h
rename to src/tint/core/slice.h
index efe2ac4..268d0cd 100644
--- a/src/tint/utils/slice.h
+++ b/src/tint/core/slice.h
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_SLICE_H_
-#define SRC_TINT_UTILS_SLICE_H_
+#ifndef SRC_TINT_CORE_SLICE_H_
+#define SRC_TINT_CORE_SLICE_H_
#include <cstdint>
#include <iterator>
+#include "src/tint/core/bitcast.h"
+#include "src/tint/core/castable.h"
+#include "src/tint/core/traits.h"
#include "src/tint/debug.h"
-#include "src/tint/utils/bitcast.h"
-#include "src/tint/utils/castable.h"
-#include "src/tint/utils/traits.h"
namespace tint::utils {
@@ -255,4 +255,4 @@
} // namespace tint::utils
-#endif // SRC_TINT_UTILS_SLICE_H_
+#endif // SRC_TINT_CORE_SLICE_H_
diff --git a/src/tint/utils/slice_test.cc b/src/tint/core/slice_test.cc
similarity index 99%
rename from src/tint/utils/slice_test.cc
rename to src/tint/core/slice_test.cc
index 5725870..be2a5c6 100644
--- a/src/tint/utils/slice_test.cc
+++ b/src/tint/core/slice_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/slice.h"
+#include "src/tint/core/slice.h"
#include "gmock/gmock.h"
diff --git a/src/tint/utils/string.cc b/src/tint/core/string.cc
similarity index 96%
rename from src/tint/utils/string.cc
rename to src/tint/core/string.cc
index 320335d..3cd831d 100644
--- a/src/tint/utils/string.cc
+++ b/src/tint/core/string.cc
@@ -14,9 +14,9 @@
#include <algorithm>
-#include "src/tint/utils/string.h"
-#include "src/tint/utils/transform.h"
-#include "src/tint/utils/vector.h"
+#include "src/tint/core/string.h"
+#include "src/tint/core/transform.h"
+#include "src/tint/core/vector.h"
namespace tint::utils {
diff --git a/src/tint/utils/string.h b/src/tint/core/string.h
similarity index 97%
rename from src/tint/utils/string.h
rename to src/tint/core/string.h
index 99c930a..8155437 100644
--- a/src/tint/utils/string.h
+++ b/src/tint/core/string.h
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_STRING_H_
-#define SRC_TINT_UTILS_STRING_H_
+#ifndef SRC_TINT_CORE_STRING_H_
+#define SRC_TINT_CORE_STRING_H_
#include <string>
#include <variant>
-#include "src/tint/utils/slice.h"
-#include "src/tint/utils/string_stream.h"
-#include "src/tint/utils/vector.h"
+#include "src/tint/core/slice.h"
+#include "src/tint/core/string_stream.h"
+#include "src/tint/core/vector.h"
namespace tint::utils {
@@ -222,4 +222,4 @@
} // namespace tint::utils
-#endif // SRC_TINT_UTILS_STRING_H_
+#endif // SRC_TINT_CORE_STRING_H_
diff --git a/src/tint/utils/string_stream.cc b/src/tint/core/string_stream.cc
similarity index 97%
rename from src/tint/utils/string_stream.cc
rename to src/tint/core/string_stream.cc
index fb37782..66aeee7 100644
--- a/src/tint/utils/string_stream.cc
+++ b/src/tint/core/string_stream.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::utils {
diff --git a/src/tint/utils/string_stream.h b/src/tint/core/string_stream.h
similarity index 97%
rename from src/tint/utils/string_stream.h
rename to src/tint/core/string_stream.h
index 7485a9f..e178871 100644
--- a/src/tint/utils/string_stream.h
+++ b/src/tint/core/string_stream.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_STRING_STREAM_H_
-#define SRC_TINT_UTILS_STRING_STREAM_H_
+#ifndef SRC_TINT_CORE_STRING_STREAM_H_
+#define SRC_TINT_CORE_STRING_STREAM_H_
#include <functional>
#include <iomanip>
@@ -23,7 +23,7 @@
#include <string>
#include <utility>
-#include "src/tint/utils/unicode.h"
+#include "src/tint/core/unicode.h"
namespace tint::utils {
@@ -194,4 +194,4 @@
} // namespace tint::utils
-#endif // SRC_TINT_UTILS_STRING_STREAM_H_
+#endif // SRC_TINT_CORE_STRING_STREAM_H_
diff --git a/src/tint/utils/string_stream_test.cc b/src/tint/core/string_stream_test.cc
similarity index 98%
rename from src/tint/utils/string_stream_test.cc
rename to src/tint/core/string_stream_test.cc
index 5f99026..711a10d 100644
--- a/src/tint/utils/string_stream_test.cc
+++ b/src/tint/core/string_stream_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
#include <math.h>
#include <cstring>
diff --git a/src/tint/utils/string_test.cc b/src/tint/core/string_test.cc
similarity index 97%
rename from src/tint/utils/string_test.cc
rename to src/tint/core/string_test.cc
index 63f72a6..5659bd4 100644
--- a/src/tint/utils/string_test.cc
+++ b/src/tint/core/string_test.cc
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/string.h"
+#include "src/tint/core/string.h"
#include "gmock/gmock.h"
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
-#include "src/tint/utils/transform.h" // Used by ToStringList()
+#include "src/tint/core/transform.h" // Used by ToStringList()
namespace tint::utils {
namespace {
diff --git a/src/tint/utils/traits.h b/src/tint/core/traits.h
similarity index 98%
rename from src/tint/utils/traits.h
rename to src/tint/core/traits.h
index f37b073..4071249 100644
--- a/src/tint/utils/traits.h
+++ b/src/tint/core/traits.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_TRAITS_H_
-#define SRC_TINT_UTILS_TRAITS_H_
+#ifndef SRC_TINT_CORE_TRAITS_H_
+#define SRC_TINT_CORE_TRAITS_H_
#include <string>
#include <tuple>
@@ -211,4 +211,4 @@
} // namespace tint::utils::traits
-#endif // SRC_TINT_UTILS_TRAITS_H_
+#endif // SRC_TINT_CORE_TRAITS_H_
diff --git a/src/tint/utils/traits_test.cc b/src/tint/core/traits_test.cc
similarity index 99%
rename from src/tint/utils/traits_test.cc
rename to src/tint/core/traits_test.cc
index 83a80f9..de14972 100644
--- a/src/tint/utils/traits_test.cc
+++ b/src/tint/core/traits_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/traits.h"
+#include "src/tint/core/traits.h"
#include "gtest/gtest.h"
diff --git a/src/tint/utils/transform.h b/src/tint/core/transform.h
similarity index 97%
rename from src/tint/utils/transform.h
rename to src/tint/core/transform.h
index 7ecd941..30e2952 100644
--- a/src/tint/utils/transform.h
+++ b/src/tint/core/transform.h
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_TRANSFORM_H_
-#define SRC_TINT_UTILS_TRANSFORM_H_
+#ifndef SRC_TINT_CORE_TRANSFORM_H_
+#define SRC_TINT_CORE_TRANSFORM_H_
#include <algorithm>
#include <type_traits>
#include <utility>
#include <vector>
-#include "src/tint/utils/traits.h"
-#include "src/tint/utils/vector.h"
+#include "src/tint/core/traits.h"
+#include "src/tint/core/vector.h"
namespace tint::utils {
@@ -172,4 +172,4 @@
} // namespace tint::utils
-#endif // SRC_TINT_UTILS_TRANSFORM_H_
+#endif // SRC_TINT_CORE_TRANSFORM_H_
diff --git a/src/tint/utils/transform_test.cc b/src/tint/core/transform_test.cc
similarity index 99%
rename from src/tint/utils/transform_test.cc
rename to src/tint/core/transform_test.cc
index 71b3f0c..c97d9d3 100644
--- a/src/tint/utils/transform_test.cc
+++ b/src/tint/core/transform_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/transform.h"
+#include "src/tint/core/transform.h"
#include <string>
#include <type_traits>
diff --git a/src/tint/utils/unicode.cc b/src/tint/core/unicode.cc
similarity index 99%
rename from src/tint/utils/unicode.cc
rename to src/tint/core/unicode.cc
index eac220c..db1e90e 100644
--- a/src/tint/utils/unicode.cc
+++ b/src/tint/core/unicode.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/unicode.h"
+#include "src/tint/core/unicode.h"
#include <algorithm>
diff --git a/src/tint/utils/unicode.h b/src/tint/core/unicode.h
similarity index 95%
rename from src/tint/utils/unicode.h
rename to src/tint/core/unicode.h
index 083b9a2..70c4bae 100644
--- a/src/tint/utils/unicode.h
+++ b/src/tint/core/unicode.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_UNICODE_H_
-#define SRC_TINT_UTILS_UNICODE_H_
+#ifndef SRC_TINT_CORE_UNICODE_H_
+#define SRC_TINT_CORE_UNICODE_H_
#include <cstddef>
#include <cstdint>
@@ -77,4 +77,4 @@
} // namespace tint::utils
-#endif // SRC_TINT_UTILS_UNICODE_H_
+#endif // SRC_TINT_CORE_UNICODE_H_
diff --git a/src/tint/utils/unicode_test.cc b/src/tint/core/unicode_test.cc
similarity index 99%
rename from src/tint/utils/unicode_test.cc
rename to src/tint/core/unicode_test.cc
index 6e74e9a..09deb98 100644
--- a/src/tint/utils/unicode_test.cc
+++ b/src/tint/core/unicode_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/unicode.h"
+#include "src/tint/core/unicode.h"
#include <string>
#include <vector>
diff --git a/src/tint/utils/unique_allocator.h b/src/tint/core/unique_allocator.h
similarity index 95%
rename from src/tint/utils/unique_allocator.h
rename to src/tint/core/unique_allocator.h
index 7ba5909..b3a5ad6 100644
--- a/src/tint/utils/unique_allocator.h
+++ b/src/tint/core/unique_allocator.h
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_UNIQUE_ALLOCATOR_H_
-#define SRC_TINT_UTILS_UNIQUE_ALLOCATOR_H_
+#ifndef SRC_TINT_CORE_UNIQUE_ALLOCATOR_H_
+#define SRC_TINT_CORE_UNIQUE_ALLOCATOR_H_
#include <functional>
#include <unordered_set>
#include <utility>
-#include "src/tint/utils/block_allocator.h"
+#include "src/tint/core/block_allocator.h"
namespace tint::utils {
@@ -116,4 +116,4 @@
} // namespace tint::utils
-#endif // SRC_TINT_UTILS_UNIQUE_ALLOCATOR_H_
+#endif // SRC_TINT_CORE_UNIQUE_ALLOCATOR_H_
diff --git a/src/tint/utils/unique_allocator_test.cc b/src/tint/core/unique_allocator_test.cc
similarity index 96%
rename from src/tint/utils/unique_allocator_test.cc
rename to src/tint/core/unique_allocator_test.cc
index b618734..e3e398e 100644
--- a/src/tint/utils/unique_allocator_test.cc
+++ b/src/tint/core/unique_allocator_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/unique_allocator.h"
+#include "src/tint/core/unique_allocator.h"
#include <string>
diff --git a/src/tint/utils/unique_vector.h b/src/tint/core/unique_vector.h
similarity index 95%
rename from src/tint/utils/unique_vector.h
rename to src/tint/core/unique_vector.h
index 22df7ec..ce8f5d3 100644
--- a/src/tint/utils/unique_vector.h
+++ b/src/tint/core/unique_vector.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_UNIQUE_VECTOR_H_
-#define SRC_TINT_UTILS_UNIQUE_VECTOR_H_
+#ifndef SRC_TINT_CORE_UNIQUE_VECTOR_H_
+#define SRC_TINT_CORE_UNIQUE_VECTOR_H_
#include <cstddef>
#include <functional>
@@ -21,8 +21,8 @@
#include <utility>
#include <vector>
-#include "src/tint/utils/hashset.h"
-#include "src/tint/utils/vector.h"
+#include "src/tint/core/hashset.h"
+#include "src/tint/core/vector.h"
namespace tint::utils {
@@ -146,4 +146,4 @@
} // namespace tint::utils
-#endif // SRC_TINT_UTILS_UNIQUE_VECTOR_H_
+#endif // SRC_TINT_CORE_UNIQUE_VECTOR_H_
diff --git a/src/tint/utils/unique_vector_test.cc b/src/tint/core/unique_vector_test.cc
similarity index 98%
rename from src/tint/utils/unique_vector_test.cc
rename to src/tint/core/unique_vector_test.cc
index 1d8b2f8..bfcd0c9 100644
--- a/src/tint/utils/unique_vector_test.cc
+++ b/src/tint/core/unique_vector_test.cc
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/unique_vector.h"
+#include "src/tint/core/unique_vector.h"
#include <vector>
-#include "src/tint/utils/reverse.h"
+#include "src/tint/core/reverse.h"
#include "gtest/gtest.h"
diff --git a/src/tint/utils/vector.h b/src/tint/core/vector.h
similarity index 98%
rename from src/tint/utils/vector.h
rename to src/tint/core/vector.h
index 7f4c8bb..5b5fc62 100644
--- a/src/tint/utils/vector.h
+++ b/src/tint/core/vector.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_VECTOR_H_
-#define SRC_TINT_UTILS_VECTOR_H_
+#ifndef SRC_TINT_CORE_VECTOR_H_
+#define SRC_TINT_CORE_VECTOR_H_
#include <stddef.h>
#include <stdint.h>
@@ -23,11 +23,11 @@
#include <utility>
#include <vector>
+#include "src/tint/core/bitcast.h"
+#include "src/tint/core/compiler_macros.h"
+#include "src/tint/core/slice.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/debug.h"
-#include "src/tint/utils/bitcast.h"
-#include "src/tint/utils/compiler_macros.h"
-#include "src/tint/utils/slice.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::utils {
@@ -894,4 +894,4 @@
} // namespace tint::utils
-#endif // SRC_TINT_UTILS_VECTOR_H_
+#endif // SRC_TINT_CORE_VECTOR_H_
diff --git a/src/tint/utils/vector_test.cc b/src/tint/core/vector_test.cc
similarity index 99%
rename from src/tint/utils/vector_test.cc
rename to src/tint/core/vector_test.cc
index 5e39720..ee572d6 100644
--- a/src/tint/utils/vector_test.cc
+++ b/src/tint/core/vector_test.cc
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/vector.h"
+#include "src/tint/core/vector.h"
#include <string>
#include <tuple>
#include "gmock/gmock.h"
-#include "src/tint/utils/bitcast.h"
-#include "src/tint/utils/predicates.h"
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/bitcast.h"
+#include "src/tint/core/predicates.h"
+#include "src/tint/core/string_stream.h"
namespace tint::utils {
namespace {
diff --git a/src/tint/debug.cc b/src/tint/debug.cc
index 72da293..cd89779 100644
--- a/src/tint/debug.cc
+++ b/src/tint/debug.cc
@@ -16,7 +16,7 @@
#include <memory>
-#include "src/tint/utils/debugger.h"
+#include "src/tint/core/debugger.h"
namespace tint {
namespace {
diff --git a/src/tint/debug.h b/src/tint/debug.h
index dacf76b..ebc41ae 100644
--- a/src/tint/debug.h
+++ b/src/tint/debug.h
@@ -17,11 +17,11 @@
#include <utility>
+#include "src/tint/core/compiler_macros.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/diagnostic/diagnostic.h"
#include "src/tint/diagnostic/formatter.h"
#include "src/tint/diagnostic/printer.h"
-#include "src/tint/utils/compiler_macros.h"
-#include "src/tint/utils/string_stream.h"
namespace tint {
diff --git a/src/tint/diagnostic/formatter.cc b/src/tint/diagnostic/formatter.cc
index 9752838..2f881bc 100644
--- a/src/tint/diagnostic/formatter.cc
+++ b/src/tint/diagnostic/formatter.cc
@@ -19,9 +19,9 @@
#include <utility>
#include <vector>
+#include "src/tint/core/string_stream.h"
#include "src/tint/diagnostic/diagnostic.h"
#include "src/tint/diagnostic/printer.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::diag {
namespace {
diff --git a/src/tint/diagnostic/printer.h b/src/tint/diagnostic/printer.h
index 5e7752c..570f45a 100644
--- a/src/tint/diagnostic/printer.h
+++ b/src/tint/diagnostic/printer.h
@@ -18,7 +18,7 @@
#include <memory>
#include <string>
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::diag {
diff --git a/src/tint/fuzzers/mersenne_twister_engine.cc b/src/tint/fuzzers/mersenne_twister_engine.cc
index 6a011ac..3bccff1 100644
--- a/src/tint/fuzzers/mersenne_twister_engine.cc
+++ b/src/tint/fuzzers/mersenne_twister_engine.cc
@@ -17,7 +17,7 @@
#include <algorithm>
#include <cassert>
-#include "src/tint/utils/hash.h"
+#include "src/tint/core/hash.h"
namespace tint::fuzzers {
diff --git a/src/tint/fuzzers/random_generator.cc b/src/tint/fuzzers/random_generator.cc
index 35b5caf..0260a3c 100644
--- a/src/tint/fuzzers/random_generator.cc
+++ b/src/tint/fuzzers/random_generator.cc
@@ -18,9 +18,9 @@
#include <cassert>
#include <utility>
+#include "src/tint/core/hash.h"
#include "src/tint/fuzzers/mersenne_twister_engine.h"
#include "src/tint/fuzzers/random_generator_engine.h"
-#include "src/tint/utils/hash.h"
namespace tint::fuzzers {
@@ -28,7 +28,7 @@
/// Calculate the hash for the contents of a c-style data buffer
/// This is intentionally not implemented as a generic override of HashCombine
-/// in "src/tint/utils/hash.h", because it conflicts with the vardiac override
+/// in "src/tint/core/hash.h", because it conflicts with the vardiac override
/// for the case where a pointer and an integer are being hashed.
/// @param data - pointer to buffer to be hashed
/// @param size - number of elements in buffer
diff --git a/src/tint/fuzzers/tint_ast_fuzzer/util.h b/src/tint/fuzzers/tint_ast_fuzzer/util.h
index d723c09..5b1c2e0 100644
--- a/src/tint/fuzzers/tint_ast_fuzzer/util.h
+++ b/src/tint/fuzzers/tint_ast_fuzzer/util.h
@@ -17,6 +17,7 @@
#include <vector>
+#include "src/tint/core/castable.h"
#include "src/tint/lang/wgsl/ast/module.h"
#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
#include "src/tint/lang/wgsl/sem/block_statement.h"
@@ -24,7 +25,6 @@
#include "src/tint/lang/wgsl/sem/statement.h"
#include "src/tint/lang/wgsl/sem/variable.h"
#include "src/tint/program.h"
-#include "src/tint/utils/castable.h"
namespace tint::fuzzers::ast_fuzzer::util {
/// @file
diff --git a/src/tint/fuzzers/tint_common_fuzzer.cc b/src/tint/fuzzers/tint_common_fuzzer.cc
index 1464cdb..c791a14 100644
--- a/src/tint/fuzzers/tint_common_fuzzer.cc
+++ b/src/tint/fuzzers/tint_common_fuzzer.cc
@@ -30,6 +30,7 @@
#include "spirv-tools/libspirv.hpp"
#endif // TINT_BUILD_SPV_READER || TINT_BUILD_SPV_WRITER
+#include "src/tint/core/hash.h"
#include "src/tint/diagnostic/formatter.h"
#include "src/tint/fuzzers/apply_substitute_overrides.h"
#include "src/tint/lang/wgsl/ast/module.h"
@@ -37,7 +38,6 @@
#include "src/tint/lang/wgsl/sem/variable.h"
#include "src/tint/program.h"
#include "src/tint/type/external_texture.h"
-#include "src/tint/utils/hash.h"
#include "src/tint/writer/flatten_bindings.h"
namespace tint::fuzzers {
diff --git a/src/tint/fuzzers/tint_concurrency_fuzzer.cc b/src/tint/fuzzers/tint_concurrency_fuzzer.cc
index 26860be..942da74 100644
--- a/src/tint/fuzzers/tint_concurrency_fuzzer.cc
+++ b/src/tint/fuzzers/tint_concurrency_fuzzer.cc
@@ -19,6 +19,7 @@
#include <thread>
+#include "src/tint/core/hash.h"
#include "src/tint/fuzzers/apply_substitute_overrides.h"
#include "src/tint/inspector/inspector.h"
#include "src/tint/lang/glsl/ast_writer/generator.h"
@@ -26,7 +27,6 @@
#include "src/tint/lang/msl/ast_writer/generator.h"
#include "src/tint/lang/wgsl/ast_writer/generator.h"
#include "src/tint/lang/wgsl/reader/parser.h"
-#include "src/tint/utils/hash.h"
#include "src/tint/writer/flatten_bindings.h"
#include "src/tint/writer/spirv/generator.h"
diff --git a/src/tint/inspector/inspector.cc b/src/tint/inspector/inspector.cc
index 01cf7a0..4721726 100644
--- a/src/tint/inspector/inspector.cc
+++ b/src/tint/inspector/inspector.cc
@@ -21,6 +21,9 @@
#include "src/tint/builtin/extension.h"
#include "src/tint/builtin/interpolation_sampling.h"
#include "src/tint/builtin/interpolation_type.h"
+#include "src/tint/core/math.h"
+#include "src/tint/core/string.h"
+#include "src/tint/core/unique_vector.h"
#include "src/tint/lang/wgsl/ast/bool_literal_expression.h"
#include "src/tint/lang/wgsl/ast/call_expression.h"
#include "src/tint/lang/wgsl/ast/float_literal_expression.h"
@@ -55,9 +58,6 @@
#include "src/tint/type/u32.h"
#include "src/tint/type/vector.h"
#include "src/tint/type/void.h"
-#include "src/tint/utils/math.h"
-#include "src/tint/utils/string.h"
-#include "src/tint/utils/unique_vector.h"
namespace tint::inspector {
diff --git a/src/tint/inspector/inspector.h b/src/tint/inspector/inspector.h
index b0780d1..e8922c4 100644
--- a/src/tint/inspector/inspector.h
+++ b/src/tint/inspector/inspector.h
@@ -26,12 +26,12 @@
#include "tint/override_id.h"
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/core/unique_vector.h"
#include "src/tint/inspector/entry_point.h"
#include "src/tint/inspector/resource_binding.h"
#include "src/tint/inspector/scalar.h"
#include "src/tint/lang/wgsl/sem/sampler_texture_pair.h"
#include "src/tint/program.h"
-#include "src/tint/utils/unique_vector.h"
namespace tint::inspector {
diff --git a/src/tint/ir/access.h b/src/tint/ir/access.h
index 7e22c60..6c4a68e 100644
--- a/src/tint/ir/access.h
+++ b/src/tint/ir/access.h
@@ -15,8 +15,8 @@
#ifndef SRC_TINT_IR_ACCESS_H_
#define SRC_TINT_IR_ACCESS_H_
+#include "src/tint/core/castable.h"
#include "src/tint/ir/operand_instruction.h"
-#include "src/tint/utils/castable.h"
namespace tint::ir {
diff --git a/src/tint/ir/binary.h b/src/tint/ir/binary.h
index e5c9176..29edd32 100644
--- a/src/tint/ir/binary.h
+++ b/src/tint/ir/binary.h
@@ -15,8 +15,8 @@
#ifndef SRC_TINT_IR_BINARY_H_
#define SRC_TINT_IR_BINARY_H_
+#include "src/tint/core/castable.h"
#include "src/tint/ir/operand_instruction.h"
-#include "src/tint/utils/castable.h"
namespace tint::ir {
diff --git a/src/tint/ir/bitcast.h b/src/tint/ir/bitcast.h
index c68ea8f7..d22bd57 100644
--- a/src/tint/ir/bitcast.h
+++ b/src/tint/ir/bitcast.h
@@ -15,8 +15,8 @@
#ifndef SRC_TINT_IR_BITCAST_H_
#define SRC_TINT_IR_BITCAST_H_
+#include "src/tint/core/castable.h"
#include "src/tint/ir/call.h"
-#include "src/tint/utils/castable.h"
namespace tint::ir {
diff --git a/src/tint/ir/block.h b/src/tint/ir/block.h
index 8c9e06a..64f5830 100644
--- a/src/tint/ir/block.h
+++ b/src/tint/ir/block.h
@@ -17,9 +17,9 @@
#include <utility>
+#include "src/tint/core/vector.h"
#include "src/tint/ir/instruction.h"
#include "src/tint/ir/terminator.h"
-#include "src/tint/utils/vector.h"
// Forward declarations
namespace tint::ir {
diff --git a/src/tint/ir/block_param.h b/src/tint/ir/block_param.h
index 51a257c..fb230d5 100644
--- a/src/tint/ir/block_param.h
+++ b/src/tint/ir/block_param.h
@@ -15,8 +15,8 @@
#ifndef SRC_TINT_IR_BLOCK_PARAM_H_
#define SRC_TINT_IR_BLOCK_PARAM_H_
+#include "src/tint/core/castable.h"
#include "src/tint/ir/value.h"
-#include "src/tint/utils/castable.h"
namespace tint::ir {
diff --git a/src/tint/ir/break_if.h b/src/tint/ir/break_if.h
index 0c21c94..f5f52c8 100644
--- a/src/tint/ir/break_if.h
+++ b/src/tint/ir/break_if.h
@@ -15,9 +15,9 @@
#ifndef SRC_TINT_IR_BREAK_IF_H_
#define SRC_TINT_IR_BREAK_IF_H_
+#include "src/tint/core/castable.h"
#include "src/tint/ir/terminator.h"
#include "src/tint/ir/value.h"
-#include "src/tint/utils/castable.h"
// Forward declarations
namespace tint::ir {
diff --git a/src/tint/ir/builder.h b/src/tint/ir/builder.h
index 21bda1f..6bb437b 100644
--- a/src/tint/ir/builder.h
+++ b/src/tint/ir/builder.h
@@ -20,6 +20,7 @@
#include "src/tint/constant/composite.h"
#include "src/tint/constant/scalar.h"
#include "src/tint/constant/splat.h"
+#include "src/tint/core/scoped_assignment.h"
#include "src/tint/ir/access.h"
#include "src/tint/ir/binary.h"
#include "src/tint/ir/bitcast.h"
@@ -66,7 +67,6 @@
#include "src/tint/type/u32.h"
#include "src/tint/type/vector.h"
#include "src/tint/type/void.h"
-#include "src/tint/utils/scoped_assignment.h"
namespace tint::ir {
diff --git a/src/tint/ir/builtin_call.h b/src/tint/ir/builtin_call.h
index 06cf148..c3c3f9d 100644
--- a/src/tint/ir/builtin_call.h
+++ b/src/tint/ir/builtin_call.h
@@ -15,8 +15,8 @@
#ifndef SRC_TINT_IR_BUILTIN_CALL_H_
#define SRC_TINT_IR_BUILTIN_CALL_H_
+#include "src/tint/core/castable.h"
#include "src/tint/ir/call.h"
-#include "src/tint/utils/castable.h"
namespace tint::ir {
diff --git a/src/tint/ir/call.h b/src/tint/ir/call.h
index ea7e14e..9b3bad7 100644
--- a/src/tint/ir/call.h
+++ b/src/tint/ir/call.h
@@ -15,8 +15,8 @@
#ifndef SRC_TINT_IR_CALL_H_
#define SRC_TINT_IR_CALL_H_
+#include "src/tint/core/castable.h"
#include "src/tint/ir/operand_instruction.h"
-#include "src/tint/utils/castable.h"
namespace tint::ir {
diff --git a/src/tint/ir/construct.h b/src/tint/ir/construct.h
index 96d81cd..fba66ef 100644
--- a/src/tint/ir/construct.h
+++ b/src/tint/ir/construct.h
@@ -15,8 +15,8 @@
#ifndef SRC_TINT_IR_CONSTRUCT_H_
#define SRC_TINT_IR_CONSTRUCT_H_
+#include "src/tint/core/castable.h"
#include "src/tint/ir/call.h"
-#include "src/tint/utils/castable.h"
namespace tint::ir {
diff --git a/src/tint/ir/continue.h b/src/tint/ir/continue.h
index 9a27fd6..3fdd4f2 100644
--- a/src/tint/ir/continue.h
+++ b/src/tint/ir/continue.h
@@ -15,8 +15,8 @@
#ifndef SRC_TINT_IR_CONTINUE_H_
#define SRC_TINT_IR_CONTINUE_H_
+#include "src/tint/core/castable.h"
#include "src/tint/ir/terminator.h"
-#include "src/tint/utils/castable.h"
// Forward declarations
namespace tint::ir {
diff --git a/src/tint/ir/convert.h b/src/tint/ir/convert.h
index a4e22e7..a15e061 100644
--- a/src/tint/ir/convert.h
+++ b/src/tint/ir/convert.h
@@ -15,9 +15,9 @@
#ifndef SRC_TINT_IR_CONVERT_H_
#define SRC_TINT_IR_CONVERT_H_
+#include "src/tint/core/castable.h"
#include "src/tint/ir/call.h"
#include "src/tint/type/type.h"
-#include "src/tint/utils/castable.h"
namespace tint::ir {
diff --git a/src/tint/ir/core_builtin_call.h b/src/tint/ir/core_builtin_call.h
index 4157a41..cf9e99c 100644
--- a/src/tint/ir/core_builtin_call.h
+++ b/src/tint/ir/core_builtin_call.h
@@ -16,8 +16,8 @@
#define SRC_TINT_IR_CORE_BUILTIN_CALL_H_
#include "src/tint/builtin/function.h"
+#include "src/tint/core/castable.h"
#include "src/tint/ir/builtin_call.h"
-#include "src/tint/utils/castable.h"
namespace tint::ir {
diff --git a/src/tint/ir/disassembler.cc b/src/tint/ir/disassembler.cc
index f458585..9ec32be 100644
--- a/src/tint/ir/disassembler.cc
+++ b/src/tint/ir/disassembler.cc
@@ -18,6 +18,8 @@
#include "src/tint/constant/composite.h"
#include "src/tint/constant/scalar.h"
#include "src/tint/constant/splat.h"
+#include "src/tint/core/scoped_assignment.h"
+#include "src/tint/core/string.h"
#include "src/tint/ir/access.h"
#include "src/tint/ir/binary.h"
#include "src/tint/ir/bitcast.h"
@@ -53,8 +55,6 @@
#include "src/tint/switch.h"
#include "src/tint/type/struct.h"
#include "src/tint/type/type.h"
-#include "src/tint/utils/scoped_assignment.h"
-#include "src/tint/utils/string.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/ir/disassembler.h b/src/tint/ir/disassembler.h
index fc09f01..96171f5 100644
--- a/src/tint/ir/disassembler.h
+++ b/src/tint/ir/disassembler.h
@@ -17,6 +17,9 @@
#include <string>
+#include "src/tint/core/hashmap.h"
+#include "src/tint/core/hashset.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/ir/binary.h"
#include "src/tint/ir/block.h"
#include "src/tint/ir/call.h"
@@ -25,9 +28,6 @@
#include "src/tint/ir/module.h"
#include "src/tint/ir/switch.h"
#include "src/tint/ir/unary.h"
-#include "src/tint/utils/hashmap.h"
-#include "src/tint/utils/hashset.h"
-#include "src/tint/utils/string_stream.h"
// Forward declarations.
namespace tint::type {
diff --git a/src/tint/ir/discard.h b/src/tint/ir/discard.h
index 21ea778..6b90a75 100644
--- a/src/tint/ir/discard.h
+++ b/src/tint/ir/discard.h
@@ -15,9 +15,9 @@
#ifndef SRC_TINT_IR_DISCARD_H_
#define SRC_TINT_IR_DISCARD_H_
+#include "src/tint/core/castable.h"
#include "src/tint/debug.h"
#include "src/tint/ir/call.h"
-#include "src/tint/utils/castable.h"
namespace tint::ir {
diff --git a/src/tint/ir/exit_if.h b/src/tint/ir/exit_if.h
index 9658803..c3231ef 100644
--- a/src/tint/ir/exit_if.h
+++ b/src/tint/ir/exit_if.h
@@ -15,8 +15,8 @@
#ifndef SRC_TINT_IR_EXIT_IF_H_
#define SRC_TINT_IR_EXIT_IF_H_
+#include "src/tint/core/castable.h"
#include "src/tint/ir/exit.h"
-#include "src/tint/utils/castable.h"
// Forward declarations
namespace tint::ir {
diff --git a/src/tint/ir/exit_loop.h b/src/tint/ir/exit_loop.h
index 5594017..2779e5b 100644
--- a/src/tint/ir/exit_loop.h
+++ b/src/tint/ir/exit_loop.h
@@ -15,8 +15,8 @@
#ifndef SRC_TINT_IR_EXIT_LOOP_H_
#define SRC_TINT_IR_EXIT_LOOP_H_
+#include "src/tint/core/castable.h"
#include "src/tint/ir/exit.h"
-#include "src/tint/utils/castable.h"
// Forward declarations
namespace tint::ir {
diff --git a/src/tint/ir/exit_switch.h b/src/tint/ir/exit_switch.h
index 8de3dd4..36ea986 100644
--- a/src/tint/ir/exit_switch.h
+++ b/src/tint/ir/exit_switch.h
@@ -15,8 +15,8 @@
#ifndef SRC_TINT_IR_EXIT_SWITCH_H_
#define SRC_TINT_IR_EXIT_SWITCH_H_
+#include "src/tint/core/castable.h"
#include "src/tint/ir/exit.h"
-#include "src/tint/utils/castable.h"
// Forward declarations
namespace tint::ir {
diff --git a/src/tint/ir/from_program.cc b/src/tint/ir/from_program.cc
index dadbd3a..ec300cf 100644
--- a/src/tint/ir/from_program.cc
+++ b/src/tint/ir/from_program.cc
@@ -20,6 +20,10 @@
#include <variant>
#include <vector>
+#include "src/tint/core/defer.h"
+#include "src/tint/core/result.h"
+#include "src/tint/core/reverse.h"
+#include "src/tint/core/scoped_assignment.h"
#include "src/tint/ir/block_param.h"
#include "src/tint/ir/builder.h"
#include "src/tint/ir/exit_if.h"
@@ -100,10 +104,6 @@
#include "src/tint/type/reference.h"
#include "src/tint/type/struct.h"
#include "src/tint/type/void.h"
-#include "src/tint/utils/defer.h"
-#include "src/tint/utils/result.h"
-#include "src/tint/utils/reverse.h"
-#include "src/tint/utils/scoped_assignment.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/ir/from_program.h b/src/tint/ir/from_program.h
index 1853a9e..0a23dce 100644
--- a/src/tint/ir/from_program.h
+++ b/src/tint/ir/from_program.h
@@ -17,8 +17,8 @@
#include <string>
+#include "src/tint/core/result.h"
#include "src/tint/ir/module.h"
-#include "src/tint/utils/result.h"
// Forward Declarations
namespace tint {
diff --git a/src/tint/ir/function.cc b/src/tint/ir/function.cc
index 10b896a..277d711 100644
--- a/src/tint/ir/function.cc
+++ b/src/tint/ir/function.cc
@@ -14,7 +14,7 @@
#include "src/tint/ir/function.h"
-#include "src/tint/utils/predicates.h"
+#include "src/tint/core/predicates.h"
TINT_INSTANTIATE_TYPEINFO(tint::ir::Function);
diff --git a/src/tint/ir/function_param.h b/src/tint/ir/function_param.h
index 0c138bc..2fe15d1 100644
--- a/src/tint/ir/function_param.h
+++ b/src/tint/ir/function_param.h
@@ -17,11 +17,11 @@
#include <utility>
+#include "src/tint/core/castable.h"
+#include "src/tint/core/vector.h"
#include "src/tint/ir/binding_point.h"
#include "src/tint/ir/location.h"
#include "src/tint/ir/value.h"
-#include "src/tint/utils/castable.h"
-#include "src/tint/utils/vector.h"
namespace tint::ir {
diff --git a/src/tint/ir/instruction.h b/src/tint/ir/instruction.h
index 7ffa0fc..af76df0 100644
--- a/src/tint/ir/instruction.h
+++ b/src/tint/ir/instruction.h
@@ -15,10 +15,10 @@
#ifndef SRC_TINT_IR_INSTRUCTION_H_
#define SRC_TINT_IR_INSTRUCTION_H_
+#include "src/tint/core/castable.h"
+#include "src/tint/core/enum_set.h"
#include "src/tint/ir/instruction_result.h"
#include "src/tint/ir/value.h"
-#include "src/tint/utils/castable.h"
-#include "src/tint/utils/enum_set.h"
// Forward declarations
namespace tint::ir {
diff --git a/src/tint/ir/instruction_result.h b/src/tint/ir/instruction_result.h
index 19dbd0d..6ef0fd6 100644
--- a/src/tint/ir/instruction_result.h
+++ b/src/tint/ir/instruction_result.h
@@ -15,8 +15,8 @@
#ifndef SRC_TINT_IR_INSTRUCTION_RESULT_H_
#define SRC_TINT_IR_INSTRUCTION_RESULT_H_
+#include "src/tint/core/string_stream.h"
#include "src/tint/ir/value.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::ir {
diff --git a/src/tint/ir/intrinsic_call.h b/src/tint/ir/intrinsic_call.h
index 9c10969..7405167 100644
--- a/src/tint/ir/intrinsic_call.h
+++ b/src/tint/ir/intrinsic_call.h
@@ -15,8 +15,8 @@
#ifndef SRC_TINT_IR_INTRINSIC_CALL_H_
#define SRC_TINT_IR_INTRINSIC_CALL_H_
+#include "src/tint/core/castable.h"
#include "src/tint/ir/call.h"
-#include "src/tint/utils/castable.h"
namespace tint::ir {
diff --git a/src/tint/ir/load.h b/src/tint/ir/load.h
index 200e82a..c98fd01 100644
--- a/src/tint/ir/load.h
+++ b/src/tint/ir/load.h
@@ -15,8 +15,8 @@
#ifndef SRC_TINT_IR_LOAD_H_
#define SRC_TINT_IR_LOAD_H_
+#include "src/tint/core/castable.h"
#include "src/tint/ir/operand_instruction.h"
-#include "src/tint/utils/castable.h"
namespace tint::ir {
diff --git a/src/tint/ir/load_vector_element.h b/src/tint/ir/load_vector_element.h
index d5566c5..1243e5e 100644
--- a/src/tint/ir/load_vector_element.h
+++ b/src/tint/ir/load_vector_element.h
@@ -15,8 +15,8 @@
#ifndef SRC_TINT_IR_LOAD_VECTOR_ELEMENT_H_
#define SRC_TINT_IR_LOAD_VECTOR_ELEMENT_H_
+#include "src/tint/core/castable.h"
#include "src/tint/ir/operand_instruction.h"
-#include "src/tint/utils/castable.h"
namespace tint::ir {
diff --git a/src/tint/ir/module.h b/src/tint/ir/module.h
index 412c51c..b717f4b 100644
--- a/src/tint/ir/module.h
+++ b/src/tint/ir/module.h
@@ -19,6 +19,9 @@
#include <string>
#include "src/tint/constant/manager.h"
+#include "src/tint/core/block_allocator.h"
+#include "src/tint/core/result.h"
+#include "src/tint/core/vector.h"
#include "src/tint/ir/block.h"
#include "src/tint/ir/constant.h"
#include "src/tint/ir/function.h"
@@ -27,9 +30,6 @@
#include "src/tint/program_id.h"
#include "src/tint/symbol_table.h"
#include "src/tint/type/manager.h"
-#include "src/tint/utils/block_allocator.h"
-#include "src/tint/utils/result.h"
-#include "src/tint/utils/vector.h"
namespace tint::ir {
diff --git a/src/tint/ir/multi_in_block.cc b/src/tint/ir/multi_in_block.cc
index 53286ba..3aae306 100644
--- a/src/tint/ir/multi_in_block.cc
+++ b/src/tint/ir/multi_in_block.cc
@@ -14,7 +14,7 @@
#include "src/tint/ir/multi_in_block.h"
-#include "src/tint/utils/predicates.h"
+#include "src/tint/core/predicates.h"
TINT_INSTANTIATE_TYPEINFO(tint::ir::MultiInBlock);
diff --git a/src/tint/ir/next_iteration.h b/src/tint/ir/next_iteration.h
index bf3fde5..ad0c053 100644
--- a/src/tint/ir/next_iteration.h
+++ b/src/tint/ir/next_iteration.h
@@ -15,8 +15,8 @@
#ifndef SRC_TINT_IR_NEXT_ITERATION_H_
#define SRC_TINT_IR_NEXT_ITERATION_H_
+#include "src/tint/core/castable.h"
#include "src/tint/ir/terminator.h"
-#include "src/tint/utils/castable.h"
// Forward declarations
namespace tint::ir {
diff --git a/src/tint/ir/program_test_helper.h b/src/tint/ir/program_test_helper.h
index 5f20862..490decb 100644
--- a/src/tint/ir/program_test_helper.h
+++ b/src/tint/ir/program_test_helper.h
@@ -21,10 +21,10 @@
#include "gtest/gtest.h"
#include "src/tint/builtin/number.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/ir/disassembler.h"
#include "src/tint/ir/from_program.h"
#include "src/tint/program_builder.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::ir {
diff --git a/src/tint/ir/return.h b/src/tint/ir/return.h
index 9672f27..52cee4e 100644
--- a/src/tint/ir/return.h
+++ b/src/tint/ir/return.h
@@ -15,8 +15,8 @@
#ifndef SRC_TINT_IR_RETURN_H_
#define SRC_TINT_IR_RETURN_H_
+#include "src/tint/core/castable.h"
#include "src/tint/ir/terminator.h"
-#include "src/tint/utils/castable.h"
// Forward declarations
namespace tint::ir {
diff --git a/src/tint/ir/store.h b/src/tint/ir/store.h
index 21c0cf6..823e8a1 100644
--- a/src/tint/ir/store.h
+++ b/src/tint/ir/store.h
@@ -15,8 +15,8 @@
#ifndef SRC_TINT_IR_STORE_H_
#define SRC_TINT_IR_STORE_H_
+#include "src/tint/core/castable.h"
#include "src/tint/ir/operand_instruction.h"
-#include "src/tint/utils/castable.h"
namespace tint::ir {
diff --git a/src/tint/ir/store_vector_element.h b/src/tint/ir/store_vector_element.h
index fb0e14a..ac6e076 100644
--- a/src/tint/ir/store_vector_element.h
+++ b/src/tint/ir/store_vector_element.h
@@ -15,8 +15,8 @@
#ifndef SRC_TINT_IR_STORE_VECTOR_ELEMENT_H_
#define SRC_TINT_IR_STORE_VECTOR_ELEMENT_H_
+#include "src/tint/core/castable.h"
#include "src/tint/ir/operand_instruction.h"
-#include "src/tint/utils/castable.h"
namespace tint::ir {
diff --git a/src/tint/ir/swizzle.h b/src/tint/ir/swizzle.h
index 0ea1d79..552ea84dd 100644
--- a/src/tint/ir/swizzle.h
+++ b/src/tint/ir/swizzle.h
@@ -15,8 +15,8 @@
#ifndef SRC_TINT_IR_SWIZZLE_H_
#define SRC_TINT_IR_SWIZZLE_H_
+#include "src/tint/core/castable.h"
#include "src/tint/ir/operand_instruction.h"
-#include "src/tint/utils/castable.h"
namespace tint::ir {
diff --git a/src/tint/ir/terminator.h b/src/tint/ir/terminator.h
index 5698100..8ada083 100644
--- a/src/tint/ir/terminator.h
+++ b/src/tint/ir/terminator.h
@@ -15,9 +15,9 @@
#ifndef SRC_TINT_IR_TERMINATOR_H_
#define SRC_TINT_IR_TERMINATOR_H_
+#include "src/tint/core/castable.h"
#include "src/tint/ir/operand_instruction.h"
#include "src/tint/ir/value.h"
-#include "src/tint/utils/castable.h"
// Forward declarations
namespace tint::ir {
diff --git a/src/tint/ir/to_program.cc b/src/tint/ir/to_program.cc
index 92dfd5c..393e82e 100644
--- a/src/tint/ir/to_program.cc
+++ b/src/tint/ir/to_program.cc
@@ -20,6 +20,13 @@
#include "src/tint/builtin/builtin.h"
#include "src/tint/constant/splat.h"
+#include "src/tint/core/hashmap.h"
+#include "src/tint/core/math.h"
+#include "src/tint/core/predicates.h"
+#include "src/tint/core/reverse.h"
+#include "src/tint/core/scoped_assignment.h"
+#include "src/tint/core/transform.h"
+#include "src/tint/core/vector.h"
#include "src/tint/ir/access.h"
#include "src/tint/ir/binary.h"
#include "src/tint/ir/bitcast.h"
@@ -64,13 +71,6 @@
#include "src/tint/type/reference.h"
#include "src/tint/type/sampler.h"
#include "src/tint/type/texture.h"
-#include "src/tint/utils/hashmap.h"
-#include "src/tint/utils/math.h"
-#include "src/tint/utils/predicates.h"
-#include "src/tint/utils/reverse.h"
-#include "src/tint/utils/scoped_assignment.h"
-#include "src/tint/utils/transform.h"
-#include "src/tint/utils/vector.h"
// Helper for calling TINT_UNIMPLEMENTED() from a Switch(object_ptr) default case.
#define UNHANDLED_CASE(object_ptr) \
diff --git a/src/tint/ir/to_program_inlining_test.cc b/src/tint/ir/to_program_inlining_test.cc
index 00e4238..df2db9e 100644
--- a/src/tint/ir/to_program_inlining_test.cc
+++ b/src/tint/ir/to_program_inlining_test.cc
@@ -14,13 +14,13 @@
#include <string>
+#include "src/tint/core/string.h"
#include "src/tint/ir/disassembler.h"
#include "src/tint/ir/to_program.h"
#include "src/tint/ir/to_program_test.h"
#include "src/tint/lang/wgsl/ast_writer/generator.h"
#include "src/tint/type/array.h"
#include "src/tint/type/matrix.h"
-#include "src/tint/utils/string.h"
namespace tint::ir::test {
namespace {
diff --git a/src/tint/ir/to_program_roundtrip_test.cc b/src/tint/ir/to_program_roundtrip_test.cc
index 9eef8df..b0aa9fb 100644
--- a/src/tint/ir/to_program_roundtrip_test.cc
+++ b/src/tint/ir/to_program_roundtrip_test.cc
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string.h"
#include "src/tint/ir/from_program.h"
#include "src/tint/ir/program_test_helper.h"
#include "src/tint/ir/to_program.h"
#include "src/tint/lang/wgsl/ast_writer/generator.h"
#include "src/tint/lang/wgsl/reader/parser.h"
-#include "src/tint/utils/string.h"
#if !TINT_BUILD_WGSL_READER || !TINT_BUILD_WGSL_WRITER
#error "to_program_roundtrip_test.cc requires both the WGSL reader and writer to be enabled"
diff --git a/src/tint/ir/to_program_test.cc b/src/tint/ir/to_program_test.cc
index d38e732..fee43af 100644
--- a/src/tint/ir/to_program_test.cc
+++ b/src/tint/ir/to_program_test.cc
@@ -15,11 +15,11 @@
#include <sstream>
#include <string>
+#include "src/tint/core/string.h"
#include "src/tint/ir/disassembler.h"
#include "src/tint/ir/to_program.h"
#include "src/tint/ir/to_program_test.h"
#include "src/tint/lang/wgsl/ast_writer/generator.h"
-#include "src/tint/utils/string.h"
namespace tint::ir::test {
diff --git a/src/tint/ir/transform/merge_return.cc b/src/tint/ir/transform/merge_return.cc
index af42ab9..e312ff4 100644
--- a/src/tint/ir/transform/merge_return.cc
+++ b/src/tint/ir/transform/merge_return.cc
@@ -16,11 +16,11 @@
#include <utility>
+#include "src/tint/core/reverse.h"
+#include "src/tint/core/transform.h"
#include "src/tint/ir/builder.h"
#include "src/tint/ir/module.h"
#include "src/tint/switch.h"
-#include "src/tint/utils/reverse.h"
-#include "src/tint/utils/transform.h"
TINT_INSTANTIATE_TYPEINFO(tint::ir::transform::MergeReturn);
diff --git a/src/tint/ir/transform/transform.h b/src/tint/ir/transform/transform.h
index e95a7b7..e1c4005 100644
--- a/src/tint/ir/transform/transform.h
+++ b/src/tint/ir/transform/transform.h
@@ -20,7 +20,7 @@
#include <utility>
#include "src/tint/builtin/address_space.h"
-#include "src/tint/utils/castable.h"
+#include "src/tint/core/castable.h"
// Forward declarations
namespace tint::ir {
diff --git a/src/tint/ir/transform/var_for_dynamic_index.cc b/src/tint/ir/transform/var_for_dynamic_index.cc
index b328437..7ee659c 100644
--- a/src/tint/ir/transform/var_for_dynamic_index.cc
+++ b/src/tint/ir/transform/var_for_dynamic_index.cc
@@ -16,13 +16,13 @@
#include <utility>
+#include "src/tint/core/hashmap.h"
#include "src/tint/ir/builder.h"
#include "src/tint/ir/module.h"
#include "src/tint/type/array.h"
#include "src/tint/type/matrix.h"
#include "src/tint/type/pointer.h"
#include "src/tint/type/vector.h"
-#include "src/tint/utils/hashmap.h"
TINT_INSTANTIATE_TYPEINFO(tint::ir::transform::VarForDynamicIndex);
diff --git a/src/tint/ir/unary.h b/src/tint/ir/unary.h
index bf8d8be..84f49af 100644
--- a/src/tint/ir/unary.h
+++ b/src/tint/ir/unary.h
@@ -15,8 +15,8 @@
#ifndef SRC_TINT_IR_UNARY_H_
#define SRC_TINT_IR_UNARY_H_
+#include "src/tint/core/castable.h"
#include "src/tint/ir/operand_instruction.h"
-#include "src/tint/utils/castable.h"
namespace tint::ir {
diff --git a/src/tint/ir/user_call.h b/src/tint/ir/user_call.h
index ee20ccb..64a7684 100644
--- a/src/tint/ir/user_call.h
+++ b/src/tint/ir/user_call.h
@@ -15,9 +15,9 @@
#ifndef SRC_TINT_IR_USER_CALL_H_
#define SRC_TINT_IR_USER_CALL_H_
+#include "src/tint/core/castable.h"
#include "src/tint/ir/call.h"
#include "src/tint/ir/function.h"
-#include "src/tint/utils/castable.h"
namespace tint::ir {
diff --git a/src/tint/ir/validator.cc b/src/tint/ir/validator.cc
index 86c8bc9..958e9dd 100644
--- a/src/tint/ir/validator.cc
+++ b/src/tint/ir/validator.cc
@@ -18,6 +18,8 @@
#include <string>
#include <utility>
+#include "src/tint/core/reverse.h"
+#include "src/tint/core/scoped_assignment.h"
#include "src/tint/ir/access.h"
#include "src/tint/ir/binary.h"
#include "src/tint/ir/bitcast.h"
@@ -54,8 +56,6 @@
#include "src/tint/type/bool.h"
#include "src/tint/type/pointer.h"
#include "src/tint/type/vector.h"
-#include "src/tint/utils/reverse.h"
-#include "src/tint/utils/scoped_assignment.h"
namespace tint::ir {
diff --git a/src/tint/ir/validator.h b/src/tint/ir/validator.h
index b93676a..036a3a7 100644
--- a/src/tint/ir/validator.h
+++ b/src/tint/ir/validator.h
@@ -17,10 +17,10 @@
#include <string>
+#include "src/tint/core/result.h"
#include "src/tint/diagnostic/diagnostic.h"
#include "src/tint/ir/disassembler.h"
#include "src/tint/ir/module.h"
-#include "src/tint/utils/result.h"
// Forward declarations
namespace tint::ir {
diff --git a/src/tint/ir/validator_test.cc b/src/tint/ir/validator_test.cc
index 881de2c..8618859 100644
--- a/src/tint/ir/validator_test.cc
+++ b/src/tint/ir/validator_test.cc
@@ -16,6 +16,7 @@
#include <utility>
#include "gmock/gmock.h"
+#include "src/tint/core/string.h"
#include "src/tint/ir/builder.h"
#include "src/tint/ir/ir_test_helper.h"
#include "src/tint/ir/validator.h"
@@ -23,7 +24,6 @@
#include "src/tint/type/matrix.h"
#include "src/tint/type/pointer.h"
#include "src/tint/type/struct.h"
-#include "src/tint/utils/string.h"
namespace tint::ir {
namespace {
diff --git a/src/tint/ir/value.h b/src/tint/ir/value.h
index 1f7f3b5..2bfc369 100644
--- a/src/tint/ir/value.h
+++ b/src/tint/ir/value.h
@@ -15,9 +15,9 @@
#ifndef SRC_TINT_IR_VALUE_H_
#define SRC_TINT_IR_VALUE_H_
+#include "src/tint/core/castable.h"
+#include "src/tint/core/hashset.h"
#include "src/tint/type/type.h"
-#include "src/tint/utils/castable.h"
-#include "src/tint/utils/hashset.h"
// Forward declarations
namespace tint::ir {
diff --git a/src/tint/ir/var.h b/src/tint/ir/var.h
index c529b9e..9e9fbb7 100644
--- a/src/tint/ir/var.h
+++ b/src/tint/ir/var.h
@@ -17,11 +17,11 @@
#include "src/tint/builtin/access.h"
#include "src/tint/builtin/address_space.h"
+#include "src/tint/core/castable.h"
+#include "src/tint/core/vector.h"
#include "src/tint/ir/binding_point.h"
#include "src/tint/ir/operand_instruction.h"
#include "src/tint/type/pointer.h"
-#include "src/tint/utils/castable.h"
-#include "src/tint/utils/vector.h"
namespace tint::ir {
diff --git a/src/tint/lang/glsl/ast_writer/generator_impl.cc b/src/tint/lang/glsl/ast_writer/generator_impl.cc
index a36f8ad..60f7089 100644
--- a/src/tint/lang/glsl/ast_writer/generator_impl.cc
+++ b/src/tint/lang/glsl/ast_writer/generator_impl.cc
@@ -24,6 +24,11 @@
#include "src/tint/constant/splat.h"
#include "src/tint/constant/value.h"
+#include "src/tint/core/defer.h"
+#include "src/tint/core/map.h"
+#include "src/tint/core/scoped_assignment.h"
+#include "src/tint/core/string.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/debug.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/lang/wgsl/ast/id_attribute.h"
@@ -76,11 +81,6 @@
#include "src/tint/type/sampled_texture.h"
#include "src/tint/type/storage_texture.h"
#include "src/tint/type/texture_dimension.h"
-#include "src/tint/utils/defer.h"
-#include "src/tint/utils/map.h"
-#include "src/tint/utils/scoped_assignment.h"
-#include "src/tint/utils/string.h"
-#include "src/tint/utils/string_stream.h"
#include "src/tint/writer/append_vector.h"
#include "src/tint/writer/float_to_string.h"
diff --git a/src/tint/lang/glsl/ast_writer/generator_impl.h b/src/tint/lang/glsl/ast_writer/generator_impl.h
index 91cd6ab..0e53097 100644
--- a/src/tint/lang/glsl/ast_writer/generator_impl.h
+++ b/src/tint/lang/glsl/ast_writer/generator_impl.h
@@ -22,6 +22,8 @@
#include <utility>
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/core/hash.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/glsl/ast_writer/generator.h"
#include "src/tint/lang/glsl/ast_writer/version.h"
#include "src/tint/lang/wgsl/ast/assignment_statement.h"
@@ -38,8 +40,6 @@
#include "src/tint/lang/wgsl/ast/unary_op_expression.h"
#include "src/tint/program_builder.h"
#include "src/tint/scope_stack.h"
-#include "src/tint/utils/hash.h"
-#include "src/tint/utils/string_stream.h"
#include "src/tint/writer/ast_text_generator.h"
// Forward declarations
diff --git a/src/tint/lang/glsl/ast_writer/generator_impl_array_accessor_test.cc b/src/tint/lang/glsl/ast_writer/generator_impl_array_accessor_test.cc
index d6197f1..2eecd86 100644
--- a/src/tint/lang/glsl/ast_writer/generator_impl_array_accessor_test.cc
+++ b/src/tint/lang/glsl/ast_writer/generator_impl_array_accessor_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/glsl/ast_writer/test_helper.h"
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/ast_writer/generator_impl_binary_test.cc b/src/tint/lang/glsl/ast_writer/generator_impl_binary_test.cc
index 2afea56..0f23366 100644
--- a/src/tint/lang/glsl/ast_writer/generator_impl_binary_test.cc
+++ b/src/tint/lang/glsl/ast_writer/generator_impl_binary_test.cc
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/glsl/ast_writer/test_helper.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
-#include "src/tint/utils/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/ast_writer/generator_impl_bitcast_test.cc b/src/tint/lang/glsl/ast_writer/generator_impl_bitcast_test.cc
index 41dbad4..383d491 100644
--- a/src/tint/lang/glsl/ast_writer/generator_impl_bitcast_test.cc
+++ b/src/tint/lang/glsl/ast_writer/generator_impl_bitcast_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/glsl/ast_writer/test_helper.h"
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/ast_writer/generator_impl_builtin_test.cc b/src/tint/lang/glsl/ast_writer/generator_impl_builtin_test.cc
index f6cd9f3..3eeb561 100644
--- a/src/tint/lang/glsl/ast_writer/generator_impl_builtin_test.cc
+++ b/src/tint/lang/glsl/ast_writer/generator_impl_builtin_test.cc
@@ -13,11 +13,11 @@
// limitations under the License.
#include "gmock/gmock.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/glsl/ast_writer/test_helper.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "src/tint/lang/wgsl/sem/call.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::writer::glsl {
namespace {
diff --git a/src/tint/lang/glsl/ast_writer/generator_impl_call_test.cc b/src/tint/lang/glsl/ast_writer/generator_impl_call_test.cc
index 6c1b548..e6c4b1b 100644
--- a/src/tint/lang/glsl/ast_writer/generator_impl_call_test.cc
+++ b/src/tint/lang/glsl/ast_writer/generator_impl_call_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/glsl/ast_writer/test_helper.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
-#include "src/tint/utils/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/ast_writer/generator_impl_cast_test.cc b/src/tint/lang/glsl/ast_writer/generator_impl_cast_test.cc
index 893f84a..2df0f9f 100644
--- a/src/tint/lang/glsl/ast_writer/generator_impl_cast_test.cc
+++ b/src/tint/lang/glsl/ast_writer/generator_impl_cast_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/glsl/ast_writer/test_helper.h"
-#include "src/tint/utils/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/ast_writer/generator_impl_identifier_test.cc b/src/tint/lang/glsl/ast_writer/generator_impl_identifier_test.cc
index 5265e01..0e9be7a 100644
--- a/src/tint/lang/glsl/ast_writer/generator_impl_identifier_test.cc
+++ b/src/tint/lang/glsl/ast_writer/generator_impl_identifier_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/glsl/ast_writer/test_helper.h"
-#include "src/tint/utils/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/ast_writer/generator_impl_import_test.cc b/src/tint/lang/glsl/ast_writer/generator_impl_import_test.cc
index 502f6b6..9168c5b 100644
--- a/src/tint/lang/glsl/ast_writer/generator_impl_import_test.cc
+++ b/src/tint/lang/glsl/ast_writer/generator_impl_import_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/glsl/ast_writer/test_helper.h"
-#include "src/tint/utils/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/ast_writer/generator_impl_type_test.cc b/src/tint/lang/glsl/ast_writer/generator_impl_type_test.cc
index 7a04894..ebb8828 100644
--- a/src/tint/lang/glsl/ast_writer/generator_impl_type_test.cc
+++ b/src/tint/lang/glsl/ast_writer/generator_impl_type_test.cc
@@ -12,6 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/glsl/ast_writer/test_helper.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
@@ -21,7 +22,6 @@
#include "src/tint/type/sampler.h"
#include "src/tint/type/storage_texture.h"
#include "src/tint/type/texture_dimension.h"
-#include "src/tint/utils/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/glsl/ast_writer/generator_impl_unary_op_test.cc b/src/tint/lang/glsl/ast_writer/generator_impl_unary_op_test.cc
index f2eeea5..9ec9e92 100644
--- a/src/tint/lang/glsl/ast_writer/generator_impl_unary_op_test.cc
+++ b/src/tint/lang/glsl/ast_writer/generator_impl_unary_op_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/glsl/ast_writer/test_helper.h"
-#include "src/tint/utils/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/hlsl/ast_writer/generator.h b/src/tint/lang/hlsl/ast_writer/generator.h
index 1d78af5..7993ce8 100644
--- a/src/tint/lang/hlsl/ast_writer/generator.h
+++ b/src/tint/lang/hlsl/ast_writer/generator.h
@@ -23,10 +23,10 @@
#include <utility>
#include <vector>
+#include "src/tint/core/bitset.h"
#include "src/tint/lang/wgsl/ast/pipeline_stage.h"
#include "src/tint/lang/wgsl/sem/binding_point.h"
#include "src/tint/reflection.h"
-#include "src/tint/utils/bitset.h"
#include "src/tint/writer/array_length_from_uniform_options.h"
#include "src/tint/writer/binding_remapper_options.h"
#include "src/tint/writer/external_texture_options.h"
diff --git a/src/tint/lang/hlsl/ast_writer/generator_impl.cc b/src/tint/lang/hlsl/ast_writer/generator_impl.cc
index 3ef8e7e..10c5821 100644
--- a/src/tint/lang/hlsl/ast_writer/generator_impl.cc
+++ b/src/tint/lang/hlsl/ast_writer/generator_impl.cc
@@ -24,6 +24,12 @@
#include "src/tint/constant/splat.h"
#include "src/tint/constant/value.h"
+#include "src/tint/core/compiler_macros.h"
+#include "src/tint/core/defer.h"
+#include "src/tint/core/map.h"
+#include "src/tint/core/scoped_assignment.h"
+#include "src/tint/core/string.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/debug.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/lang/wgsl/ast/id_attribute.h"
@@ -75,12 +81,6 @@
#include "src/tint/type/sampled_texture.h"
#include "src/tint/type/storage_texture.h"
#include "src/tint/type/texture_dimension.h"
-#include "src/tint/utils/compiler_macros.h"
-#include "src/tint/utils/defer.h"
-#include "src/tint/utils/map.h"
-#include "src/tint/utils/scoped_assignment.h"
-#include "src/tint/utils/string.h"
-#include "src/tint/utils/string_stream.h"
#include "src/tint/writer/append_vector.h"
#include "src/tint/writer/check_supported_extensions.h"
#include "src/tint/writer/float_to_string.h"
diff --git a/src/tint/lang/hlsl/ast_writer/generator_impl.h b/src/tint/lang/hlsl/ast_writer/generator_impl.h
index cc8b7e9..b2ec78f 100644
--- a/src/tint/lang/hlsl/ast_writer/generator_impl.h
+++ b/src/tint/lang/hlsl/ast_writer/generator_impl.h
@@ -22,6 +22,7 @@
#include <utility>
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/core/hash.h"
#include "src/tint/lang/hlsl/ast_writer/generator.h"
#include "src/tint/lang/wgsl/ast/assignment_statement.h"
#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
@@ -38,7 +39,6 @@
#include "src/tint/lang/wgsl/sem/binding_point.h"
#include "src/tint/program_builder.h"
#include "src/tint/scope_stack.h"
-#include "src/tint/utils/hash.h"
#include "src/tint/writer/array_length_from_uniform_options.h"
#include "src/tint/writer/ast_text_generator.h"
diff --git a/src/tint/lang/hlsl/ast_writer/generator_impl_array_accessor_test.cc b/src/tint/lang/hlsl/ast_writer/generator_impl_array_accessor_test.cc
index 7eb0cda..0dc36a9 100644
--- a/src/tint/lang/hlsl/ast_writer/generator_impl_array_accessor_test.cc
+++ b/src/tint/lang/hlsl/ast_writer/generator_impl_array_accessor_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/hlsl/ast_writer/test_helper.h"
-#include "src/tint/utils/string_stream.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/hlsl/ast_writer/generator_impl_binary_test.cc b/src/tint/lang/hlsl/ast_writer/generator_impl_binary_test.cc
index affce16..abd89e6 100644
--- a/src/tint/lang/hlsl/ast_writer/generator_impl_binary_test.cc
+++ b/src/tint/lang/hlsl/ast_writer/generator_impl_binary_test.cc
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/hlsl/ast_writer/test_helper.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::writer::hlsl {
namespace {
diff --git a/src/tint/lang/hlsl/ast_writer/generator_impl_bitcast_test.cc b/src/tint/lang/hlsl/ast_writer/generator_impl_bitcast_test.cc
index 5362226..3b71df5 100644
--- a/src/tint/lang/hlsl/ast_writer/generator_impl_bitcast_test.cc
+++ b/src/tint/lang/hlsl/ast_writer/generator_impl_bitcast_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/hlsl/ast_writer/test_helper.h"
-#include "src/tint/utils/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/hlsl/ast_writer/generator_impl_builtin_test.cc b/src/tint/lang/hlsl/ast_writer/generator_impl_builtin_test.cc
index 0135649..c0826ae 100644
--- a/src/tint/lang/hlsl/ast_writer/generator_impl_builtin_test.cc
+++ b/src/tint/lang/hlsl/ast_writer/generator_impl_builtin_test.cc
@@ -13,11 +13,11 @@
// limitations under the License.
#include "gmock/gmock.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/hlsl/ast_writer/test_helper.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "src/tint/lang/wgsl/sem/call.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::writer::hlsl {
namespace {
diff --git a/src/tint/lang/hlsl/ast_writer/generator_impl_call_test.cc b/src/tint/lang/hlsl/ast_writer/generator_impl_call_test.cc
index bb9743a..5402a48 100644
--- a/src/tint/lang/hlsl/ast_writer/generator_impl_call_test.cc
+++ b/src/tint/lang/hlsl/ast_writer/generator_impl_call_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/hlsl/ast_writer/test_helper.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
-#include "src/tint/utils/string_stream.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/hlsl/ast_writer/generator_impl_cast_test.cc b/src/tint/lang/hlsl/ast_writer/generator_impl_cast_test.cc
index 04bb8b6..e49a08f 100644
--- a/src/tint/lang/hlsl/ast_writer/generator_impl_cast_test.cc
+++ b/src/tint/lang/hlsl/ast_writer/generator_impl_cast_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/hlsl/ast_writer/test_helper.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::writer::hlsl {
namespace {
diff --git a/src/tint/lang/hlsl/ast_writer/generator_impl_identifier_test.cc b/src/tint/lang/hlsl/ast_writer/generator_impl_identifier_test.cc
index c124c40..3a44542 100644
--- a/src/tint/lang/hlsl/ast_writer/generator_impl_identifier_test.cc
+++ b/src/tint/lang/hlsl/ast_writer/generator_impl_identifier_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/hlsl/ast_writer/test_helper.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::writer::hlsl {
namespace {
diff --git a/src/tint/lang/hlsl/ast_writer/generator_impl_import_test.cc b/src/tint/lang/hlsl/ast_writer/generator_impl_import_test.cc
index 2bb2329..91fc891 100644
--- a/src/tint/lang/hlsl/ast_writer/generator_impl_import_test.cc
+++ b/src/tint/lang/hlsl/ast_writer/generator_impl_import_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/hlsl/ast_writer/test_helper.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::writer::hlsl {
namespace {
diff --git a/src/tint/lang/hlsl/ast_writer/generator_impl_type_test.cc b/src/tint/lang/hlsl/ast_writer/generator_impl_type_test.cc
index f640f68..e40aa40 100644
--- a/src/tint/lang/hlsl/ast_writer/generator_impl_type_test.cc
+++ b/src/tint/lang/hlsl/ast_writer/generator_impl_type_test.cc
@@ -13,6 +13,7 @@
// limitations under the License.
#include "gmock/gmock.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/hlsl/ast_writer/test_helper.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
@@ -22,7 +23,6 @@
#include "src/tint/type/sampler.h"
#include "src/tint/type/storage_texture.h"
#include "src/tint/type/texture_dimension.h"
-#include "src/tint/utils/string_stream.h"
using ::testing::HasSubstr;
diff --git a/src/tint/lang/hlsl/ast_writer/generator_impl_unary_op_test.cc b/src/tint/lang/hlsl/ast_writer/generator_impl_unary_op_test.cc
index ceb8260..4d25d65 100644
--- a/src/tint/lang/hlsl/ast_writer/generator_impl_unary_op_test.cc
+++ b/src/tint/lang/hlsl/ast_writer/generator_impl_unary_op_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/hlsl/ast_writer/test_helper.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::writer::hlsl {
namespace {
diff --git a/src/tint/lang/msl/ast_writer/generator_impl.cc b/src/tint/lang/msl/ast_writer/generator_impl.cc
index bb37514..1b869fa 100644
--- a/src/tint/lang/msl/ast_writer/generator_impl.cc
+++ b/src/tint/lang/msl/ast_writer/generator_impl.cc
@@ -23,6 +23,10 @@
#include "src/tint/constant/splat.h"
#include "src/tint/constant/value.h"
+#include "src/tint/core/defer.h"
+#include "src/tint/core/map.h"
+#include "src/tint/core/scoped_assignment.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/msl/ast_writer/generator_support.h"
#include "src/tint/lang/wgsl/ast/alias.h"
#include "src/tint/lang/wgsl/ast/bool_literal_expression.h"
@@ -81,10 +85,6 @@
#include "src/tint/type/u32.h"
#include "src/tint/type/vector.h"
#include "src/tint/type/void.h"
-#include "src/tint/utils/defer.h"
-#include "src/tint/utils/map.h"
-#include "src/tint/utils/scoped_assignment.h"
-#include "src/tint/utils/string_stream.h"
#include "src/tint/writer/check_supported_extensions.h"
namespace tint::writer::msl {
diff --git a/src/tint/lang/msl/ast_writer/generator_impl.h b/src/tint/lang/msl/ast_writer/generator_impl.h
index fe7011d..093bc06 100644
--- a/src/tint/lang/msl/ast_writer/generator_impl.h
+++ b/src/tint/lang/msl/ast_writer/generator_impl.h
@@ -22,6 +22,7 @@
#include <vector>
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/msl/ast_writer/generator.h"
#include "src/tint/lang/wgsl/ast/assignment_statement.h"
#include "src/tint/lang/wgsl/ast/binary_expression.h"
@@ -41,7 +42,6 @@
#include "src/tint/lang/wgsl/sem/struct.h"
#include "src/tint/program.h"
#include "src/tint/scope_stack.h"
-#include "src/tint/utils/string_stream.h"
#include "src/tint/writer/array_length_from_uniform_options.h"
#include "src/tint/writer/ast_text_generator.h"
diff --git a/src/tint/lang/msl/ast_writer/generator_impl_array_accessor_test.cc b/src/tint/lang/msl/ast_writer/generator_impl_array_accessor_test.cc
index 71577e2..0e39c1a 100644
--- a/src/tint/lang/msl/ast_writer/generator_impl_array_accessor_test.cc
+++ b/src/tint/lang/msl/ast_writer/generator_impl_array_accessor_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/msl/ast_writer/test_helper.h"
-#include "src/tint/utils/string_stream.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/msl/ast_writer/generator_impl_binary_test.cc b/src/tint/lang/msl/ast_writer/generator_impl_binary_test.cc
index ba1d5ca..a7fe1c3 100644
--- a/src/tint/lang/msl/ast_writer/generator_impl_binary_test.cc
+++ b/src/tint/lang/msl/ast_writer/generator_impl_binary_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/msl/ast_writer/test_helper.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::writer::msl {
namespace {
diff --git a/src/tint/lang/msl/ast_writer/generator_impl_bitcast_test.cc b/src/tint/lang/msl/ast_writer/generator_impl_bitcast_test.cc
index cf21689..4c6d207 100644
--- a/src/tint/lang/msl/ast_writer/generator_impl_bitcast_test.cc
+++ b/src/tint/lang/msl/ast_writer/generator_impl_bitcast_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/msl/ast_writer/test_helper.h"
-#include "src/tint/utils/string_stream.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/msl/ast_writer/generator_impl_builtin_test.cc b/src/tint/lang/msl/ast_writer/generator_impl_builtin_test.cc
index 438dfd0..d881373 100644
--- a/src/tint/lang/msl/ast_writer/generator_impl_builtin_test.cc
+++ b/src/tint/lang/msl/ast_writer/generator_impl_builtin_test.cc
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/msl/ast_writer/test_helper.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/lang/wgsl/sem/call.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::writer::msl {
namespace {
diff --git a/src/tint/lang/msl/ast_writer/generator_impl_builtin_texture_test.cc b/src/tint/lang/msl/ast_writer/generator_impl_builtin_texture_test.cc
index ded73ba..b8a8c70 100644
--- a/src/tint/lang/msl/ast_writer/generator_impl_builtin_texture_test.cc
+++ b/src/tint/lang/msl/ast_writer/generator_impl_builtin_texture_test.cc
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/msl/ast_writer/test_helper.h"
#include "src/tint/lang/wgsl/ast/builtin_texture_helper_test.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::writer::msl {
namespace {
diff --git a/src/tint/lang/msl/ast_writer/generator_impl_call_test.cc b/src/tint/lang/msl/ast_writer/generator_impl_call_test.cc
index f923738..8eaa6e0 100644
--- a/src/tint/lang/msl/ast_writer/generator_impl_call_test.cc
+++ b/src/tint/lang/msl/ast_writer/generator_impl_call_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/msl/ast_writer/test_helper.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
-#include "src/tint/utils/string_stream.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/msl/ast_writer/generator_impl_cast_test.cc b/src/tint/lang/msl/ast_writer/generator_impl_cast_test.cc
index 7453f26..47413be 100644
--- a/src/tint/lang/msl/ast_writer/generator_impl_cast_test.cc
+++ b/src/tint/lang/msl/ast_writer/generator_impl_cast_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/msl/ast_writer/test_helper.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::writer::msl {
namespace {
diff --git a/src/tint/lang/msl/ast_writer/generator_impl_identifier_test.cc b/src/tint/lang/msl/ast_writer/generator_impl_identifier_test.cc
index 824e48b..39b527d 100644
--- a/src/tint/lang/msl/ast_writer/generator_impl_identifier_test.cc
+++ b/src/tint/lang/msl/ast_writer/generator_impl_identifier_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/msl/ast_writer/test_helper.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::writer::msl {
namespace {
diff --git a/src/tint/lang/msl/ast_writer/generator_impl_import_test.cc b/src/tint/lang/msl/ast_writer/generator_impl_import_test.cc
index cafd3bb..044da9f 100644
--- a/src/tint/lang/msl/ast_writer/generator_impl_import_test.cc
+++ b/src/tint/lang/msl/ast_writer/generator_impl_import_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/msl/ast_writer/test_helper.h"
#include "src/tint/lang/wgsl/sem/call.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::writer::msl {
namespace {
diff --git a/src/tint/lang/msl/ast_writer/generator_impl_member_accessor_test.cc b/src/tint/lang/msl/ast_writer/generator_impl_member_accessor_test.cc
index 4972d7f..6a0bc73 100644
--- a/src/tint/lang/msl/ast_writer/generator_impl_member_accessor_test.cc
+++ b/src/tint/lang/msl/ast_writer/generator_impl_member_accessor_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/msl/ast_writer/test_helper.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::writer::msl {
namespace {
diff --git a/src/tint/lang/msl/ast_writer/generator_impl_type_test.cc b/src/tint/lang/msl/ast_writer/generator_impl_type_test.cc
index 03242b8..450633d 100644
--- a/src/tint/lang/msl/ast_writer/generator_impl_type_test.cc
+++ b/src/tint/lang/msl/ast_writer/generator_impl_type_test.cc
@@ -16,6 +16,7 @@
#include "gmock/gmock.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/msl/ast_writer/test_helper.h"
#include "src/tint/type/depth_multisampled_texture.h"
#include "src/tint/type/depth_texture.h"
@@ -24,7 +25,6 @@
#include "src/tint/type/sampler.h"
#include "src/tint/type/storage_texture.h"
#include "src/tint/type/texture_dimension.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::writer::msl {
namespace {
diff --git a/src/tint/lang/msl/ast_writer/generator_impl_unary_op_test.cc b/src/tint/lang/msl/ast_writer/generator_impl_unary_op_test.cc
index b4fc02a..a3d9abe 100644
--- a/src/tint/lang/msl/ast_writer/generator_impl_unary_op_test.cc
+++ b/src/tint/lang/msl/ast_writer/generator_impl_unary_op_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/msl/ast_writer/test_helper.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::writer::msl {
namespace {
diff --git a/src/tint/lang/msl/writer/generator_impl_ir.cc b/src/tint/lang/msl/writer/generator_impl_ir.cc
index 8101ed1..1d81a0e 100644
--- a/src/tint/lang/msl/writer/generator_impl_ir.cc
+++ b/src/tint/lang/msl/writer/generator_impl_ir.cc
@@ -16,6 +16,7 @@
#include "src/tint/constant/composite.h"
#include "src/tint/constant/splat.h"
+#include "src/tint/core/scoped_assignment.h"
#include "src/tint/ir/constant.h"
#include "src/tint/ir/validator.h"
#include "src/tint/lang/msl/ast_writer/generator_support.h"
@@ -39,7 +40,6 @@
#include "src/tint/type/u32.h"
#include "src/tint/type/vector.h"
#include "src/tint/type/void.h"
-#include "src/tint/utils/scoped_assignment.h"
namespace tint::writer::msl {
namespace {
diff --git a/src/tint/lang/msl/writer/generator_impl_ir.h b/src/tint/lang/msl/writer/generator_impl_ir.h
index 506de7b..a390365 100644
--- a/src/tint/lang/msl/writer/generator_impl_ir.h
+++ b/src/tint/lang/msl/writer/generator_impl_ir.h
@@ -18,10 +18,10 @@
#include <string>
#include <unordered_set>
+#include "src/tint/core/string_stream.h"
#include "src/tint/diagnostic/diagnostic.h"
#include "src/tint/ir/module.h"
#include "src/tint/type/texture.h"
-#include "src/tint/utils/string_stream.h"
#include "src/tint/writer/ir_text_generator.h"
namespace tint::writer::msl {
diff --git a/src/tint/lang/msl/writer/generator_impl_ir_constant_test.cc b/src/tint/lang/msl/writer/generator_impl_ir_constant_test.cc
index 6e0e365..e7d1562 100644
--- a/src/tint/lang/msl/writer/generator_impl_ir_constant_test.cc
+++ b/src/tint/lang/msl/writer/generator_impl_ir_constant_test.cc
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string.h"
#include "src/tint/lang/msl/writer/test_helper_ir.h"
#include "src/tint/type/array.h"
#include "src/tint/type/matrix.h"
-#include "src/tint/utils/string.h"
namespace tint::writer::msl {
namespace {
diff --git a/src/tint/lang/msl/writer/generator_impl_ir_type_test.cc b/src/tint/lang/msl/writer/generator_impl_ir_type_test.cc
index c6e858b..fae3150 100644
--- a/src/tint/lang/msl/writer/generator_impl_ir_type_test.cc
+++ b/src/tint/lang/msl/writer/generator_impl_ir_type_test.cc
@@ -14,6 +14,7 @@
#include "gmock/gmock.h"
+#include "src/tint/core/string.h"
#include "src/tint/lang/msl/writer/test_helper_ir.h"
#include "src/tint/type/array.h"
#include "src/tint/type/depth_multisampled_texture.h"
@@ -23,7 +24,6 @@
#include "src/tint/type/sampled_texture.h"
#include "src/tint/type/storage_texture.h"
#include "src/tint/type/struct.h"
-#include "src/tint/utils/string.h"
namespace tint::writer::msl {
namespace {
diff --git a/src/tint/lang/spirv/reader/attributes.h b/src/tint/lang/spirv/reader/attributes.h
index 14aea32..f155d27 100644
--- a/src/tint/lang/spirv/reader/attributes.h
+++ b/src/tint/lang/spirv/reader/attributes.h
@@ -16,10 +16,10 @@
#define SRC_TINT_LANG_SPIRV_READER_ATTRIBUTES_H_
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/core/enum_set.h"
+#include "src/tint/core/vector.h"
#include "src/tint/lang/wgsl/ast/attribute.h"
#include "src/tint/program_builder.h"
-#include "src/tint/utils/enum_set.h"
-#include "src/tint/utils/vector.h"
namespace tint::reader::spirv {
diff --git a/src/tint/lang/spirv/reader/construct.h b/src/tint/lang/spirv/reader/construct.h
index 754393c..bd4c2dd 100644
--- a/src/tint/lang/spirv/reader/construct.h
+++ b/src/tint/lang/spirv/reader/construct.h
@@ -18,8 +18,8 @@
#include <memory>
#include <string>
-#include "src/tint/utils/string_stream.h"
-#include "src/tint/utils/vector.h"
+#include "src/tint/core/string_stream.h"
+#include "src/tint/core/vector.h"
namespace tint::reader::spirv {
diff --git a/src/tint/lang/spirv/reader/entry_point_info.h b/src/tint/lang/spirv/reader/entry_point_info.h
index b7ae8da..addd5bb 100644
--- a/src/tint/lang/spirv/reader/entry_point_info.h
+++ b/src/tint/lang/spirv/reader/entry_point_info.h
@@ -17,8 +17,8 @@
#include <string>
+#include "src/tint/core/vector.h"
#include "src/tint/lang/wgsl/ast/pipeline_stage.h"
-#include "src/tint/utils/vector.h"
namespace tint::reader::spirv {
diff --git a/src/tint/lang/spirv/reader/enum_converter_test.cc b/src/tint/lang/spirv/reader/enum_converter_test.cc
index 60d1027..b1b6334 100644
--- a/src/tint/lang/spirv/reader/enum_converter_test.cc
+++ b/src/tint/lang/spirv/reader/enum_converter_test.cc
@@ -17,8 +17,8 @@
#include <string>
#include "gmock/gmock.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/type/texture_dimension.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::reader::spirv {
namespace {
diff --git a/src/tint/lang/spirv/reader/fail_stream.h b/src/tint/lang/spirv/reader/fail_stream.h
index 7613fb7..2af1143 100644
--- a/src/tint/lang/spirv/reader/fail_stream.h
+++ b/src/tint/lang/spirv/reader/fail_stream.h
@@ -15,7 +15,7 @@
#ifndef SRC_TINT_LANG_SPIRV_READER_FAIL_STREAM_H_
#define SRC_TINT_LANG_SPIRV_READER_FAIL_STREAM_H_
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::reader::spirv {
diff --git a/src/tint/lang/spirv/reader/fail_stream_test.cc b/src/tint/lang/spirv/reader/fail_stream_test.cc
index 3191b2c..f059f71 100644
--- a/src/tint/lang/spirv/reader/fail_stream_test.cc
+++ b/src/tint/lang/spirv/reader/fail_stream_test.cc
@@ -15,7 +15,7 @@
#include "src/tint/lang/spirv/reader/fail_stream.h"
#include "gmock/gmock.h"
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::reader::spirv {
namespace {
diff --git a/src/tint/lang/spirv/reader/function.cc b/src/tint/lang/spirv/reader/function.cc
index 601ab60..821c86b 100644
--- a/src/tint/lang/spirv/reader/function.cc
+++ b/src/tint/lang/spirv/reader/function.cc
@@ -19,6 +19,8 @@
#include "src/tint/builtin/builtin_value.h"
#include "src/tint/builtin/function.h"
+#include "src/tint/core/hashmap.h"
+#include "src/tint/core/hashset.h"
#include "src/tint/lang/wgsl/ast/assignment_statement.h"
#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
#include "src/tint/lang/wgsl/ast/break_statement.h"
@@ -38,8 +40,6 @@
#include "src/tint/type/depth_texture.h"
#include "src/tint/type/sampled_texture.h"
#include "src/tint/type/texture_dimension.h"
-#include "src/tint/utils/hashmap.h"
-#include "src/tint/utils/hashset.h"
// Terms:
// CFG: the control flow graph of the function, where basic blocks are the
diff --git a/src/tint/lang/spirv/reader/function.h b/src/tint/lang/spirv/reader/function.h
index 468d34a..f110473 100644
--- a/src/tint/lang/spirv/reader/function.h
+++ b/src/tint/lang/spirv/reader/function.h
@@ -24,11 +24,11 @@
#include <utility>
#include <vector>
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/spirv/reader/attributes.h"
#include "src/tint/lang/spirv/reader/construct.h"
#include "src/tint/lang/spirv/reader/parser_impl.h"
#include "src/tint/program_builder.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::reader::spirv {
diff --git a/src/tint/lang/spirv/reader/function_arithmetic_test.cc b/src/tint/lang/spirv/reader/function_arithmetic_test.cc
index 84c9aac..468fe13 100644
--- a/src/tint/lang/spirv/reader/function_arithmetic_test.cc
+++ b/src/tint/lang/spirv/reader/function_arithmetic_test.cc
@@ -13,10 +13,10 @@
// limitations under the License.
#include "gmock/gmock.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/spirv/reader/function.h"
#include "src/tint/lang/spirv/reader/parser_impl_test_helper.h"
#include "src/tint/lang/spirv/reader/spirv_tools_helpers_test.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::reader::spirv {
namespace {
diff --git a/src/tint/lang/spirv/reader/function_bit_test.cc b/src/tint/lang/spirv/reader/function_bit_test.cc
index 3344280..071a91f 100644
--- a/src/tint/lang/spirv/reader/function_bit_test.cc
+++ b/src/tint/lang/spirv/reader/function_bit_test.cc
@@ -12,10 +12,10 @@
// limitations under the License.
#include "gmock/gmock.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/spirv/reader/function.h"
#include "src/tint/lang/spirv/reader/parser_impl_test_helper.h"
#include "src/tint/lang/spirv/reader/spirv_tools_helpers_test.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::reader::spirv {
namespace {
diff --git a/src/tint/lang/spirv/reader/function_cfg_test.cc b/src/tint/lang/spirv/reader/function_cfg_test.cc
index 010ffb9..de9a666 100644
--- a/src/tint/lang/spirv/reader/function_cfg_test.cc
+++ b/src/tint/lang/spirv/reader/function_cfg_test.cc
@@ -13,10 +13,10 @@
// limitations under the License.
#include "gmock/gmock.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/spirv/reader/function.h"
#include "src/tint/lang/spirv/reader/parser_impl_test_helper.h"
#include "src/tint/lang/spirv/reader/spirv_tools_helpers_test.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::reader::spirv {
namespace {
diff --git a/src/tint/lang/spirv/reader/function_decl_test.cc b/src/tint/lang/spirv/reader/function_decl_test.cc
index ea1ffd2..c3fa1d2 100644
--- a/src/tint/lang/spirv/reader/function_decl_test.cc
+++ b/src/tint/lang/spirv/reader/function_decl_test.cc
@@ -13,10 +13,10 @@
// limitations under the License.
#include "gmock/gmock.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/spirv/reader/function.h"
#include "src/tint/lang/spirv/reader/parser_impl_test_helper.h"
#include "src/tint/lang/spirv/reader/spirv_tools_helpers_test.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::reader::spirv {
namespace {
diff --git a/src/tint/lang/spirv/reader/function_logical_test.cc b/src/tint/lang/spirv/reader/function_logical_test.cc
index e04e73c..a1baa6a 100644
--- a/src/tint/lang/spirv/reader/function_logical_test.cc
+++ b/src/tint/lang/spirv/reader/function_logical_test.cc
@@ -13,10 +13,10 @@
// limitations under the License.
#include "gmock/gmock.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/spirv/reader/function.h"
#include "src/tint/lang/spirv/reader/parser_impl_test_helper.h"
#include "src/tint/lang/spirv/reader/spirv_tools_helpers_test.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::reader::spirv {
namespace {
diff --git a/src/tint/lang/spirv/reader/function_var_test.cc b/src/tint/lang/spirv/reader/function_var_test.cc
index 977f7c9..6e619e5 100644
--- a/src/tint/lang/spirv/reader/function_var_test.cc
+++ b/src/tint/lang/spirv/reader/function_var_test.cc
@@ -13,10 +13,10 @@
// limitations under the License.
#include "gmock/gmock.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/spirv/reader/function.h"
#include "src/tint/lang/spirv/reader/parser_impl_test_helper.h"
#include "src/tint/lang/spirv/reader/spirv_tools_helpers_test.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::reader::spirv {
namespace {
diff --git a/src/tint/lang/spirv/reader/namer.cc b/src/tint/lang/spirv/reader/namer.cc
index 4a0f719..15aa299 100644
--- a/src/tint/lang/spirv/reader/namer.cc
+++ b/src/tint/lang/spirv/reader/namer.cc
@@ -18,8 +18,8 @@
#include <unordered_set>
#include "src/tint/builtin/function.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/debug.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::reader::spirv {
diff --git a/src/tint/lang/spirv/reader/namer_test.cc b/src/tint/lang/spirv/reader/namer_test.cc
index 7508ec9..3af53a65 100644
--- a/src/tint/lang/spirv/reader/namer_test.cc
+++ b/src/tint/lang/spirv/reader/namer_test.cc
@@ -16,7 +16,7 @@
#include "gmock/gmock.h"
#include "src/tint/builtin/function.h"
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::reader::spirv {
namespace {
diff --git a/src/tint/lang/spirv/reader/parser_impl.cc b/src/tint/lang/spirv/reader/parser_impl.cc
index f8b82d0c..869e922 100644
--- a/src/tint/lang/spirv/reader/parser_impl.cc
+++ b/src/tint/lang/spirv/reader/parser_impl.cc
@@ -20,6 +20,7 @@
#include <utility>
#include "source/opt/build_module.h"
+#include "src/tint/core/unique_vector.h"
#include "src/tint/lang/spirv/reader/function.h"
#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
#include "src/tint/lang/wgsl/ast/disable_validation_attribute.h"
@@ -31,7 +32,6 @@
#include "src/tint/type/multisampled_texture.h"
#include "src/tint/type/sampled_texture.h"
#include "src/tint/type/texture_dimension.h"
-#include "src/tint/utils/unique_vector.h"
namespace tint::reader::spirv {
diff --git a/src/tint/lang/spirv/reader/parser_impl.h b/src/tint/lang/spirv/reader/parser_impl.h
index 44f944b..522a49c 100644
--- a/src/tint/lang/spirv/reader/parser_impl.h
+++ b/src/tint/lang/spirv/reader/parser_impl.h
@@ -22,9 +22,9 @@
#include <utility>
#include <vector>
-#include "src/tint/utils/compiler_macros.h"
-#include "src/tint/utils/hashmap.h"
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/compiler_macros.h"
+#include "src/tint/core/hashmap.h"
+#include "src/tint/core/string_stream.h"
TINT_BEGIN_DISABLE_WARNING(NEWLINE_EOF);
TINT_BEGIN_DISABLE_WARNING(OLD_STYLE_CAST);
diff --git a/src/tint/lang/spirv/reader/parser_impl_function_decl_test.cc b/src/tint/lang/spirv/reader/parser_impl_function_decl_test.cc
index 4d86357..9ed45c4 100644
--- a/src/tint/lang/spirv/reader/parser_impl_function_decl_test.cc
+++ b/src/tint/lang/spirv/reader/parser_impl_function_decl_test.cc
@@ -13,9 +13,9 @@
// limitations under the License.
#include "gmock/gmock.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/spirv/reader/parser_impl_test_helper.h"
#include "src/tint/lang/spirv/reader/spirv_tools_helpers_test.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::reader::spirv {
namespace {
diff --git a/src/tint/lang/spirv/reader/parser_impl_handle_test.cc b/src/tint/lang/spirv/reader/parser_impl_handle_test.cc
index fb9accb..bb9cbef 100644
--- a/src/tint/lang/spirv/reader/parser_impl_handle_test.cc
+++ b/src/tint/lang/spirv/reader/parser_impl_handle_test.cc
@@ -15,10 +15,10 @@
#include <ostream>
#include "gmock/gmock.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/spirv/reader/function.h"
#include "src/tint/lang/spirv/reader/parser_impl_test_helper.h"
#include "src/tint/lang/spirv/reader/spirv_tools_helpers_test.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::reader::spirv {
namespace {
diff --git a/src/tint/lang/spirv/reader/parser_impl_module_var_test.cc b/src/tint/lang/spirv/reader/parser_impl_module_var_test.cc
index 2d7697a..8db54cc 100644
--- a/src/tint/lang/spirv/reader/parser_impl_module_var_test.cc
+++ b/src/tint/lang/spirv/reader/parser_impl_module_var_test.cc
@@ -13,10 +13,10 @@
// limitations under the License.
#include "gmock/gmock.h"
+#include "src/tint/core/string.h"
#include "src/tint/lang/spirv/reader/function.h"
#include "src/tint/lang/spirv/reader/parser_impl_test_helper.h"
#include "src/tint/lang/spirv/reader/spirv_tools_helpers_test.h"
-#include "src/tint/utils/string.h"
namespace tint::reader::spirv {
namespace {
diff --git a/src/tint/lang/spirv/reader/parser_impl_test_helper.cc b/src/tint/lang/spirv/reader/parser_impl_test_helper.cc
index 1118429..8fab646 100644
--- a/src/tint/lang/spirv/reader/parser_impl_test_helper.cc
+++ b/src/tint/lang/spirv/reader/parser_impl_test_helper.cc
@@ -13,9 +13,9 @@
// limitations under the License.
#include "src/tint/lang/spirv/reader/parser_impl_test_helper.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/wgsl/ast_writer/generator_impl.h"
#include "src/tint/switch.h"
-#include "src/tint/utils/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/spirv/reader/parser_impl_test_helper.h b/src/tint/lang/spirv/reader/parser_impl_test_helper.h
index 1cf6675..2b60ba6 100644
--- a/src/tint/lang/spirv/reader/parser_impl_test_helper.h
+++ b/src/tint/lang/spirv/reader/parser_impl_test_helper.h
@@ -21,7 +21,7 @@
#include <utility>
#include <vector>
-#include "src/tint/utils/compiler_macros.h"
+#include "src/tint/core/compiler_macros.h"
TINT_BEGIN_DISABLE_WARNING(NEWLINE_EOF);
TINT_BEGIN_DISABLE_WARNING(OLD_STYLE_CAST);
diff --git a/src/tint/lang/spirv/reader/parser_type.cc b/src/tint/lang/spirv/reader/parser_type.cc
index 1800960..34f3dc9 100644
--- a/src/tint/lang/spirv/reader/parser_type.cc
+++ b/src/tint/lang/spirv/reader/parser_type.cc
@@ -19,14 +19,14 @@
#include <unordered_map>
#include <utility>
+#include "src/tint/core/hash.h"
+#include "src/tint/core/map.h"
+#include "src/tint/core/string.h"
+#include "src/tint/core/string_stream.h"
+#include "src/tint/core/unique_allocator.h"
#include "src/tint/program_builder.h"
#include "src/tint/switch.h"
#include "src/tint/type/texture_dimension.h"
-#include "src/tint/utils/hash.h"
-#include "src/tint/utils/map.h"
-#include "src/tint/utils/string.h"
-#include "src/tint/utils/string_stream.h"
-#include "src/tint/utils/unique_allocator.h"
TINT_INSTANTIATE_TYPEINFO(tint::reader::spirv::Type);
TINT_INSTANTIATE_TYPEINFO(tint::reader::spirv::Void);
diff --git a/src/tint/lang/spirv/reader/parser_type.h b/src/tint/lang/spirv/reader/parser_type.h
index ee53f117..7e92fc9 100644
--- a/src/tint/lang/spirv/reader/parser_type.h
+++ b/src/tint/lang/spirv/reader/parser_type.h
@@ -22,12 +22,12 @@
#include "src/tint/builtin/access.h"
#include "src/tint/builtin/address_space.h"
#include "src/tint/builtin/texel_format.h"
+#include "src/tint/core/block_allocator.h"
+#include "src/tint/core/castable.h"
#include "src/tint/lang/wgsl/ast/type.h"
#include "src/tint/symbol.h"
#include "src/tint/type/sampler_kind.h"
#include "src/tint/type/texture_dimension.h"
-#include "src/tint/utils/block_allocator.h"
-#include "src/tint/utils/castable.h"
// Forward declarations
namespace tint {
diff --git a/src/tint/lang/spirv/reader/spirv_tools_helpers_test.cc b/src/tint/lang/spirv/reader/spirv_tools_helpers_test.cc
index 799369a..2852c2b 100644
--- a/src/tint/lang/spirv/reader/spirv_tools_helpers_test.cc
+++ b/src/tint/lang/spirv/reader/spirv_tools_helpers_test.cc
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
#include "spirv-tools/libspirv.hpp"
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::reader::spirv::test {
diff --git a/src/tint/lang/spirv/reader/usage.cc b/src/tint/lang/spirv/reader/usage.cc
index 2f92e8d..b7a05d0 100644
--- a/src/tint/lang/spirv/reader/usage.cc
+++ b/src/tint/lang/spirv/reader/usage.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/spirv/reader/usage.h"
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::reader::spirv {
diff --git a/src/tint/lang/spirv/reader/usage.h b/src/tint/lang/spirv/reader/usage.h
index db77ca0..cc66060 100644
--- a/src/tint/lang/spirv/reader/usage.h
+++ b/src/tint/lang/spirv/reader/usage.h
@@ -17,7 +17,7 @@
#include <string>
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::reader::spirv {
diff --git a/src/tint/lang/spirv/reader/usage_test.cc b/src/tint/lang/spirv/reader/usage_test.cc
index d3e72ac..0c5c3d0 100644
--- a/src/tint/lang/spirv/reader/usage_test.cc
+++ b/src/tint/lang/spirv/reader/usage_test.cc
@@ -16,8 +16,8 @@
#include <vector>
#include "gmock/gmock.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/spirv/reader/parser_impl_test_helper.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::reader::spirv {
namespace {
diff --git a/src/tint/lang/wgsl/ast/float_literal_expression_test.cc b/src/tint/lang/wgsl/ast/float_literal_expression_test.cc
index 98e6276..4123551 100644
--- a/src/tint/lang/wgsl/ast/float_literal_expression_test.cc
+++ b/src/tint/lang/wgsl/ast/float_literal_expression_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/ast/test_helper.h"
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/int_literal_expression_test.cc b/src/tint/lang/wgsl/ast/int_literal_expression_test.cc
index a6dec02..68b8276 100644
--- a/src/tint/lang/wgsl/ast/int_literal_expression_test.cc
+++ b/src/tint/lang/wgsl/ast/int_literal_expression_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/ast/test_helper.h"
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/internal_attribute.h b/src/tint/lang/wgsl/ast/internal_attribute.h
index 3e758e3..b0be9d8 100644
--- a/src/tint/lang/wgsl/ast/internal_attribute.h
+++ b/src/tint/lang/wgsl/ast/internal_attribute.h
@@ -17,8 +17,8 @@
#include <string>
+#include "src/tint/core/vector.h"
#include "src/tint/lang/wgsl/ast/attribute.h"
-#include "src/tint/utils/vector.h"
// Forward declarations
namespace tint::ast {
diff --git a/src/tint/lang/wgsl/ast/interpolate_attribute_test.cc b/src/tint/lang/wgsl/ast/interpolate_attribute_test.cc
index 4753a4f..ec43e9a 100644
--- a/src/tint/lang/wgsl/ast/interpolate_attribute_test.cc
+++ b/src/tint/lang/wgsl/ast/interpolate_attribute_test.cc
@@ -16,8 +16,8 @@
#include <string>
+#include "src/tint/core/string.h"
#include "src/tint/lang/wgsl/ast/test_helper.h"
-#include "src/tint/utils/string.h"
namespace tint::ast {
namespace {
diff --git a/src/tint/lang/wgsl/ast/module.h b/src/tint/lang/wgsl/ast/module.h
index e588454..fed7c40 100644
--- a/src/tint/lang/wgsl/ast/module.h
+++ b/src/tint/lang/wgsl/ast/module.h
@@ -17,11 +17,11 @@
#include <string>
+#include "src/tint/core/vector.h"
#include "src/tint/lang/wgsl/ast/const_assert.h"
#include "src/tint/lang/wgsl/ast/diagnostic_directive.h"
#include "src/tint/lang/wgsl/ast/enable.h"
#include "src/tint/lang/wgsl/ast/function.h"
-#include "src/tint/utils/vector.h"
namespace tint::ast {
diff --git a/src/tint/lang/wgsl/ast/pipeline_stage.h b/src/tint/lang/wgsl/ast/pipeline_stage.h
index 8ddc450..c3c5e18 100644
--- a/src/tint/lang/wgsl/ast/pipeline_stage.h
+++ b/src/tint/lang/wgsl/ast/pipeline_stage.h
@@ -15,7 +15,7 @@
#ifndef SRC_TINT_LANG_WGSL_AST_PIPELINE_STAGE_H_
#define SRC_TINT_LANG_WGSL_AST_PIPELINE_STAGE_H_
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::ast {
diff --git a/src/tint/lang/wgsl/ast/struct.h b/src/tint/lang/wgsl/ast/struct.h
index 2513834..4b77d49 100644
--- a/src/tint/lang/wgsl/ast/struct.h
+++ b/src/tint/lang/wgsl/ast/struct.h
@@ -18,10 +18,10 @@
#include <string>
#include <utility>
+#include "src/tint/core/vector.h"
#include "src/tint/lang/wgsl/ast/attribute.h"
#include "src/tint/lang/wgsl/ast/struct_member.h"
#include "src/tint/lang/wgsl/ast/type_decl.h"
-#include "src/tint/utils/vector.h"
namespace tint::ast {
diff --git a/src/tint/lang/wgsl/ast/transform/add_block_attribute.cc b/src/tint/lang/wgsl/ast/transform/add_block_attribute.cc
index f227eed..e6f503f 100644
--- a/src/tint/lang/wgsl/ast/transform/add_block_attribute.cc
+++ b/src/tint/lang/wgsl/ast/transform/add_block_attribute.cc
@@ -17,10 +17,10 @@
#include <unordered_set>
#include <utility>
+#include "src/tint/core/hashmap.h"
+#include "src/tint/core/hashset.h"
#include "src/tint/lang/wgsl/sem/variable.h"
#include "src/tint/program_builder.h"
-#include "src/tint/utils/hashmap.h"
-#include "src/tint/utils/hashset.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::AddBlockAttribute);
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::AddBlockAttribute::BlockAttribute);
diff --git a/src/tint/lang/wgsl/ast/transform/binding_remapper.cc b/src/tint/lang/wgsl/ast/transform/binding_remapper.cc
index 566a89a..79a1c1b 100644
--- a/src/tint/lang/wgsl/ast/transform/binding_remapper.cc
+++ b/src/tint/lang/wgsl/ast/transform/binding_remapper.cc
@@ -18,11 +18,11 @@
#include <unordered_set>
#include <utility>
+#include "src/tint/core/string.h"
#include "src/tint/lang/wgsl/ast/disable_validation_attribute.h"
#include "src/tint/lang/wgsl/sem/function.h"
#include "src/tint/lang/wgsl/sem/variable.h"
#include "src/tint/program_builder.h"
-#include "src/tint/utils/string.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::BindingRemapper);
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::BindingRemapper::Remappings);
diff --git a/src/tint/lang/wgsl/ast/transform/builtin_polyfill.cc b/src/tint/lang/wgsl/ast/transform/builtin_polyfill.cc
index 086a0cf..501cf31 100644
--- a/src/tint/lang/wgsl/ast/transform/builtin_polyfill.cc
+++ b/src/tint/lang/wgsl/ast/transform/builtin_polyfill.cc
@@ -19,6 +19,7 @@
#include <unordered_map>
#include <utility>
+#include "src/tint/core/map.h"
#include "src/tint/lang/wgsl/sem/builtin.h"
#include "src/tint/lang/wgsl/sem/call.h"
#include "src/tint/lang/wgsl/sem/type_expression.h"
@@ -27,7 +28,6 @@
#include "src/tint/switch.h"
#include "src/tint/type/storage_texture.h"
#include "src/tint/type/texture_dimension.h"
-#include "src/tint/utils/map.h"
using namespace tint::builtin::fluent_types; // NOLINT
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/wgsl/ast/transform/calculate_array_length.cc b/src/tint/lang/wgsl/ast/transform/calculate_array_length.cc
index 5a43780..d3011bc 100644
--- a/src/tint/lang/wgsl/ast/transform/calculate_array_length.cc
+++ b/src/tint/lang/wgsl/ast/transform/calculate_array_length.cc
@@ -17,6 +17,8 @@
#include <unordered_map>
#include <utility>
+#include "src/tint/core/hash.h"
+#include "src/tint/core/map.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/lang/wgsl/ast/disable_validation_attribute.h"
#include "src/tint/lang/wgsl/ast/transform/simplify_pointers.h"
@@ -29,8 +31,6 @@
#include "src/tint/program_builder.h"
#include "src/tint/switch.h"
#include "src/tint/type/reference.h"
-#include "src/tint/utils/hash.h"
-#include "src/tint/utils/map.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::CalculateArrayLength);
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::CalculateArrayLength::BufferSizeIntrinsic);
diff --git a/src/tint/lang/wgsl/ast/transform/clamp_frag_depth.cc b/src/tint/lang/wgsl/ast/transform/clamp_frag_depth.cc
index 368b896..519d3ff 100644
--- a/src/tint/lang/wgsl/ast/transform/clamp_frag_depth.cc
+++ b/src/tint/lang/wgsl/ast/transform/clamp_frag_depth.cc
@@ -17,6 +17,8 @@
#include <utility>
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/core/scoped_assignment.h"
+#include "src/tint/core/vector.h"
#include "src/tint/lang/wgsl/ast/attribute.h"
#include "src/tint/lang/wgsl/ast/builtin_attribute.h"
#include "src/tint/lang/wgsl/ast/function.h"
@@ -26,8 +28,6 @@
#include "src/tint/lang/wgsl/sem/statement.h"
#include "src/tint/lang/wgsl/sem/struct.h"
#include "src/tint/program_builder.h"
-#include "src/tint/utils/scoped_assignment.h"
-#include "src/tint/utils/vector.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::ClampFragDepth);
diff --git a/src/tint/lang/wgsl/ast/transform/combine_samplers.cc b/src/tint/lang/wgsl/ast/transform/combine_samplers.cc
index 7196bd7..6281062 100644
--- a/src/tint/lang/wgsl/ast/transform/combine_samplers.cc
+++ b/src/tint/lang/wgsl/ast/transform/combine_samplers.cc
@@ -23,7 +23,7 @@
#include "src/tint/lang/wgsl/sem/statement.h"
#include "src/tint/program_builder.h"
-#include "src/tint/utils/map.h"
+#include "src/tint/core/map.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::CombineSamplers);
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::CombineSamplers::BindingInfo);
diff --git a/src/tint/lang/wgsl/ast/transform/decompose_memory_access.cc b/src/tint/lang/wgsl/ast/transform/decompose_memory_access.cc
index 4d8756a..51ab7c8 100644
--- a/src/tint/lang/wgsl/ast/transform/decompose_memory_access.cc
+++ b/src/tint/lang/wgsl/ast/transform/decompose_memory_access.cc
@@ -20,6 +20,10 @@
#include <utility>
#include <vector>
+#include "src/tint/core/block_allocator.h"
+#include "src/tint/core/hash.h"
+#include "src/tint/core/map.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/wgsl/ast/assignment_statement.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/lang/wgsl/ast/disable_validation_attribute.h"
@@ -34,10 +38,6 @@
#include "src/tint/type/array.h"
#include "src/tint/type/atomic.h"
#include "src/tint/type/reference.h"
-#include "src/tint/utils/block_allocator.h"
-#include "src/tint/utils/hash.h"
-#include "src/tint/utils/map.h"
-#include "src/tint/utils/string_stream.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/wgsl/ast/transform/decompose_strided_array.cc b/src/tint/lang/wgsl/ast/transform/decompose_strided_array.cc
index 6450031..44d5fc2 100644
--- a/src/tint/lang/wgsl/ast/transform/decompose_strided_array.cc
+++ b/src/tint/lang/wgsl/ast/transform/decompose_strided_array.cc
@@ -18,6 +18,8 @@
#include <utility>
#include <vector>
+#include "src/tint/core/hash.h"
+#include "src/tint/core/map.h"
#include "src/tint/lang/wgsl/ast/transform/simplify_pointers.h"
#include "src/tint/lang/wgsl/sem/call.h"
#include "src/tint/lang/wgsl/sem/member_accessor_expression.h"
@@ -25,8 +27,6 @@
#include "src/tint/lang/wgsl/sem/value_constructor.h"
#include "src/tint/lang/wgsl/sem/value_expression.h"
#include "src/tint/program_builder.h"
-#include "src/tint/utils/hash.h"
-#include "src/tint/utils/map.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::DecomposeStridedArray);
diff --git a/src/tint/lang/wgsl/ast/transform/decompose_strided_matrix.cc b/src/tint/lang/wgsl/ast/transform/decompose_strided_matrix.cc
index 3c4359e..01f1333f 100644
--- a/src/tint/lang/wgsl/ast/transform/decompose_strided_matrix.cc
+++ b/src/tint/lang/wgsl/ast/transform/decompose_strided_matrix.cc
@@ -18,12 +18,12 @@
#include <utility>
#include <vector>
+#include "src/tint/core/hash.h"
+#include "src/tint/core/map.h"
#include "src/tint/lang/wgsl/ast/transform/simplify_pointers.h"
#include "src/tint/lang/wgsl/sem/member_accessor_expression.h"
#include "src/tint/lang/wgsl/sem/value_expression.h"
#include "src/tint/program_builder.h"
-#include "src/tint/utils/hash.h"
-#include "src/tint/utils/map.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::DecomposeStridedMatrix);
diff --git a/src/tint/lang/wgsl/ast/transform/demote_to_helper.cc b/src/tint/lang/wgsl/ast/transform/demote_to_helper.cc
index c86287a..342f645 100644
--- a/src/tint/lang/wgsl/ast/transform/demote_to_helper.cc
+++ b/src/tint/lang/wgsl/ast/transform/demote_to_helper.cc
@@ -18,6 +18,7 @@
#include <unordered_set>
#include <utility>
+#include "src/tint/core/map.h"
#include "src/tint/lang/wgsl/ast/transform/utils/hoist_to_decl_before.h"
#include "src/tint/lang/wgsl/sem/block_statement.h"
#include "src/tint/lang/wgsl/sem/call.h"
@@ -26,7 +27,6 @@
#include "src/tint/program_builder.h"
#include "src/tint/switch.h"
#include "src/tint/type/reference.h"
-#include "src/tint/utils/map.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::DemoteToHelper);
diff --git a/src/tint/lang/wgsl/ast/transform/direct_variable_access.cc b/src/tint/lang/wgsl/ast/transform/direct_variable_access.cc
index 8de4326..174ffbe 100644
--- a/src/tint/lang/wgsl/ast/transform/direct_variable_access.cc
+++ b/src/tint/lang/wgsl/ast/transform/direct_variable_access.cc
@@ -18,6 +18,9 @@
#include <string>
#include <utility>
+#include "src/tint/core/reverse.h"
+#include "src/tint/core/scoped_assignment.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/wgsl/ast/transform/utils/hoist_to_decl_before.h"
#include "src/tint/lang/wgsl/ast/traverse_expressions.h"
#include "src/tint/lang/wgsl/sem/call.h"
@@ -30,9 +33,6 @@
#include "src/tint/lang/wgsl/sem/variable.h"
#include "src/tint/program_builder.h"
#include "src/tint/type/abstract_int.h"
-#include "src/tint/utils/reverse.h"
-#include "src/tint/utils/scoped_assignment.h"
-#include "src/tint/utils/string_stream.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::DirectVariableAccess);
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::DirectVariableAccess::Config);
diff --git a/src/tint/lang/wgsl/ast/transform/direct_variable_access_test.cc b/src/tint/lang/wgsl/ast/transform/direct_variable_access_test.cc
index 992a89f..cb239d9 100644
--- a/src/tint/lang/wgsl/ast/transform/direct_variable_access_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/direct_variable_access_test.cc
@@ -17,8 +17,8 @@
#include <memory>
#include <utility>
+#include "src/tint/core/string.h"
#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
-#include "src/tint/utils/string.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/fold_trivial_lets.cc b/src/tint/lang/wgsl/ast/transform/fold_trivial_lets.cc
index da2f9ac..33e821f 100644
--- a/src/tint/lang/wgsl/ast/transform/fold_trivial_lets.cc
+++ b/src/tint/lang/wgsl/ast/transform/fold_trivial_lets.cc
@@ -16,10 +16,10 @@
#include <utility>
+#include "src/tint/core/hashmap.h"
#include "src/tint/lang/wgsl/ast/traverse_expressions.h"
#include "src/tint/lang/wgsl/sem/value_expression.h"
#include "src/tint/program_builder.h"
-#include "src/tint/utils/hashmap.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::FoldTrivialLets);
diff --git a/src/tint/lang/wgsl/ast/transform/localize_struct_array_assignment.cc b/src/tint/lang/wgsl/ast/transform/localize_struct_array_assignment.cc
index f2f21a8..e28c8f5 100644
--- a/src/tint/lang/wgsl/ast/transform/localize_struct_array_assignment.cc
+++ b/src/tint/lang/wgsl/ast/transform/localize_struct_array_assignment.cc
@@ -17,6 +17,7 @@
#include <unordered_map>
#include <utility>
+#include "src/tint/core/scoped_assignment.h"
#include "src/tint/lang/wgsl/ast/assignment_statement.h"
#include "src/tint/lang/wgsl/ast/transform/simplify_pointers.h"
#include "src/tint/lang/wgsl/ast/traverse_expressions.h"
@@ -26,7 +27,6 @@
#include "src/tint/lang/wgsl/sem/variable.h"
#include "src/tint/program_builder.h"
#include "src/tint/type/reference.h"
-#include "src/tint/utils/scoped_assignment.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::LocalizeStructArrayAssignment);
diff --git a/src/tint/lang/wgsl/ast/transform/merge_return.cc b/src/tint/lang/wgsl/ast/transform/merge_return.cc
index fc9da69..39ea5bf 100644
--- a/src/tint/lang/wgsl/ast/transform/merge_return.cc
+++ b/src/tint/lang/wgsl/ast/transform/merge_return.cc
@@ -16,10 +16,10 @@
#include <utility>
+#include "src/tint/core/scoped_assignment.h"
#include "src/tint/lang/wgsl/sem/statement.h"
#include "src/tint/program_builder.h"
#include "src/tint/switch.h"
-#include "src/tint/utils/scoped_assignment.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::MergeReturn);
diff --git a/src/tint/lang/wgsl/ast/transform/module_scope_var_to_entry_point_param.cc b/src/tint/lang/wgsl/ast/transform/module_scope_var_to_entry_point_param.cc
index baaa9cb..5defe43 100644
--- a/src/tint/lang/wgsl/ast/transform/module_scope_var_to_entry_point_param.cc
+++ b/src/tint/lang/wgsl/ast/transform/module_scope_var_to_entry_point_param.cc
@@ -19,6 +19,7 @@
#include <utility>
#include <vector>
+#include "src/tint/core/string.h"
#include "src/tint/lang/wgsl/ast/disable_validation_attribute.h"
#include "src/tint/lang/wgsl/sem/call.h"
#include "src/tint/lang/wgsl/sem/function.h"
@@ -26,7 +27,6 @@
#include "src/tint/lang/wgsl/sem/statement.h"
#include "src/tint/lang/wgsl/sem/variable.h"
#include "src/tint/program_builder.h"
-#include "src/tint/utils/string.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::ModuleScopeVarToEntryPointParam);
diff --git a/src/tint/lang/wgsl/ast/transform/num_workgroups_from_uniform.cc b/src/tint/lang/wgsl/ast/transform/num_workgroups_from_uniform.cc
index eabb0fb..42b93e7 100644
--- a/src/tint/lang/wgsl/ast/transform/num_workgroups_from_uniform.cc
+++ b/src/tint/lang/wgsl/ast/transform/num_workgroups_from_uniform.cc
@@ -20,10 +20,10 @@
#include <utility>
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/core/hash.h"
#include "src/tint/lang/wgsl/ast/transform/canonicalize_entry_point_io.h"
#include "src/tint/lang/wgsl/sem/function.h"
#include "src/tint/program_builder.h"
-#include "src/tint/utils/hash.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::NumWorkgroupsFromUniform);
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::NumWorkgroupsFromUniform::Config);
diff --git a/src/tint/lang/wgsl/ast/transform/packed_vec3.cc b/src/tint/lang/wgsl/ast/transform/packed_vec3.cc
index 369f719..49465f1 100644
--- a/src/tint/lang/wgsl/ast/transform/packed_vec3.cc
+++ b/src/tint/lang/wgsl/ast/transform/packed_vec3.cc
@@ -19,6 +19,9 @@
#include <utility>
#include "src/tint/builtin/builtin.h"
+#include "src/tint/core/hashmap.h"
+#include "src/tint/core/hashset.h"
+#include "src/tint/core/vector.h"
#include "src/tint/lang/wgsl/ast/assignment_statement.h"
#include "src/tint/lang/wgsl/sem/array_count.h"
#include "src/tint/lang/wgsl/sem/index_accessor_expression.h"
@@ -31,9 +34,6 @@
#include "src/tint/type/array.h"
#include "src/tint/type/reference.h"
#include "src/tint/type/vector.h"
-#include "src/tint/utils/hashmap.h"
-#include "src/tint/utils/hashset.h"
-#include "src/tint/utils/vector.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::PackedVec3);
diff --git a/src/tint/lang/wgsl/ast/transform/packed_vec3_test.cc b/src/tint/lang/wgsl/ast/transform/packed_vec3_test.cc
index 08fe567..df02ace 100644
--- a/src/tint/lang/wgsl/ast/transform/packed_vec3_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/packed_vec3_test.cc
@@ -18,13 +18,13 @@
#include <utility>
#include <vector>
+#include "src/tint/core/string.h"
#include "src/tint/lang/wgsl/ast/module.h"
#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
#include "src/tint/lang/wgsl/sem/struct.h"
#include "src/tint/lang/wgsl/sem/variable.h"
#include "src/tint/program_builder.h"
#include "src/tint/type/array.h"
-#include "src/tint/utils/string.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/preserve_padding.cc b/src/tint/lang/wgsl/ast/transform/preserve_padding.cc
index 1dee7ee..3b755cb 100644
--- a/src/tint/lang/wgsl/ast/transform/preserve_padding.cc
+++ b/src/tint/lang/wgsl/ast/transform/preserve_padding.cc
@@ -17,12 +17,12 @@
#include <unordered_set>
#include <utility>
+#include "src/tint/core/map.h"
+#include "src/tint/core/vector.h"
#include "src/tint/lang/wgsl/sem/struct.h"
#include "src/tint/program_builder.h"
#include "src/tint/switch.h"
#include "src/tint/type/reference.h"
-#include "src/tint/utils/map.h"
-#include "src/tint/utils/vector.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::PreservePadding);
diff --git a/src/tint/lang/wgsl/ast/transform/promote_initializers_to_let.cc b/src/tint/lang/wgsl/ast/transform/promote_initializers_to_let.cc
index aed70ae..e088bcd 100644
--- a/src/tint/lang/wgsl/ast/transform/promote_initializers_to_let.cc
+++ b/src/tint/lang/wgsl/ast/transform/promote_initializers_to_let.cc
@@ -16,6 +16,7 @@
#include <utility>
+#include "src/tint/core/hashset.h"
#include "src/tint/lang/wgsl/ast/transform/utils/hoist_to_decl_before.h"
#include "src/tint/lang/wgsl/ast/traverse_expressions.h"
#include "src/tint/lang/wgsl/sem/call.h"
@@ -23,7 +24,6 @@
#include "src/tint/lang/wgsl/sem/value_constructor.h"
#include "src/tint/program_builder.h"
#include "src/tint/type/struct.h"
-#include "src/tint/utils/hashset.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::PromoteInitializersToLet);
diff --git a/src/tint/lang/wgsl/ast/transform/promote_side_effects_to_decl.cc b/src/tint/lang/wgsl/ast/transform/promote_side_effects_to_decl.cc
index c7eccaf..8dc41cc 100644
--- a/src/tint/lang/wgsl/ast/transform/promote_side_effects_to_decl.cc
+++ b/src/tint/lang/wgsl/ast/transform/promote_side_effects_to_decl.cc
@@ -20,6 +20,7 @@
#include <utility>
#include <vector>
+#include "src/tint/core/scoped_assignment.h"
#include "src/tint/lang/wgsl/ast/transform/utils/get_insertion_point.h"
#include "src/tint/lang/wgsl/ast/transform/utils/hoist_to_decl_before.h"
#include "src/tint/lang/wgsl/ast/traverse_expressions.h"
@@ -31,7 +32,6 @@
#include "src/tint/lang/wgsl/sem/variable.h"
#include "src/tint/lang/wgsl/sem/while_statement.h"
#include "src/tint/transform/manager.h"
-#include "src/tint/utils/scoped_assignment.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::PromoteSideEffectsToDecl);
diff --git a/src/tint/lang/wgsl/ast/transform/remove_continue_in_switch.cc b/src/tint/lang/wgsl/ast/transform/remove_continue_in_switch.cc
index 506392d..bbb9706 100644
--- a/src/tint/lang/wgsl/ast/transform/remove_continue_in_switch.cc
+++ b/src/tint/lang/wgsl/ast/transform/remove_continue_in_switch.cc
@@ -18,6 +18,7 @@
#include <unordered_map>
#include <utility>
+#include "src/tint/core/map.h"
#include "src/tint/lang/wgsl/ast/continue_statement.h"
#include "src/tint/lang/wgsl/ast/switch_statement.h"
#include "src/tint/lang/wgsl/ast/transform/utils/get_insertion_point.h"
@@ -27,7 +28,6 @@
#include "src/tint/lang/wgsl/sem/switch_statement.h"
#include "src/tint/lang/wgsl/sem/while_statement.h"
#include "src/tint/program_builder.h"
-#include "src/tint/utils/map.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::RemoveContinueInSwitch);
diff --git a/src/tint/lang/wgsl/ast/transform/remove_phonies.cc b/src/tint/lang/wgsl/ast/transform/remove_phonies.cc
index 1e95835..39c0c08 100644
--- a/src/tint/lang/wgsl/ast/transform/remove_phonies.cc
+++ b/src/tint/lang/wgsl/ast/transform/remove_phonies.cc
@@ -19,14 +19,14 @@
#include <utility>
#include <vector>
+#include "src/tint/core/map.h"
+#include "src/tint/core/scoped_assignment.h"
#include "src/tint/lang/wgsl/ast/traverse_expressions.h"
#include "src/tint/lang/wgsl/sem/block_statement.h"
#include "src/tint/lang/wgsl/sem/function.h"
#include "src/tint/lang/wgsl/sem/statement.h"
#include "src/tint/lang/wgsl/sem/variable.h"
#include "src/tint/program_builder.h"
-#include "src/tint/utils/map.h"
-#include "src/tint/utils/scoped_assignment.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::RemovePhonies);
diff --git a/src/tint/lang/wgsl/ast/transform/remove_unreachable_statements.cc b/src/tint/lang/wgsl/ast/transform/remove_unreachable_statements.cc
index 338b49e..46c6fa4 100644
--- a/src/tint/lang/wgsl/ast/transform/remove_unreachable_statements.cc
+++ b/src/tint/lang/wgsl/ast/transform/remove_unreachable_statements.cc
@@ -19,14 +19,14 @@
#include <utility>
#include <vector>
+#include "src/tint/core/map.h"
+#include "src/tint/core/scoped_assignment.h"
#include "src/tint/lang/wgsl/ast/traverse_expressions.h"
#include "src/tint/lang/wgsl/sem/block_statement.h"
#include "src/tint/lang/wgsl/sem/function.h"
#include "src/tint/lang/wgsl/sem/statement.h"
#include "src/tint/lang/wgsl/sem/variable.h"
#include "src/tint/program_builder.h"
-#include "src/tint/utils/map.h"
-#include "src/tint/utils/scoped_assignment.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::RemoveUnreachableStatements);
diff --git a/src/tint/lang/wgsl/ast/transform/renamer.cc b/src/tint/lang/wgsl/ast/transform/renamer.cc
index 45b7020..1ac7829 100644
--- a/src/tint/lang/wgsl/ast/transform/renamer.cc
+++ b/src/tint/lang/wgsl/ast/transform/renamer.cc
@@ -17,6 +17,7 @@
#include <memory>
#include <utility>
+#include "src/tint/core/unicode.h"
#include "src/tint/lang/wgsl/sem/builtin_enum_expression.h"
#include "src/tint/lang/wgsl/sem/call.h"
#include "src/tint/lang/wgsl/sem/member_accessor_expression.h"
@@ -25,7 +26,6 @@
#include "src/tint/lang/wgsl/sem/value_conversion.h"
#include "src/tint/program_builder.h"
#include "src/tint/switch.h"
-#include "src/tint/utils/unicode.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::Renamer);
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::Renamer::Data);
diff --git a/src/tint/lang/wgsl/ast/transform/renamer_test.cc b/src/tint/lang/wgsl/ast/transform/renamer_test.cc
index 7cfd18d..5211839 100644
--- a/src/tint/lang/wgsl/ast/transform/renamer_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/renamer_test.cc
@@ -21,8 +21,8 @@
#include "gmock/gmock.h"
#include "src/tint/builtin/builtin.h"
#include "src/tint/builtin/texel_format.h"
+#include "src/tint/core/string.h"
#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
-#include "src/tint/utils/string.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/spirv_atomic.cc b/src/tint/lang/wgsl/ast/transform/spirv_atomic.cc
index 9a7336f..2ddcabd 100644
--- a/src/tint/lang/wgsl/ast/transform/spirv_atomic.cc
+++ b/src/tint/lang/wgsl/ast/transform/spirv_atomic.cc
@@ -20,6 +20,8 @@
#include <utility>
#include <vector>
+#include "src/tint/core/map.h"
+#include "src/tint/core/unique_vector.h"
#include "src/tint/lang/wgsl/sem/block_statement.h"
#include "src/tint/lang/wgsl/sem/function.h"
#include "src/tint/lang/wgsl/sem/index_accessor_expression.h"
@@ -28,8 +30,6 @@
#include "src/tint/program_builder.h"
#include "src/tint/switch.h"
#include "src/tint/type/reference.h"
-#include "src/tint/utils/map.h"
-#include "src/tint/utils/unique_vector.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::SpirvAtomic);
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::SpirvAtomic::Stub);
diff --git a/src/tint/lang/wgsl/ast/transform/std140.cc b/src/tint/lang/wgsl/ast/transform/std140.cc
index 13f346f..7350ce1 100644
--- a/src/tint/lang/wgsl/ast/transform/std140.cc
+++ b/src/tint/lang/wgsl/ast/transform/std140.cc
@@ -19,6 +19,9 @@
#include <utility>
#include <variant>
+#include "src/tint/core/compiler_macros.h"
+#include "src/tint/core/hashmap.h"
+#include "src/tint/core/transform.h"
#include "src/tint/lang/wgsl/sem/index_accessor_expression.h"
#include "src/tint/lang/wgsl/sem/member_accessor_expression.h"
#include "src/tint/lang/wgsl/sem/module.h"
@@ -26,9 +29,6 @@
#include "src/tint/lang/wgsl/sem/variable.h"
#include "src/tint/program_builder.h"
#include "src/tint/switch.h"
-#include "src/tint/utils/compiler_macros.h"
-#include "src/tint/utils/hashmap.h"
-#include "src/tint/utils/transform.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::Std140);
diff --git a/src/tint/lang/wgsl/ast/transform/std140_exhaustive_test.cc b/src/tint/lang/wgsl/ast/transform/std140_exhaustive_test.cc
index f05ee31..c3ef73f 100644
--- a/src/tint/lang/wgsl/ast/transform/std140_exhaustive_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/std140_exhaustive_test.cc
@@ -18,8 +18,8 @@
#include <utility>
#include <vector>
+#include "src/tint/core/string.h"
#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
-#include "src/tint/utils/string.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/std140_f16_test.cc b/src/tint/lang/wgsl/ast/transform/std140_f16_test.cc
index 50f5fe5..0b90bb8 100644
--- a/src/tint/lang/wgsl/ast/transform/std140_f16_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/std140_f16_test.cc
@@ -18,8 +18,8 @@
#include <utility>
#include <vector>
+#include "src/tint/core/string.h"
#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
-#include "src/tint/utils/string.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/std140_f32_test.cc b/src/tint/lang/wgsl/ast/transform/std140_f32_test.cc
index f46d33a..e458bce 100644
--- a/src/tint/lang/wgsl/ast/transform/std140_f32_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/std140_f32_test.cc
@@ -18,8 +18,8 @@
#include <utility>
#include <vector>
+#include "src/tint/core/string.h"
#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
-#include "src/tint/utils/string.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/std140_test.cc b/src/tint/lang/wgsl/ast/transform/std140_test.cc
index 5d203b7..3b20196 100644
--- a/src/tint/lang/wgsl/ast/transform/std140_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/std140_test.cc
@@ -18,8 +18,8 @@
#include <utility>
#include <vector>
+#include "src/tint/core/string.h"
#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
-#include "src/tint/utils/string.h"
// This file contains the should-run tests and a trival empty module test for Std140 transform.
// For testing transform results with clear readability, please refer to std140_f32_test.cc for f32
diff --git a/src/tint/lang/wgsl/ast/transform/transform.h b/src/tint/lang/wgsl/ast/transform/transform.h
index 0b37aee..3093486 100644
--- a/src/tint/lang/wgsl/ast/transform/transform.h
+++ b/src/tint/lang/wgsl/ast/transform/transform.h
@@ -19,8 +19,8 @@
#include <utility>
+#include "src/tint/core/castable.h"
#include "src/tint/program.h"
-#include "src/tint/utils/castable.h"
namespace tint::ast::transform {
diff --git a/src/tint/lang/wgsl/ast/transform/truncate_interstage_variables.cc b/src/tint/lang/wgsl/ast/transform/truncate_interstage_variables.cc
index e1f798d..3f8bf66 100644
--- a/src/tint/lang/wgsl/ast/transform/truncate_interstage_variables.cc
+++ b/src/tint/lang/wgsl/ast/transform/truncate_interstage_variables.cc
@@ -18,13 +18,13 @@
#include <string>
#include <utility>
+#include "src/tint/core/unicode.h"
#include "src/tint/lang/wgsl/sem/call.h"
#include "src/tint/lang/wgsl/sem/function.h"
#include "src/tint/lang/wgsl/sem/member_accessor_expression.h"
#include "src/tint/lang/wgsl/sem/statement.h"
#include "src/tint/lang/wgsl/sem/variable.h"
#include "src/tint/program_builder.h"
-#include "src/tint/utils/unicode.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::TruncateInterstageVariables);
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::TruncateInterstageVariables::Config);
diff --git a/src/tint/lang/wgsl/ast/transform/utils/hoist_to_decl_before.cc b/src/tint/lang/wgsl/ast/transform/utils/hoist_to_decl_before.cc
index 91f3ec7..45b705a 100644
--- a/src/tint/lang/wgsl/ast/transform/utils/hoist_to_decl_before.cc
+++ b/src/tint/lang/wgsl/ast/transform/utils/hoist_to_decl_before.cc
@@ -16,6 +16,9 @@
#include <utility>
+#include "src/tint/core/hashmap.h"
+#include "src/tint/core/reverse.h"
+#include "src/tint/core/transform.h"
#include "src/tint/lang/wgsl/sem/block_statement.h"
#include "src/tint/lang/wgsl/sem/for_loop_statement.h"
#include "src/tint/lang/wgsl/sem/if_statement.h"
@@ -23,9 +26,6 @@
#include "src/tint/lang/wgsl/sem/while_statement.h"
#include "src/tint/program_builder.h"
#include "src/tint/type/reference.h"
-#include "src/tint/utils/hashmap.h"
-#include "src/tint/utils/reverse.h"
-#include "src/tint/utils/transform.h"
namespace tint::ast::transform {
diff --git a/src/tint/lang/wgsl/ast/transform/vectorize_matrix_conversions.cc b/src/tint/lang/wgsl/ast/transform/vectorize_matrix_conversions.cc
index 2cad9e2..abb1a9f 100644
--- a/src/tint/lang/wgsl/ast/transform/vectorize_matrix_conversions.cc
+++ b/src/tint/lang/wgsl/ast/transform/vectorize_matrix_conversions.cc
@@ -18,13 +18,13 @@
#include <unordered_map>
#include <utility>
+#include "src/tint/core/hash.h"
+#include "src/tint/core/map.h"
#include "src/tint/lang/wgsl/sem/call.h"
#include "src/tint/lang/wgsl/sem/value_conversion.h"
#include "src/tint/lang/wgsl/sem/value_expression.h"
#include "src/tint/program_builder.h"
#include "src/tint/type/abstract_numeric.h"
-#include "src/tint/utils/hash.h"
-#include "src/tint/utils/map.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::VectorizeMatrixConversions);
diff --git a/src/tint/lang/wgsl/ast/transform/vectorize_matrix_conversions_test.cc b/src/tint/lang/wgsl/ast/transform/vectorize_matrix_conversions_test.cc
index c876461..e231b76 100644
--- a/src/tint/lang/wgsl/ast/transform/vectorize_matrix_conversions_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/vectorize_matrix_conversions_test.cc
@@ -17,8 +17,8 @@
#include <string>
#include <utility>
+#include "src/tint/core/string.h"
#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
-#include "src/tint/utils/string.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/vectorize_scalar_matrix_initializers.cc b/src/tint/lang/wgsl/ast/transform/vectorize_scalar_matrix_initializers.cc
index 7f2c661..8cee6f1 100644
--- a/src/tint/lang/wgsl/ast/transform/vectorize_scalar_matrix_initializers.cc
+++ b/src/tint/lang/wgsl/ast/transform/vectorize_scalar_matrix_initializers.cc
@@ -17,12 +17,12 @@
#include <unordered_map>
#include <utility>
+#include "src/tint/core/map.h"
#include "src/tint/lang/wgsl/sem/call.h"
#include "src/tint/lang/wgsl/sem/value_constructor.h"
#include "src/tint/lang/wgsl/sem/value_expression.h"
#include "src/tint/program_builder.h"
#include "src/tint/type/abstract_numeric.h"
-#include "src/tint/utils/map.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::VectorizeScalarMatrixInitializers);
diff --git a/src/tint/lang/wgsl/ast/transform/vectorize_scalar_matrix_initializers_test.cc b/src/tint/lang/wgsl/ast/transform/vectorize_scalar_matrix_initializers_test.cc
index 26a8670..1586e6c 100644
--- a/src/tint/lang/wgsl/ast/transform/vectorize_scalar_matrix_initializers_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/vectorize_scalar_matrix_initializers_test.cc
@@ -17,8 +17,8 @@
#include <string>
#include <utility>
+#include "src/tint/core/string.h"
#include "src/tint/lang/wgsl/ast/transform/test_helper.h"
-#include "src/tint/utils/string.h"
namespace tint::ast::transform {
namespace {
diff --git a/src/tint/lang/wgsl/ast/transform/vertex_pulling.cc b/src/tint/lang/wgsl/ast/transform/vertex_pulling.cc
index 4ee73c4..7b6129a 100644
--- a/src/tint/lang/wgsl/ast/transform/vertex_pulling.cc
+++ b/src/tint/lang/wgsl/ast/transform/vertex_pulling.cc
@@ -18,16 +18,16 @@
#include <utility>
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/core/compiler_macros.h"
+#include "src/tint/core/map.h"
+#include "src/tint/core/math.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/wgsl/ast/assignment_statement.h"
#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
#include "src/tint/lang/wgsl/ast/variable_decl_statement.h"
#include "src/tint/lang/wgsl/sem/variable.h"
#include "src/tint/program_builder.h"
#include "src/tint/switch.h"
-#include "src/tint/utils/compiler_macros.h"
-#include "src/tint/utils/map.h"
-#include "src/tint/utils/math.h"
-#include "src/tint/utils/string_stream.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::VertexPulling);
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::VertexPulling::Config);
diff --git a/src/tint/lang/wgsl/ast/transform/zero_init_workgroup_memory.cc b/src/tint/lang/wgsl/ast/transform/zero_init_workgroup_memory.cc
index 7ff6154..17d6770 100644
--- a/src/tint/lang/wgsl/ast/transform/zero_init_workgroup_memory.cc
+++ b/src/tint/lang/wgsl/ast/transform/zero_init_workgroup_memory.cc
@@ -21,13 +21,13 @@
#include <vector>
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/core/map.h"
+#include "src/tint/core/unique_vector.h"
#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
#include "src/tint/lang/wgsl/sem/function.h"
#include "src/tint/lang/wgsl/sem/variable.h"
#include "src/tint/program_builder.h"
#include "src/tint/type/atomic.h"
-#include "src/tint/utils/map.h"
-#include "src/tint/utils/unique_vector.h"
TINT_INSTANTIATE_TYPEINFO(tint::ast::transform::ZeroInitWorkgroupMemory);
diff --git a/src/tint/lang/wgsl/ast/traverse_expressions.h b/src/tint/lang/wgsl/ast/traverse_expressions.h
index 0ee10bb..7e0d3cd 100644
--- a/src/tint/lang/wgsl/ast/traverse_expressions.h
+++ b/src/tint/lang/wgsl/ast/traverse_expressions.h
@@ -17,6 +17,9 @@
#include <vector>
+#include "src/tint/core/compiler_macros.h"
+#include "src/tint/core/reverse.h"
+#include "src/tint/core/vector.h"
#include "src/tint/lang/wgsl/ast/binary_expression.h"
#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
#include "src/tint/lang/wgsl/ast/call_expression.h"
@@ -26,9 +29,6 @@
#include "src/tint/lang/wgsl/ast/phony_expression.h"
#include "src/tint/lang/wgsl/ast/unary_op_expression.h"
#include "src/tint/switch.h"
-#include "src/tint/utils/compiler_macros.h"
-#include "src/tint/utils/reverse.h"
-#include "src/tint/utils/vector.h"
namespace tint::ast {
diff --git a/src/tint/lang/wgsl/ast/unary_op.h b/src/tint/lang/wgsl/ast/unary_op.h
index 1e817fc..8917425 100644
--- a/src/tint/lang/wgsl/ast/unary_op.h
+++ b/src/tint/lang/wgsl/ast/unary_op.h
@@ -15,7 +15,7 @@
#ifndef SRC_TINT_LANG_WGSL_AST_UNARY_OP_H_
#define SRC_TINT_LANG_WGSL_AST_UNARY_OP_H_
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::ast {
diff --git a/src/tint/lang/wgsl/ast_writer/generator_impl.cc b/src/tint/lang/wgsl/ast_writer/generator_impl.cc
index 2794eb7..6631cd8 100644
--- a/src/tint/lang/wgsl/ast_writer/generator_impl.cc
+++ b/src/tint/lang/wgsl/ast_writer/generator_impl.cc
@@ -16,6 +16,9 @@
#include <algorithm>
+#include "src/tint/core/defer.h"
+#include "src/tint/core/math.h"
+#include "src/tint/core/scoped_assignment.h"
#include "src/tint/lang/wgsl/ast/alias.h"
#include "src/tint/lang/wgsl/ast/bool_literal_expression.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
@@ -35,9 +38,6 @@
#include "src/tint/lang/wgsl/sem/struct.h"
#include "src/tint/lang/wgsl/sem/switch_statement.h"
#include "src/tint/switch.h"
-#include "src/tint/utils/defer.h"
-#include "src/tint/utils/math.h"
-#include "src/tint/utils/scoped_assignment.h"
#include "src/tint/writer/float_to_string.h"
namespace tint::writer::wgsl {
diff --git a/src/tint/lang/wgsl/ast_writer/generator_impl.h b/src/tint/lang/wgsl/ast_writer/generator_impl.h
index 7da98e7..c21b4ec 100644
--- a/src/tint/lang/wgsl/ast_writer/generator_impl.h
+++ b/src/tint/lang/wgsl/ast_writer/generator_impl.h
@@ -17,6 +17,7 @@
#include <string>
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/wgsl/ast/assignment_statement.h"
#include "src/tint/lang/wgsl/ast/binary_expression.h"
#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
@@ -35,7 +36,6 @@
#include "src/tint/lang/wgsl/ast/unary_op_expression.h"
#include "src/tint/lang/wgsl/sem/struct.h"
#include "src/tint/program.h"
-#include "src/tint/utils/string_stream.h"
#include "src/tint/writer/ast_text_generator.h"
namespace tint::writer::wgsl {
diff --git a/src/tint/lang/wgsl/ast_writer/generator_impl_array_accessor_test.cc b/src/tint/lang/wgsl/ast_writer/generator_impl_array_accessor_test.cc
index 84470ba..4d9ba1c 100644
--- a/src/tint/lang/wgsl/ast_writer/generator_impl_array_accessor_test.cc
+++ b/src/tint/lang/wgsl/ast_writer/generator_impl_array_accessor_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/wgsl/ast_writer/test_helper.h"
-#include "src/tint/utils/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/ast_writer/generator_impl_binary_test.cc b/src/tint/lang/wgsl/ast_writer/generator_impl_binary_test.cc
index 340ce2f..1e8be22 100644
--- a/src/tint/lang/wgsl/ast_writer/generator_impl_binary_test.cc
+++ b/src/tint/lang/wgsl/ast_writer/generator_impl_binary_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/wgsl/ast_writer/test_helper.h"
-#include "src/tint/utils/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/ast_writer/generator_impl_bitcast_test.cc b/src/tint/lang/wgsl/ast_writer/generator_impl_bitcast_test.cc
index a8a4123..dd66db6 100644
--- a/src/tint/lang/wgsl/ast_writer/generator_impl_bitcast_test.cc
+++ b/src/tint/lang/wgsl/ast_writer/generator_impl_bitcast_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/wgsl/ast_writer/test_helper.h"
-#include "src/tint/utils/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/ast_writer/generator_impl_call_test.cc b/src/tint/lang/wgsl/ast_writer/generator_impl_call_test.cc
index 2471962..92561cd 100644
--- a/src/tint/lang/wgsl/ast_writer/generator_impl_call_test.cc
+++ b/src/tint/lang/wgsl/ast_writer/generator_impl_call_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/lang/wgsl/ast_writer/test_helper.h"
-#include "src/tint/utils/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/ast_writer/generator_impl_cast_test.cc b/src/tint/lang/wgsl/ast_writer/generator_impl_cast_test.cc
index 63e9263..5687133 100644
--- a/src/tint/lang/wgsl/ast_writer/generator_impl_cast_test.cc
+++ b/src/tint/lang/wgsl/ast_writer/generator_impl_cast_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/wgsl/ast_writer/test_helper.h"
-#include "src/tint/utils/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/ast_writer/generator_impl_identifier_test.cc b/src/tint/lang/wgsl/ast_writer/generator_impl_identifier_test.cc
index 725a968..273e92d 100644
--- a/src/tint/lang/wgsl/ast_writer/generator_impl_identifier_test.cc
+++ b/src/tint/lang/wgsl/ast_writer/generator_impl_identifier_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/wgsl/ast_writer/test_helper.h"
-#include "src/tint/utils/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/ast_writer/generator_impl_literal_test.cc b/src/tint/lang/wgsl/ast_writer/generator_impl_literal_test.cc
index 21362d0..c916489 100644
--- a/src/tint/lang/wgsl/ast_writer/generator_impl_literal_test.cc
+++ b/src/tint/lang/wgsl/ast_writer/generator_impl_literal_test.cc
@@ -14,8 +14,8 @@
#include <cstring>
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/wgsl/ast_writer/test_helper.h"
-#include "src/tint/utils/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/ast_writer/generator_impl_member_accessor_test.cc b/src/tint/lang/wgsl/ast_writer/generator_impl_member_accessor_test.cc
index d8b3c1e..7dfbae3 100644
--- a/src/tint/lang/wgsl/ast_writer/generator_impl_member_accessor_test.cc
+++ b/src/tint/lang/wgsl/ast_writer/generator_impl_member_accessor_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/wgsl/ast_writer/test_helper.h"
-#include "src/tint/utils/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/ast_writer/generator_impl_type_test.cc b/src/tint/lang/wgsl/ast_writer/generator_impl_type_test.cc
index 130d64a..ff9ff9d 100644
--- a/src/tint/lang/wgsl/ast_writer/generator_impl_type_test.cc
+++ b/src/tint/lang/wgsl/ast_writer/generator_impl_type_test.cc
@@ -13,12 +13,12 @@
// limitations under the License.
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/wgsl/ast_writer/test_helper.h"
#include "src/tint/type/depth_texture.h"
#include "src/tint/type/multisampled_texture.h"
#include "src/tint/type/sampled_texture.h"
#include "src/tint/type/texture_dimension.h"
-#include "src/tint/utils/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/ast_writer/generator_impl_unary_op_test.cc b/src/tint/lang/wgsl/ast_writer/generator_impl_unary_op_test.cc
index fca0c22..70adfdc 100644
--- a/src/tint/lang/wgsl/ast_writer/generator_impl_unary_op_test.cc
+++ b/src/tint/lang/wgsl/ast_writer/generator_impl_unary_op_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/wgsl/ast_writer/test_helper.h"
-#include "src/tint/utils/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/ast_writer/generator_impl_variable_test.cc b/src/tint/lang/wgsl/ast_writer/generator_impl_variable_test.cc
index 2c6fac6..b8f2e70 100644
--- a/src/tint/lang/wgsl/ast_writer/generator_impl_variable_test.cc
+++ b/src/tint/lang/wgsl/ast_writer/generator_impl_variable_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/wgsl/ast_writer/test_helper.h"
-#include "src/tint/utils/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/lang/wgsl/reader/classify_template_args.cc b/src/tint/lang/wgsl/reader/classify_template_args.cc
index d11eb96..3455ca0 100644
--- a/src/tint/lang/wgsl/reader/classify_template_args.cc
+++ b/src/tint/lang/wgsl/reader/classify_template_args.cc
@@ -16,8 +16,8 @@
#include <vector>
+#include "src/tint/core/vector.h"
#include "src/tint/debug.h"
-#include "src/tint/utils/vector.h"
namespace tint::reader::wgsl {
diff --git a/src/tint/lang/wgsl/reader/classify_template_args_test.cc b/src/tint/lang/wgsl/reader/classify_template_args_test.cc
index 29db811..944fa8f 100644
--- a/src/tint/lang/wgsl/reader/classify_template_args_test.cc
+++ b/src/tint/lang/wgsl/reader/classify_template_args_test.cc
@@ -14,9 +14,9 @@
#include "gmock/gmock.h"
+#include "src/tint/core/transform.h"
#include "src/tint/lang/wgsl/reader/classify_template_args.h"
#include "src/tint/lang/wgsl/reader/lexer.h"
-#include "src/tint/utils/transform.h"
namespace tint::reader::wgsl {
namespace {
diff --git a/src/tint/lang/wgsl/reader/lexer.cc b/src/tint/lang/wgsl/reader/lexer.cc
index 0e49774..721f35c 100644
--- a/src/tint/lang/wgsl/reader/lexer.cc
+++ b/src/tint/lang/wgsl/reader/lexer.cc
@@ -26,9 +26,9 @@
#include <utility>
#include "src/tint/builtin/number.h"
+#include "src/tint/core/parse_num.h"
+#include "src/tint/core/unicode.h"
#include "src/tint/debug.h"
-#include "src/tint/utils/parse_num.h"
-#include "src/tint/utils/unicode.h"
namespace tint::reader::wgsl {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser_impl.cc b/src/tint/lang/wgsl/reader/parser_impl.cc
index 5138e61..45b9f9c 100644
--- a/src/tint/lang/wgsl/reader/parser_impl.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl.cc
@@ -17,6 +17,10 @@
#include <limits>
#include "src/tint/builtin/attribute.h"
+#include "src/tint/core/defer.h"
+#include "src/tint/core/reverse.h"
+#include "src/tint/core/string.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/wgsl/ast/assignment_statement.h"
#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
#include "src/tint/lang/wgsl/ast/break_if_statement.h"
@@ -42,10 +46,6 @@
#include "src/tint/type/multisampled_texture.h"
#include "src/tint/type/sampled_texture.h"
#include "src/tint/type/texture_dimension.h"
-#include "src/tint/utils/defer.h"
-#include "src/tint/utils/reverse.h"
-#include "src/tint/utils/string.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::reader::wgsl {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_error_msg_test.cc b/src/tint/lang/wgsl/reader/parser_impl_error_msg_test.cc
index cddeca8..15eba9b 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_error_msg_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_error_msg_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::reader::wgsl {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_expression_test.cc b/src/tint/lang/wgsl/reader/parser_impl_expression_test.cc
index 567ca3f..1c8d7b4 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_expression_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_expression_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::reader::wgsl {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_function_decl_test.cc b/src/tint/lang/wgsl/reader/parser_impl_function_decl_test.cc
index 2aca45c..03da54e 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_function_decl_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_function_decl_test.cc
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string.h"
#include "src/tint/lang/wgsl/ast/test_helper.h"
#include "src/tint/lang/wgsl/ast/workgroup_attribute.h"
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
-#include "src/tint/utils/string.h"
namespace tint::reader::wgsl {
namespace {
diff --git a/src/tint/lang/wgsl/reader/parser_impl_struct_decl_test.cc b/src/tint/lang/wgsl/reader/parser_impl_struct_decl_test.cc
index bb638b7..9497c1c 100644
--- a/src/tint/lang/wgsl/reader/parser_impl_struct_decl_test.cc
+++ b/src/tint/lang/wgsl/reader/parser_impl_struct_decl_test.cc
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string.h"
#include "src/tint/lang/wgsl/reader/parser_impl_test_helper.h"
-#include "src/tint/utils/string.h"
namespace tint::reader::wgsl {
namespace {
diff --git a/src/tint/lang/wgsl/sem/behavior.h b/src/tint/lang/wgsl/sem/behavior.h
index 3ab4909..9339325 100644
--- a/src/tint/lang/wgsl/sem/behavior.h
+++ b/src/tint/lang/wgsl/sem/behavior.h
@@ -15,7 +15,7 @@
#ifndef SRC_TINT_LANG_WGSL_SEM_BEHAVIOR_H_
#define SRC_TINT_LANG_WGSL_SEM_BEHAVIOR_H_
-#include "src/tint/utils/enum_set.h"
+#include "src/tint/core/enum_set.h"
namespace tint::sem {
diff --git a/src/tint/lang/wgsl/sem/binding_point.h b/src/tint/lang/wgsl/sem/binding_point.h
index 452c411..a6a560f 100644
--- a/src/tint/lang/wgsl/sem/binding_point.h
+++ b/src/tint/lang/wgsl/sem/binding_point.h
@@ -19,9 +19,9 @@
#include <functional>
+#include "src/tint/core/hash.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/reflection.h"
-#include "src/tint/utils/hash.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::sem {
diff --git a/src/tint/lang/wgsl/sem/builtin.cc b/src/tint/lang/wgsl/sem/builtin.cc
index abcaac1..4cbeee2 100644
--- a/src/tint/lang/wgsl/sem/builtin.cc
+++ b/src/tint/lang/wgsl/sem/builtin.cc
@@ -20,7 +20,7 @@
#include <utility>
#include <vector>
-#include "src/tint/utils/transform.h"
+#include "src/tint/core/transform.h"
TINT_INSTANTIATE_TYPEINFO(tint::sem::Builtin);
diff --git a/src/tint/lang/wgsl/sem/builtin.h b/src/tint/lang/wgsl/sem/builtin.h
index 5d818ca..0aeacac 100644
--- a/src/tint/lang/wgsl/sem/builtin.h
+++ b/src/tint/lang/wgsl/sem/builtin.h
@@ -20,9 +20,9 @@
#include "src/tint/builtin/extension.h"
#include "src/tint/builtin/function.h"
+#include "src/tint/core/hash.h"
#include "src/tint/lang/wgsl/sem/call_target.h"
#include "src/tint/lang/wgsl/sem/pipeline_stage_set.h"
-#include "src/tint/utils/hash.h"
namespace tint::sem {
diff --git a/src/tint/lang/wgsl/sem/call.h b/src/tint/lang/wgsl/sem/call.h
index 5796a02..bcb9def 100644
--- a/src/tint/lang/wgsl/sem/call.h
+++ b/src/tint/lang/wgsl/sem/call.h
@@ -17,10 +17,10 @@
#include <vector>
+#include "src/tint/core/vector.h"
#include "src/tint/lang/wgsl/ast/call_expression.h"
#include "src/tint/lang/wgsl/sem/builtin.h"
#include "src/tint/lang/wgsl/sem/value_expression.h"
-#include "src/tint/utils/vector.h"
namespace tint::sem {
diff --git a/src/tint/lang/wgsl/sem/call_target.cc b/src/tint/lang/wgsl/sem/call_target.cc
index 00f1c7c..a5aa5f8 100644
--- a/src/tint/lang/wgsl/sem/call_target.cc
+++ b/src/tint/lang/wgsl/sem/call_target.cc
@@ -16,8 +16,8 @@
#include <utility>
+#include "src/tint/core/hash.h"
#include "src/tint/symbol_table.h"
-#include "src/tint/utils/hash.h"
TINT_INSTANTIATE_TYPEINFO(tint::sem::CallTarget);
diff --git a/src/tint/lang/wgsl/sem/call_target.h b/src/tint/lang/wgsl/sem/call_target.h
index 0d29f32..33acdfb 100644
--- a/src/tint/lang/wgsl/sem/call_target.h
+++ b/src/tint/lang/wgsl/sem/call_target.h
@@ -17,11 +17,11 @@
#include <vector>
+#include "src/tint/core/hash.h"
+#include "src/tint/core/vector.h"
#include "src/tint/lang/wgsl/sem/node.h"
#include "src/tint/lang/wgsl/sem/variable.h"
#include "src/tint/type/sampler.h"
-#include "src/tint/utils/hash.h"
-#include "src/tint/utils/vector.h"
namespace tint::sem {
diff --git a/src/tint/lang/wgsl/sem/function.cc b/src/tint/lang/wgsl/sem/function.cc
index a4bf14e..8b9fa84 100644
--- a/src/tint/lang/wgsl/sem/function.cc
+++ b/src/tint/lang/wgsl/sem/function.cc
@@ -14,6 +14,7 @@
#include "src/tint/lang/wgsl/sem/function.h"
+#include "src/tint/core/transform.h"
#include "src/tint/lang/wgsl/ast/function.h"
#include "src/tint/lang/wgsl/ast/identifier.h"
#include "src/tint/lang/wgsl/ast/must_use_attribute.h"
@@ -23,7 +24,6 @@
#include "src/tint/type/multisampled_texture.h"
#include "src/tint/type/sampled_texture.h"
#include "src/tint/type/storage_texture.h"
-#include "src/tint/utils/transform.h"
TINT_INSTANTIATE_TYPEINFO(tint::sem::Function);
diff --git a/src/tint/lang/wgsl/sem/function.h b/src/tint/lang/wgsl/sem/function.h
index 9d29ae7..8f27746 100644
--- a/src/tint/lang/wgsl/sem/function.h
+++ b/src/tint/lang/wgsl/sem/function.h
@@ -20,11 +20,11 @@
#include <utility>
#include <vector>
+#include "src/tint/core/unique_vector.h"
+#include "src/tint/core/vector.h"
#include "src/tint/lang/wgsl/ast/diagnostic_control.h"
#include "src/tint/lang/wgsl/ast/variable.h"
#include "src/tint/lang/wgsl/sem/call.h"
-#include "src/tint/utils/unique_vector.h"
-#include "src/tint/utils/vector.h"
// Forward declarations
namespace tint::ast {
diff --git a/src/tint/lang/wgsl/sem/info.h b/src/tint/lang/wgsl/sem/info.h
index a5acc92..1dbf14c 100644
--- a/src/tint/lang/wgsl/sem/info.h
+++ b/src/tint/lang/wgsl/sem/info.h
@@ -20,12 +20,12 @@
#include <unordered_map>
#include <vector>
+#include "src/tint/core/unique_vector.h"
#include "src/tint/debug.h"
#include "src/tint/lang/wgsl/ast/diagnostic_control.h"
#include "src/tint/lang/wgsl/ast/node.h"
#include "src/tint/lang/wgsl/sem/node.h"
#include "src/tint/lang/wgsl/sem/type_mappings.h"
-#include "src/tint/utils/unique_vector.h"
// Forward declarations
namespace tint::sem {
diff --git a/src/tint/lang/wgsl/sem/member_accessor_expression.h b/src/tint/lang/wgsl/sem/member_accessor_expression.h
index 58ba2d2..91f6c69 100644
--- a/src/tint/lang/wgsl/sem/member_accessor_expression.h
+++ b/src/tint/lang/wgsl/sem/member_accessor_expression.h
@@ -15,8 +15,8 @@
#ifndef SRC_TINT_LANG_WGSL_SEM_MEMBER_ACCESSOR_EXPRESSION_H_
#define SRC_TINT_LANG_WGSL_SEM_MEMBER_ACCESSOR_EXPRESSION_H_
+#include "src/tint/core/vector.h"
#include "src/tint/lang/wgsl/sem/accessor_expression.h"
-#include "src/tint/utils/vector.h"
// Forward declarations
namespace tint::ast {
diff --git a/src/tint/lang/wgsl/sem/module.h b/src/tint/lang/wgsl/sem/module.h
index e8498f3..29c1bf3 100644
--- a/src/tint/lang/wgsl/sem/module.h
+++ b/src/tint/lang/wgsl/sem/module.h
@@ -16,9 +16,9 @@
#define SRC_TINT_LANG_WGSL_SEM_MODULE_H_
#include "src/tint/builtin/extension.h"
+#include "src/tint/core/vector.h"
#include "src/tint/lang/wgsl/ast/diagnostic_control.h"
#include "src/tint/lang/wgsl/sem/node.h"
-#include "src/tint/utils/vector.h"
// Forward declarations
namespace tint::ast {
diff --git a/src/tint/lang/wgsl/sem/node.h b/src/tint/lang/wgsl/sem/node.h
index e354e5c..78102e0 100644
--- a/src/tint/lang/wgsl/sem/node.h
+++ b/src/tint/lang/wgsl/sem/node.h
@@ -15,7 +15,7 @@
#ifndef SRC_TINT_LANG_WGSL_SEM_NODE_H_
#define SRC_TINT_LANG_WGSL_SEM_NODE_H_
-#include "src/tint/utils/castable.h"
+#include "src/tint/core/castable.h"
namespace tint::sem {
diff --git a/src/tint/lang/wgsl/sem/pipeline_stage_set.h b/src/tint/lang/wgsl/sem/pipeline_stage_set.h
index ebefe1b..01bc2b8 100644
--- a/src/tint/lang/wgsl/sem/pipeline_stage_set.h
+++ b/src/tint/lang/wgsl/sem/pipeline_stage_set.h
@@ -15,8 +15,8 @@
#ifndef SRC_TINT_LANG_WGSL_SEM_PIPELINE_STAGE_SET_H_
#define SRC_TINT_LANG_WGSL_SEM_PIPELINE_STAGE_SET_H_
+#include "src/tint/core/enum_set.h"
#include "src/tint/lang/wgsl/ast/pipeline_stage.h"
-#include "src/tint/utils/enum_set.h"
namespace tint::sem {
diff --git a/src/tint/lang/wgsl/sem/sampler_texture_pair.h b/src/tint/lang/wgsl/sem/sampler_texture_pair.h
index 3455801..11f95f8 100644
--- a/src/tint/lang/wgsl/sem/sampler_texture_pair.h
+++ b/src/tint/lang/wgsl/sem/sampler_texture_pair.h
@@ -18,8 +18,8 @@
#include <cstdint>
#include <functional>
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/wgsl/sem/binding_point.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::sem {
diff --git a/src/tint/lang/wgsl/sem/statement.h b/src/tint/lang/wgsl/sem/statement.h
index 495516a..ff8266a 100644
--- a/src/tint/lang/wgsl/sem/statement.h
+++ b/src/tint/lang/wgsl/sem/statement.h
@@ -15,11 +15,11 @@
#ifndef SRC_TINT_LANG_WGSL_SEM_STATEMENT_H_
#define SRC_TINT_LANG_WGSL_SEM_STATEMENT_H_
+#include "src/tint/core/hashmap.h"
#include "src/tint/lang/wgsl/ast/diagnostic_control.h"
#include "src/tint/lang/wgsl/sem/behavior.h"
#include "src/tint/lang/wgsl/sem/node.h"
#include "src/tint/symbol.h"
-#include "src/tint/utils/hashmap.h"
// Forward declarations
namespace tint::ast {
diff --git a/src/tint/lang/wgsl/sem/struct.h b/src/tint/lang/wgsl/sem/struct.h
index 4e750b8..0bf5330 100644
--- a/src/tint/lang/wgsl/sem/struct.h
+++ b/src/tint/lang/wgsl/sem/struct.h
@@ -18,11 +18,11 @@
#include <optional>
#include "src/tint/builtin/address_space.h"
+#include "src/tint/core/vector.h"
#include "src/tint/lang/wgsl/ast/struct.h"
#include "src/tint/symbol.h"
#include "src/tint/type/struct.h"
#include "src/tint/type/type.h"
-#include "src/tint/utils/vector.h"
// Forward declarations
namespace tint::ast {
diff --git a/src/tint/lang/wgsl/sem/value_constructor.h b/src/tint/lang/wgsl/sem/value_constructor.h
index 6a5f86f..96485fd 100644
--- a/src/tint/lang/wgsl/sem/value_constructor.h
+++ b/src/tint/lang/wgsl/sem/value_constructor.h
@@ -15,8 +15,8 @@
#ifndef SRC_TINT_LANG_WGSL_SEM_VALUE_CONSTRUCTOR_H_
#define SRC_TINT_LANG_WGSL_SEM_VALUE_CONSTRUCTOR_H_
+#include "src/tint/core/vector.h"
#include "src/tint/lang/wgsl/sem/call_target.h"
-#include "src/tint/utils/vector.h"
namespace tint::sem {
diff --git a/src/tint/lang/wgsl/sem/variable.h b/src/tint/lang/wgsl/sem/variable.h
index 2764a83..91536ab 100644
--- a/src/tint/lang/wgsl/sem/variable.h
+++ b/src/tint/lang/wgsl/sem/variable.h
@@ -23,12 +23,12 @@
#include "src/tint/builtin/access.h"
#include "src/tint/builtin/address_space.h"
+#include "src/tint/core/unique_vector.h"
#include "src/tint/lang/wgsl/ast/parameter.h"
#include "src/tint/lang/wgsl/sem/binding_point.h"
#include "src/tint/lang/wgsl/sem/parameter_usage.h"
#include "src/tint/lang/wgsl/sem/value_expression.h"
#include "src/tint/type/type.h"
-#include "src/tint/utils/unique_vector.h"
// Forward declarations
namespace tint::ast {
diff --git a/src/tint/lang/wgsl/syntax_tree_writer/generator_impl.cc b/src/tint/lang/wgsl/syntax_tree_writer/generator_impl.cc
index 784749e..6c0a364 100644
--- a/src/tint/lang/wgsl/syntax_tree_writer/generator_impl.cc
+++ b/src/tint/lang/wgsl/syntax_tree_writer/generator_impl.cc
@@ -16,6 +16,8 @@
#include <algorithm>
+#include "src/tint/core/math.h"
+#include "src/tint/core/scoped_assignment.h"
#include "src/tint/lang/wgsl/ast/alias.h"
#include "src/tint/lang/wgsl/ast/bool_literal_expression.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
@@ -35,8 +37,6 @@
#include "src/tint/lang/wgsl/sem/struct.h"
#include "src/tint/lang/wgsl/sem/switch_statement.h"
#include "src/tint/switch.h"
-#include "src/tint/utils/math.h"
-#include "src/tint/utils/scoped_assignment.h"
#include "src/tint/writer/float_to_string.h"
namespace tint::writer::syntax_tree {
diff --git a/src/tint/lang/wgsl/syntax_tree_writer/generator_impl.h b/src/tint/lang/wgsl/syntax_tree_writer/generator_impl.h
index f25b613..8fa4558 100644
--- a/src/tint/lang/wgsl/syntax_tree_writer/generator_impl.h
+++ b/src/tint/lang/wgsl/syntax_tree_writer/generator_impl.h
@@ -17,6 +17,7 @@
#include <string>
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/wgsl/ast/assignment_statement.h"
#include "src/tint/lang/wgsl/ast/binary_expression.h"
#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
@@ -35,7 +36,6 @@
#include "src/tint/lang/wgsl/ast/unary_op_expression.h"
#include "src/tint/lang/wgsl/sem/struct.h"
#include "src/tint/program.h"
-#include "src/tint/utils/string_stream.h"
#include "src/tint/writer/ast_text_generator.h"
namespace tint::writer::syntax_tree {
diff --git a/src/tint/program_builder.cc b/src/tint/program_builder.cc
index b68a2fd..ccbc3ef 100644
--- a/src/tint/program_builder.cc
+++ b/src/tint/program_builder.cc
@@ -14,6 +14,7 @@
#include "src/tint/program_builder.h"
+#include "src/tint/core/compiler_macros.h"
#include "src/tint/debug.h"
#include "src/tint/lang/wgsl/ast/assignment_statement.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
@@ -22,7 +23,6 @@
#include "src/tint/lang/wgsl/sem/value_expression.h"
#include "src/tint/lang/wgsl/sem/variable.h"
#include "src/tint/switch.h"
-#include "src/tint/utils/compiler_macros.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/program_builder.h b/src/tint/program_builder.h
index 16964a7..c8244c9 100644
--- a/src/tint/program_builder.h
+++ b/src/tint/program_builder.h
@@ -27,6 +27,7 @@
#include "src/tint/builtin/interpolation_type.h"
#include "src/tint/builtin/number.h"
#include "src/tint/constant/manager.h"
+#include "src/tint/core/string.h"
#include "src/tint/lang/wgsl/ast/alias.h"
#include "src/tint/lang/wgsl/ast/assignment_statement.h"
#include "src/tint/lang/wgsl/ast/binary_expression.h"
@@ -103,7 +104,6 @@
#include "src/tint/type/u32.h"
#include "src/tint/type/vector.h"
#include "src/tint/type/void.h"
-#include "src/tint/utils/string.h"
#ifdef CURRENTLY_IN_TINT_PUBLIC_HEADER
#error "internal tint header being #included from tint.h"
diff --git a/src/tint/program_id.h b/src/tint/program_id.h
index 35ab476..cc72254 100644
--- a/src/tint/program_id.h
+++ b/src/tint/program_id.h
@@ -18,8 +18,8 @@
#include <stdint.h>
#include <utility>
+#include "src/tint/core/string_stream.h"
#include "src/tint/debug.h"
-#include "src/tint/utils/string_stream.h"
namespace tint {
diff --git a/src/tint/reflection.h b/src/tint/reflection.h
index e965200..e8f29eb 100644
--- a/src/tint/reflection.h
+++ b/src/tint/reflection.h
@@ -17,8 +17,8 @@
#include <type_traits>
-#include "src/tint/utils/concat.h"
-#include "src/tint/utils/foreach_macro.h"
+#include "src/tint/core/concat.h"
+#include "src/tint/core/foreach_macro.h"
namespace tint {
diff --git a/src/tint/resolver/alias_analysis_test.cc b/src/tint/resolver/alias_analysis_test.cc
index 1145304..b1223e2 100644
--- a/src/tint/resolver/alias_analysis_test.cc
+++ b/src/tint/resolver/alias_analysis_test.cc
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string_stream.h"
#include "src/tint/resolver/resolver.h"
#include "src/tint/resolver/resolver_test_helper.h"
-#include "src/tint/utils/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/resolver/attribute_validation_test.cc b/src/tint/resolver/attribute_validation_test.cc
index 576b55c..e2d652e 100644
--- a/src/tint/resolver/attribute_validation_test.cc
+++ b/src/tint/resolver/attribute_validation_test.cc
@@ -13,12 +13,12 @@
// limitations under the License.
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/wgsl/ast/disable_validation_attribute.h"
#include "src/tint/lang/wgsl/ast/transform/add_block_attribute.h"
#include "src/tint/resolver/resolver.h"
#include "src/tint/resolver/resolver_test_helper.h"
#include "src/tint/type/texture_dimension.h"
-#include "src/tint/utils/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/resolver/builtin_test.cc b/src/tint/resolver/builtin_test.cc
index 7a28ab7..66f08f7 100644
--- a/src/tint/resolver/builtin_test.cc
+++ b/src/tint/resolver/builtin_test.cc
@@ -15,6 +15,8 @@
#include "src/tint/resolver/resolver.h"
#include "gmock/gmock.h"
+#include "src/tint/core/string.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/wgsl/ast/assignment_statement.h"
#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
#include "src/tint/lang/wgsl/ast/break_statement.h"
@@ -37,8 +39,6 @@
#include "src/tint/type/sampled_texture.h"
#include "src/tint/type/test_helper.h"
#include "src/tint/type/texture_dimension.h"
-#include "src/tint/utils/string.h"
-#include "src/tint/utils/string_stream.h"
using ::testing::ElementsAre;
using ::testing::HasSubstr;
diff --git a/src/tint/resolver/builtin_validation_test.cc b/src/tint/resolver/builtin_validation_test.cc
index dd8eac4..43f2b9c 100644
--- a/src/tint/resolver/builtin_validation_test.cc
+++ b/src/tint/resolver/builtin_validation_test.cc
@@ -14,10 +14,10 @@
#include <unordered_set>
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/wgsl/ast/builtin_texture_helper_test.h"
#include "src/tint/lang/wgsl/sem/value_constructor.h"
#include "src/tint/resolver/resolver_test_helper.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::resolver {
namespace {
diff --git a/src/tint/resolver/builtins_validation_test.cc b/src/tint/resolver/builtins_validation_test.cc
index 8b96025..9e71f7d 100644
--- a/src/tint/resolver/builtins_validation_test.cc
+++ b/src/tint/resolver/builtins_validation_test.cc
@@ -13,9 +13,9 @@
// limitations under the License.
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/resolver/resolver_test_helper.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::resolver {
namespace {
diff --git a/src/tint/resolver/const_eval.cc b/src/tint/resolver/const_eval.cc
index 7073617..e639674 100644
--- a/src/tint/resolver/const_eval.cc
+++ b/src/tint/resolver/const_eval.cc
@@ -27,6 +27,11 @@
#include "src/tint/constant/scalar.h"
#include "src/tint/constant/splat.h"
#include "src/tint/constant/value.h"
+#include "src/tint/core/bitcast.h"
+#include "src/tint/core/compiler_macros.h"
+#include "src/tint/core/map.h"
+#include "src/tint/core/string_stream.h"
+#include "src/tint/core/transform.h"
#include "src/tint/lang/wgsl/sem/member_accessor_expression.h"
#include "src/tint/lang/wgsl/sem/value_constructor.h"
#include "src/tint/program_builder.h"
@@ -42,11 +47,6 @@
#include "src/tint/type/struct.h"
#include "src/tint/type/u32.h"
#include "src/tint/type/vector.h"
-#include "src/tint/utils/bitcast.h"
-#include "src/tint/utils/compiler_macros.h"
-#include "src/tint/utils/map.h"
-#include "src/tint/utils/string_stream.h"
-#include "src/tint/utils/transform.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/resolver/const_eval.h b/src/tint/resolver/const_eval.h
index 0253d30..123078c 100644
--- a/src/tint/resolver/const_eval.h
+++ b/src/tint/resolver/const_eval.h
@@ -19,9 +19,9 @@
#include <string>
#include "src/tint/builtin/number.h"
+#include "src/tint/core/result.h"
+#include "src/tint/core/vector.h"
#include "src/tint/type/type.h"
-#include "src/tint/utils/result.h"
-#include "src/tint/utils/vector.h"
// Forward declarations
namespace tint {
diff --git a/src/tint/resolver/const_eval_binary_op_test.cc b/src/tint/resolver/const_eval_binary_op_test.cc
index d921233..a5e22f0 100644
--- a/src/tint/resolver/const_eval_binary_op_test.cc
+++ b/src/tint/resolver/const_eval_binary_op_test.cc
@@ -14,8 +14,8 @@
#include "src/tint/resolver/const_eval_test.h"
+#include "src/tint/core/result.h"
#include "src/tint/lang/wgsl/reader/parser.h"
-#include "src/tint/utils/result.h"
using namespace tint::builtin::fluent_types; // NOLINT
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/resolver/const_eval_builtin_test.cc b/src/tint/resolver/const_eval_builtin_test.cc
index a172ca3..10f98d7 100644
--- a/src/tint/resolver/const_eval_builtin_test.cc
+++ b/src/tint/resolver/const_eval_builtin_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/resolver/const_eval_test.h"
-#include "src/tint/utils/result.h"
+#include "src/tint/core/result.h"
using namespace tint::number_suffixes; // NOLINT
using ::testing::HasSubstr;
diff --git a/src/tint/resolver/const_eval_test.h b/src/tint/resolver/const_eval_test.h
index 8cbea04..da05150 100644
--- a/src/tint/resolver/const_eval_test.h
+++ b/src/tint/resolver/const_eval_test.h
@@ -22,10 +22,10 @@
#include "gmock/gmock.h"
#include "gtest/gtest.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/resolver/resolver_test_helper.h"
#include "src/tint/switch.h"
#include "src/tint/type/test_helper.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::resolver {
diff --git a/src/tint/resolver/dependency_graph.cc b/src/tint/resolver/dependency_graph.cc
index 6f6d503..c255f3b 100644
--- a/src/tint/resolver/dependency_graph.cc
+++ b/src/tint/resolver/dependency_graph.cc
@@ -21,6 +21,14 @@
#include "src/tint/builtin/builtin.h"
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/core/block_allocator.h"
+#include "src/tint/core/compiler_macros.h"
+#include "src/tint/core/defer.h"
+#include "src/tint/core/map.h"
+#include "src/tint/core/scoped_assignment.h"
+#include "src/tint/core/string.h"
+#include "src/tint/core/string_stream.h"
+#include "src/tint/core/unique_vector.h"
#include "src/tint/lang/wgsl/ast/alias.h"
#include "src/tint/lang/wgsl/ast/assignment_statement.h"
#include "src/tint/lang/wgsl/ast/block_statement.h"
@@ -63,14 +71,6 @@
#include "src/tint/lang/wgsl/sem/builtin.h"
#include "src/tint/scope_stack.h"
#include "src/tint/switch.h"
-#include "src/tint/utils/block_allocator.h"
-#include "src/tint/utils/compiler_macros.h"
-#include "src/tint/utils/defer.h"
-#include "src/tint/utils/map.h"
-#include "src/tint/utils/scoped_assignment.h"
-#include "src/tint/utils/string.h"
-#include "src/tint/utils/string_stream.h"
-#include "src/tint/utils/unique_vector.h"
#define TINT_DUMP_DEPENDENCY_GRAPH 0
diff --git a/src/tint/resolver/dependency_graph.h b/src/tint/resolver/dependency_graph.h
index 8c247e2..9d639a6 100644
--- a/src/tint/resolver/dependency_graph.h
+++ b/src/tint/resolver/dependency_graph.h
@@ -25,9 +25,9 @@
#include "src/tint/builtin/interpolation_sampling.h"
#include "src/tint/builtin/interpolation_type.h"
#include "src/tint/builtin/texel_format.h"
+#include "src/tint/core/hashmap.h"
#include "src/tint/diagnostic/diagnostic.h"
#include "src/tint/lang/wgsl/ast/module.h"
-#include "src/tint/utils/hashmap.h"
namespace tint::resolver {
diff --git a/src/tint/resolver/dependency_graph_test.cc b/src/tint/resolver/dependency_graph_test.cc
index 88bdc13..e6ca575 100644
--- a/src/tint/resolver/dependency_graph_test.cc
+++ b/src/tint/resolver/dependency_graph_test.cc
@@ -18,10 +18,10 @@
#include "gmock/gmock.h"
#include "src/tint/builtin/address_space.h"
+#include "src/tint/core/transform.h"
#include "src/tint/resolver/dependency_graph.h"
#include "src/tint/resolver/resolver_test_helper.h"
#include "src/tint/type/texture_dimension.h"
-#include "src/tint/utils/transform.h"
namespace tint::resolver {
namespace {
diff --git a/src/tint/resolver/function_validation_test.cc b/src/tint/resolver/function_validation_test.cc
index 02dfd92..05b113a 100644
--- a/src/tint/resolver/function_validation_test.cc
+++ b/src/tint/resolver/function_validation_test.cc
@@ -13,12 +13,12 @@
// limitations under the License.
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/wgsl/ast/discard_statement.h"
#include "src/tint/lang/wgsl/ast/return_statement.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "src/tint/resolver/resolver.h"
#include "src/tint/resolver/resolver_test_helper.h"
-#include "src/tint/utils/string_stream.h"
#include "gmock/gmock.h"
diff --git a/src/tint/resolver/intrinsic_table.cc b/src/tint/resolver/intrinsic_table.cc
index 5a362f0..9d91d09 100644
--- a/src/tint/resolver/intrinsic_table.cc
+++ b/src/tint/resolver/intrinsic_table.cc
@@ -18,6 +18,11 @@
#include <limits>
#include <utility>
+#include "src/tint/core/hash.h"
+#include "src/tint/core/hashmap.h"
+#include "src/tint/core/math.h"
+#include "src/tint/core/scoped_assignment.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/wgsl/ast/binary_expression.h"
#include "src/tint/lang/wgsl/sem/evaluation_stage.h"
#include "src/tint/lang/wgsl/sem/pipeline_stage_set.h"
@@ -37,11 +42,6 @@
#include "src/tint/type/sampled_texture.h"
#include "src/tint/type/storage_texture.h"
#include "src/tint/type/texture_dimension.h"
-#include "src/tint/utils/hash.h"
-#include "src/tint/utils/hashmap.h"
-#include "src/tint/utils/math.h"
-#include "src/tint/utils/scoped_assignment.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::resolver {
namespace {
diff --git a/src/tint/resolver/intrinsic_table.h b/src/tint/resolver/intrinsic_table.h
index 497b860..7f28a45 100644
--- a/src/tint/resolver/intrinsic_table.h
+++ b/src/tint/resolver/intrinsic_table.h
@@ -18,12 +18,12 @@
#include <memory>
#include <string>
+#include "src/tint/core/vector.h"
#include "src/tint/lang/wgsl/ast/binary_expression.h"
#include "src/tint/lang/wgsl/ast/unary_op.h"
#include "src/tint/lang/wgsl/sem/builtin.h"
#include "src/tint/resolver/const_eval.h"
#include "src/tint/resolver/ctor_conv_intrinsic.h"
-#include "src/tint/utils/vector.h"
// Forward declarations
namespace tint {
diff --git a/src/tint/resolver/resolver.cc b/src/tint/resolver/resolver.cc
index a940c39..ad5cddf 100644
--- a/src/tint/resolver/resolver.cc
+++ b/src/tint/resolver/resolver.cc
@@ -21,6 +21,15 @@
#include <utility>
#include "src/tint/builtin/builtin.h"
+#include "src/tint/core/compiler_macros.h"
+#include "src/tint/core/defer.h"
+#include "src/tint/core/math.h"
+#include "src/tint/core/reverse.h"
+#include "src/tint/core/scoped_assignment.h"
+#include "src/tint/core/string.h"
+#include "src/tint/core/string_stream.h"
+#include "src/tint/core/transform.h"
+#include "src/tint/core/vector.h"
#include "src/tint/lang/wgsl/ast/alias.h"
#include "src/tint/lang/wgsl/ast/assignment_statement.h"
#include "src/tint/lang/wgsl/ast/attribute.h"
@@ -79,15 +88,6 @@
#include "src/tint/type/sampled_texture.h"
#include "src/tint/type/sampler.h"
#include "src/tint/type/storage_texture.h"
-#include "src/tint/utils/compiler_macros.h"
-#include "src/tint/utils/defer.h"
-#include "src/tint/utils/math.h"
-#include "src/tint/utils/reverse.h"
-#include "src/tint/utils/scoped_assignment.h"
-#include "src/tint/utils/string.h"
-#include "src/tint/utils/string_stream.h"
-#include "src/tint/utils/transform.h"
-#include "src/tint/utils/vector.h"
TINT_INSTANTIATE_TYPEINFO(tint::sem::BuiltinEnumExpression<tint::builtin::Access>);
TINT_INSTANTIATE_TYPEINFO(tint::sem::BuiltinEnumExpression<tint::builtin::AddressSpace>);
diff --git a/src/tint/resolver/resolver.h b/src/tint/resolver/resolver.h
index a7dba3b..f3596ea 100644
--- a/src/tint/resolver/resolver.h
+++ b/src/tint/resolver/resolver.h
@@ -24,6 +24,8 @@
#include <vector>
#include "src/tint/constant/value.h"
+#include "src/tint/core/bitset.h"
+#include "src/tint/core/unique_vector.h"
#include "src/tint/lang/wgsl/sem/binding_point.h"
#include "src/tint/lang/wgsl/sem/block_statement.h"
#include "src/tint/lang/wgsl/sem/function.h"
@@ -34,8 +36,6 @@
#include "src/tint/resolver/intrinsic_table.h"
#include "src/tint/resolver/sem_helper.h"
#include "src/tint/resolver/validator.h"
-#include "src/tint/utils/bitset.h"
-#include "src/tint/utils/unique_vector.h"
// Forward declarations
namespace tint::ast {
diff --git a/src/tint/resolver/resolver_test.cc b/src/tint/resolver/resolver_test.cc
index 904c618..a4efd11 100644
--- a/src/tint/resolver/resolver_test.cc
+++ b/src/tint/resolver/resolver_test.cc
@@ -19,6 +19,7 @@
#include "gmock/gmock.h"
#include "gtest/gtest-spi.h"
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/wgsl/ast/assignment_statement.h"
#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
#include "src/tint/lang/wgsl/ast/break_statement.h"
@@ -46,7 +47,6 @@
#include "src/tint/type/reference.h"
#include "src/tint/type/sampled_texture.h"
#include "src/tint/type/texture_dimension.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::resolver {
namespace {
diff --git a/src/tint/resolver/resolver_test_helper.h b/src/tint/resolver/resolver_test_helper.h
index 19df5a6..4d6861e 100644
--- a/src/tint/resolver/resolver_test_helper.h
+++ b/src/tint/resolver/resolver_test_helper.h
@@ -24,6 +24,8 @@
#include <variant>
#include "gtest/gtest.h"
+#include "src/tint/core/traits.h"
+#include "src/tint/core/vector.h"
#include "src/tint/lang/wgsl/sem/statement.h"
#include "src/tint/lang/wgsl/sem/value_expression.h"
#include "src/tint/lang/wgsl/sem/variable.h"
@@ -31,8 +33,6 @@
#include "src/tint/resolver/resolver.h"
#include "src/tint/type/abstract_float.h"
#include "src/tint/type/abstract_int.h"
-#include "src/tint/utils/traits.h"
-#include "src/tint/utils/vector.h"
namespace tint::resolver {
diff --git a/src/tint/resolver/sem_helper.h b/src/tint/resolver/sem_helper.h
index 13cf74b..595dafd 100644
--- a/src/tint/resolver/sem_helper.h
+++ b/src/tint/resolver/sem_helper.h
@@ -20,13 +20,13 @@
#include "src/tint/builtin/builtin_value.h"
#include "src/tint/builtin/interpolation_sampling.h"
#include "src/tint/builtin/interpolation_type.h"
+#include "src/tint/core/map.h"
#include "src/tint/diagnostic/diagnostic.h"
#include "src/tint/lang/wgsl/sem/builtin_enum_expression.h"
#include "src/tint/lang/wgsl/sem/function_expression.h"
#include "src/tint/lang/wgsl/sem/type_expression.h"
#include "src/tint/program_builder.h"
#include "src/tint/resolver/dependency_graph.h"
-#include "src/tint/utils/map.h"
namespace tint::resolver {
diff --git a/src/tint/resolver/side_effects_test.cc b/src/tint/resolver/side_effects_test.cc
index 7199d00..a131156 100644
--- a/src/tint/resolver/side_effects_test.cc
+++ b/src/tint/resolver/side_effects_test.cc
@@ -18,12 +18,12 @@
#include "src/tint/builtin/address_space.h"
#include "src/tint/builtin/extension.h"
#include "src/tint/builtin/texel_format.h"
+#include "src/tint/core/vector.h"
#include "src/tint/lang/wgsl/sem/index_accessor_expression.h"
#include "src/tint/lang/wgsl/sem/member_accessor_expression.h"
#include "src/tint/lang/wgsl/sem/value_expression.h"
#include "src/tint/resolver/resolver_test_helper.h"
#include "src/tint/type/texture_dimension.h"
-#include "src/tint/utils/vector.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/resolver/uniformity.cc b/src/tint/resolver/uniformity.cc
index 2187c00..8d2ce77 100644
--- a/src/tint/resolver/uniformity.cc
+++ b/src/tint/resolver/uniformity.cc
@@ -20,6 +20,11 @@
#include <vector>
#include "src/tint/builtin/builtin_value.h"
+#include "src/tint/core/block_allocator.h"
+#include "src/tint/core/defer.h"
+#include "src/tint/core/map.h"
+#include "src/tint/core/string_stream.h"
+#include "src/tint/core/unique_vector.h"
#include "src/tint/lang/wgsl/sem/block_statement.h"
#include "src/tint/lang/wgsl/sem/builtin.h"
#include "src/tint/lang/wgsl/sem/for_loop_statement.h"
@@ -38,11 +43,6 @@
#include "src/tint/resolver/dependency_graph.h"
#include "src/tint/scope_stack.h"
#include "src/tint/switch.h"
-#include "src/tint/utils/block_allocator.h"
-#include "src/tint/utils/defer.h"
-#include "src/tint/utils/map.h"
-#include "src/tint/utils/string_stream.h"
-#include "src/tint/utils/unique_vector.h"
// Set to `1` to dump the uniformity graph for each function in graphviz format.
#define TINT_DUMP_UNIFORMITY_GRAPH 0
diff --git a/src/tint/resolver/uniformity_test.cc b/src/tint/resolver/uniformity_test.cc
index c53737d..2e5b7b0 100644
--- a/src/tint/resolver/uniformity_test.cc
+++ b/src/tint/resolver/uniformity_test.cc
@@ -17,10 +17,10 @@
#include <tuple>
#include <utility>
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/wgsl/reader/parser.h"
#include "src/tint/program_builder.h"
#include "src/tint/resolver/uniformity.h"
-#include "src/tint/utils/string_stream.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
diff --git a/src/tint/resolver/validator.cc b/src/tint/resolver/validator.cc
index a7b5329..f0de2df 100644
--- a/src/tint/resolver/validator.cc
+++ b/src/tint/resolver/validator.cc
@@ -18,6 +18,14 @@
#include <limits>
#include <utility>
+#include "src/tint/core/defer.h"
+#include "src/tint/core/map.h"
+#include "src/tint/core/math.h"
+#include "src/tint/core/reverse.h"
+#include "src/tint/core/scoped_assignment.h"
+#include "src/tint/core/string.h"
+#include "src/tint/core/string_stream.h"
+#include "src/tint/core/transform.h"
#include "src/tint/lang/wgsl/ast/alias.h"
#include "src/tint/lang/wgsl/ast/assignment_statement.h"
#include "src/tint/lang/wgsl/ast/bitcast_expression.h"
@@ -66,14 +74,6 @@
#include "src/tint/type/sampler.h"
#include "src/tint/type/storage_texture.h"
#include "src/tint/type/texture_dimension.h"
-#include "src/tint/utils/defer.h"
-#include "src/tint/utils/map.h"
-#include "src/tint/utils/math.h"
-#include "src/tint/utils/reverse.h"
-#include "src/tint/utils/scoped_assignment.h"
-#include "src/tint/utils/string.h"
-#include "src/tint/utils/string_stream.h"
-#include "src/tint/utils/transform.h"
namespace tint::resolver {
namespace {
diff --git a/src/tint/resolver/validator.h b/src/tint/resolver/validator.h
index 3641e50..80425ea 100644
--- a/src/tint/resolver/validator.h
+++ b/src/tint/resolver/validator.h
@@ -19,15 +19,15 @@
#include <string>
#include <utility>
+#include "src/tint/core/hash.h"
+#include "src/tint/core/hashmap.h"
+#include "src/tint/core/vector.h"
#include "src/tint/lang/wgsl/ast/pipeline_stage.h"
#include "src/tint/lang/wgsl/sem/evaluation_stage.h"
#include "src/tint/program_builder.h"
#include "src/tint/resolver/sem_helper.h"
#include "src/tint/scope_stack.h"
#include "src/tint/source.h"
-#include "src/tint/utils/hash.h"
-#include "src/tint/utils/hashmap.h"
-#include "src/tint/utils/vector.h"
// Forward declarations
namespace tint::ast {
diff --git a/src/tint/resolver/value_constructor_validation_test.cc b/src/tint/resolver/value_constructor_validation_test.cc
index e002a8e..4f58f47 100644
--- a/src/tint/resolver/value_constructor_validation_test.cc
+++ b/src/tint/resolver/value_constructor_validation_test.cc
@@ -13,11 +13,11 @@
// limitations under the License.
#include "gmock/gmock.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/wgsl/sem/value_constructor.h"
#include "src/tint/lang/wgsl/sem/value_conversion.h"
#include "src/tint/resolver/resolver_test_helper.h"
#include "src/tint/type/reference.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::resolver {
namespace {
diff --git a/src/tint/scope_stack.h b/src/tint/scope_stack.h
index 4a1af1e..6b43a87 100644
--- a/src/tint/scope_stack.h
+++ b/src/tint/scope_stack.h
@@ -16,9 +16,9 @@
#include <utility>
+#include "src/tint/core/hashmap.h"
+#include "src/tint/core/vector.h"
#include "src/tint/symbol.h"
-#include "src/tint/utils/hashmap.h"
-#include "src/tint/utils/vector.h"
namespace tint {
diff --git a/src/tint/source.cc b/src/tint/source.cc
index 3ed939d..a2114ed 100644
--- a/src/tint/source.cc
+++ b/src/tint/source.cc
@@ -18,7 +18,7 @@
#include <string_view>
#include <utility>
-#include "src/tint/utils/unicode.h"
+#include "src/tint/core/unicode.h"
namespace tint {
namespace {
diff --git a/src/tint/source.h b/src/tint/source.h
index cc13c5f..f138b20 100644
--- a/src/tint/source.h
+++ b/src/tint/source.h
@@ -21,7 +21,7 @@
#include <tuple>
#include <vector>
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint {
diff --git a/src/tint/switch.h b/src/tint/switch.h
index 4073bb8..a774a76 100644
--- a/src/tint/switch.h
+++ b/src/tint/switch.h
@@ -18,9 +18,9 @@
#include <tuple>
#include <utility>
-#include "src/tint/utils/bitcast.h"
-#include "src/tint/utils/castable.h"
-#include "src/tint/utils/defer.h"
+#include "src/tint/core/bitcast.h"
+#include "src/tint/core/castable.h"
+#include "src/tint/core/defer.h"
namespace tint {
diff --git a/src/tint/symbol_table.h b/src/tint/symbol_table.h
index 723b81b..ce5312f 100644
--- a/src/tint/symbol_table.h
+++ b/src/tint/symbol_table.h
@@ -17,9 +17,9 @@
#include <string>
+#include "src/tint/core/bump_allocator.h"
+#include "src/tint/core/hashmap.h"
#include "src/tint/symbol.h"
-#include "utils/bump_allocator.h"
-#include "utils/hashmap.h"
namespace tint {
diff --git a/src/tint/transform/transform.h b/src/tint/transform/transform.h
index d142a96..3eb5c82 100644
--- a/src/tint/transform/transform.h
+++ b/src/tint/transform/transform.h
@@ -19,7 +19,7 @@
#include <unordered_map>
#include <utility>
-#include "src/tint/utils/castable.h"
+#include "src/tint/core/castable.h"
namespace tint::transform {
diff --git a/src/tint/type/abstract_float.cc b/src/tint/type/abstract_float.cc
index c08ad4b..3766d63 100644
--- a/src/tint/type/abstract_float.cc
+++ b/src/tint/type/abstract_float.cc
@@ -14,8 +14,8 @@
#include "src/tint/type/abstract_float.h"
+#include "src/tint/core/hash.h"
#include "src/tint/type/manager.h"
-#include "src/tint/utils/hash.h"
TINT_INSTANTIATE_TYPEINFO(tint::type::AbstractFloat);
diff --git a/src/tint/type/abstract_int.cc b/src/tint/type/abstract_int.cc
index 88750c6..bc1c775 100644
--- a/src/tint/type/abstract_int.cc
+++ b/src/tint/type/abstract_int.cc
@@ -14,8 +14,8 @@
#include "src/tint/type/abstract_int.h"
+#include "src/tint/core/hash.h"
#include "src/tint/type/manager.h"
-#include "src/tint/utils/hash.h"
TINT_INSTANTIATE_TYPEINFO(tint::type::AbstractInt);
diff --git a/src/tint/type/array.cc b/src/tint/type/array.cc
index 47e1ea2..7a613d2 100644
--- a/src/tint/type/array.cc
+++ b/src/tint/type/array.cc
@@ -16,12 +16,12 @@
#include <string>
+#include "src/tint/core/hash.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/debug.h"
#include "src/tint/symbol_table.h"
#include "src/tint/type/manager.h"
#include "src/tint/type/texture_dimension.h"
-#include "src/tint/utils/hash.h"
-#include "src/tint/utils/string_stream.h"
TINT_INSTANTIATE_TYPEINFO(tint::type::Array);
diff --git a/src/tint/type/array.h b/src/tint/type/array.h
index 72a7479..dd2a1f5 100644
--- a/src/tint/type/array.h
+++ b/src/tint/type/array.h
@@ -20,10 +20,10 @@
#include <string>
#include <variant>
+#include "src/tint/core/compiler_macros.h"
+#include "src/tint/core/unique_vector.h"
#include "src/tint/type/array_count.h"
#include "src/tint/type/type.h"
-#include "src/tint/utils/compiler_macros.h"
-#include "src/tint/utils/unique_vector.h"
namespace tint::type {
diff --git a/src/tint/type/atomic.cc b/src/tint/type/atomic.cc
index 0189301..7d83ac0 100644
--- a/src/tint/type/atomic.cc
+++ b/src/tint/type/atomic.cc
@@ -14,12 +14,12 @@
#include "src/tint/type/atomic.h"
+#include "src/tint/core/hash.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/debug.h"
#include "src/tint/diagnostic/diagnostic.h"
#include "src/tint/type/manager.h"
#include "src/tint/type/reference.h"
-#include "src/tint/utils/hash.h"
-#include "src/tint/utils/string_stream.h"
TINT_INSTANTIATE_TYPEINFO(tint::type::Atomic);
diff --git a/src/tint/type/builtin_structs.cc b/src/tint/type/builtin_structs.cc
index 8e54e85..139e71a 100644
--- a/src/tint/type/builtin_structs.cc
+++ b/src/tint/type/builtin_structs.cc
@@ -19,6 +19,7 @@
#include <utility>
#include "src/tint/builtin/builtin.h"
+#include "src/tint/core/string.h"
#include "src/tint/switch.h"
#include "src/tint/symbol_table.h"
#include "src/tint/type/abstract_float.h"
@@ -30,7 +31,6 @@
#include "src/tint/type/manager.h"
#include "src/tint/type/u32.h"
#include "src/tint/type/vector.h"
-#include "src/tint/utils/string.h"
namespace tint::type {
diff --git a/src/tint/type/depth_multisampled_texture.cc b/src/tint/type/depth_multisampled_texture.cc
index 7109920..18d5370 100644
--- a/src/tint/type/depth_multisampled_texture.cc
+++ b/src/tint/type/depth_multisampled_texture.cc
@@ -14,12 +14,12 @@
#include "src/tint/type/depth_multisampled_texture.h"
+#include "src/tint/core/hash.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/debug.h"
#include "src/tint/diagnostic/diagnostic.h"
#include "src/tint/type/manager.h"
#include "src/tint/type/texture_dimension.h"
-#include "src/tint/utils/hash.h"
-#include "src/tint/utils/string_stream.h"
TINT_INSTANTIATE_TYPEINFO(tint::type::DepthMultisampledTexture);
diff --git a/src/tint/type/depth_texture.cc b/src/tint/type/depth_texture.cc
index d4476fb..0f559f2 100644
--- a/src/tint/type/depth_texture.cc
+++ b/src/tint/type/depth_texture.cc
@@ -14,12 +14,12 @@
#include "src/tint/type/depth_texture.h"
+#include "src/tint/core/hash.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/debug.h"
#include "src/tint/diagnostic/diagnostic.h"
#include "src/tint/type/manager.h"
#include "src/tint/type/texture_dimension.h"
-#include "src/tint/utils/hash.h"
-#include "src/tint/utils/string_stream.h"
TINT_INSTANTIATE_TYPEINFO(tint::type::DepthTexture);
diff --git a/src/tint/type/manager.h b/src/tint/type/manager.h
index 76cf959..8c69c4b 100644
--- a/src/tint/type/manager.h
+++ b/src/tint/type/manager.h
@@ -21,14 +21,14 @@
#include "src/tint/builtin/address_space.h"
#include "src/tint/builtin/fluent_types.h"
#include "src/tint/builtin/number.h"
+#include "src/tint/core/hash.h"
+#include "src/tint/core/unique_allocator.h"
#include "src/tint/symbol.h"
#include "src/tint/type/atomic.h"
#include "src/tint/type/sampler.h"
#include "src/tint/type/struct.h"
#include "src/tint/type/type.h"
#include "src/tint/type/unique_node.h"
-#include "src/tint/utils/hash.h"
-#include "src/tint/utils/unique_allocator.h"
// Forward declarations
namespace tint::type {
diff --git a/src/tint/type/matrix.cc b/src/tint/type/matrix.cc
index bce7335..4fbc399 100644
--- a/src/tint/type/matrix.cc
+++ b/src/tint/type/matrix.cc
@@ -14,12 +14,12 @@
#include "src/tint/type/matrix.h"
+#include "src/tint/core/hash.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/debug.h"
#include "src/tint/diagnostic/diagnostic.h"
#include "src/tint/type/manager.h"
#include "src/tint/type/vector.h"
-#include "src/tint/utils/hash.h"
-#include "src/tint/utils/string_stream.h"
TINT_INSTANTIATE_TYPEINFO(tint::type::Matrix);
diff --git a/src/tint/type/multisampled_texture.cc b/src/tint/type/multisampled_texture.cc
index 850b11b..b7c21ebe 100644
--- a/src/tint/type/multisampled_texture.cc
+++ b/src/tint/type/multisampled_texture.cc
@@ -14,12 +14,12 @@
#include "src/tint/type/multisampled_texture.h"
+#include "src/tint/core/hash.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/debug.h"
#include "src/tint/diagnostic/diagnostic.h"
#include "src/tint/type/manager.h"
#include "src/tint/type/texture_dimension.h"
-#include "src/tint/utils/hash.h"
-#include "src/tint/utils/string_stream.h"
TINT_INSTANTIATE_TYPEINFO(tint::type::MultisampledTexture);
diff --git a/src/tint/type/node.h b/src/tint/type/node.h
index 237c3ec..22faa73 100644
--- a/src/tint/type/node.h
+++ b/src/tint/type/node.h
@@ -15,7 +15,7 @@
#ifndef SRC_TINT_TYPE_NODE_H_
#define SRC_TINT_TYPE_NODE_H_
-#include "src/tint/utils/castable.h"
+#include "src/tint/core/castable.h"
namespace tint::type {
diff --git a/src/tint/type/pointer.cc b/src/tint/type/pointer.cc
index 95f4556..f8e8f22 100644
--- a/src/tint/type/pointer.cc
+++ b/src/tint/type/pointer.cc
@@ -14,12 +14,12 @@
#include "src/tint/type/pointer.h"
+#include "src/tint/core/hash.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/debug.h"
#include "src/tint/diagnostic/diagnostic.h"
#include "src/tint/type/manager.h"
#include "src/tint/type/reference.h"
-#include "src/tint/utils/hash.h"
-#include "src/tint/utils/string_stream.h"
TINT_INSTANTIATE_TYPEINFO(tint::type::Pointer);
diff --git a/src/tint/type/reference.cc b/src/tint/type/reference.cc
index a8d26a5..772fa09 100644
--- a/src/tint/type/reference.cc
+++ b/src/tint/type/reference.cc
@@ -14,11 +14,11 @@
#include "src/tint/type/reference.h"
+#include "src/tint/core/hash.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/debug.h"
#include "src/tint/diagnostic/diagnostic.h"
#include "src/tint/type/manager.h"
-#include "src/tint/utils/hash.h"
-#include "src/tint/utils/string_stream.h"
TINT_INSTANTIATE_TYPEINFO(tint::type::Reference);
diff --git a/src/tint/type/sampled_texture.cc b/src/tint/type/sampled_texture.cc
index 2fb29f6..573051d 100644
--- a/src/tint/type/sampled_texture.cc
+++ b/src/tint/type/sampled_texture.cc
@@ -14,12 +14,12 @@
#include "src/tint/type/sampled_texture.h"
+#include "src/tint/core/hash.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/debug.h"
#include "src/tint/diagnostic/diagnostic.h"
#include "src/tint/type/manager.h"
#include "src/tint/type/texture_dimension.h"
-#include "src/tint/utils/hash.h"
-#include "src/tint/utils/string_stream.h"
TINT_INSTANTIATE_TYPEINFO(tint::type::SampledTexture);
diff --git a/src/tint/type/sampler.cc b/src/tint/type/sampler.cc
index 2ad8f0c..6fde539 100644
--- a/src/tint/type/sampler.cc
+++ b/src/tint/type/sampler.cc
@@ -14,8 +14,8 @@
#include "src/tint/type/sampler.h"
+#include "src/tint/core/hash.h"
#include "src/tint/type/manager.h"
-#include "src/tint/utils/hash.h"
TINT_INSTANTIATE_TYPEINFO(tint::type::Sampler);
diff --git a/src/tint/type/sampler_kind.h b/src/tint/type/sampler_kind.h
index b5b01b9..413cffd 100644
--- a/src/tint/type/sampler_kind.h
+++ b/src/tint/type/sampler_kind.h
@@ -15,7 +15,7 @@
#ifndef SRC_TINT_TYPE_SAMPLER_KIND_H_
#define SRC_TINT_TYPE_SAMPLER_KIND_H_
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::type {
diff --git a/src/tint/type/storage_texture.cc b/src/tint/type/storage_texture.cc
index cd41452..968c2d3 100644
--- a/src/tint/type/storage_texture.cc
+++ b/src/tint/type/storage_texture.cc
@@ -14,12 +14,12 @@
#include "src/tint/type/storage_texture.h"
+#include "src/tint/core/hash.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/type/f32.h"
#include "src/tint/type/i32.h"
#include "src/tint/type/manager.h"
#include "src/tint/type/u32.h"
-#include "src/tint/utils/hash.h"
-#include "src/tint/utils/string_stream.h"
TINT_INSTANTIATE_TYPEINFO(tint::type::StorageTexture);
diff --git a/src/tint/type/struct.cc b/src/tint/type/struct.cc
index d8424ae..ebd5279 100644
--- a/src/tint/type/struct.cc
+++ b/src/tint/type/struct.cc
@@ -19,10 +19,10 @@
#include <string>
#include <utility>
+#include "src/tint/core/hash.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/symbol_table.h"
#include "src/tint/type/manager.h"
-#include "src/tint/utils/hash.h"
-#include "src/tint/utils/string_stream.h"
TINT_INSTANTIATE_TYPEINFO(tint::type::Struct);
TINT_INSTANTIATE_TYPEINFO(tint::type::StructMember);
diff --git a/src/tint/type/struct.h b/src/tint/type/struct.h
index a13957a..c854ce5 100644
--- a/src/tint/type/struct.h
+++ b/src/tint/type/struct.h
@@ -24,10 +24,10 @@
#include "src/tint/builtin/address_space.h"
#include "src/tint/builtin/builtin_value.h"
#include "src/tint/builtin/interpolation.h"
+#include "src/tint/core/vector.h"
#include "src/tint/symbol.h"
#include "src/tint/type/node.h"
#include "src/tint/type/type.h"
-#include "src/tint/utils/vector.h"
// Forward declarations
namespace tint::type {
diff --git a/src/tint/type/texture_dimension.h b/src/tint/type/texture_dimension.h
index a315b7e..5b41f54 100644
--- a/src/tint/type/texture_dimension.h
+++ b/src/tint/type/texture_dimension.h
@@ -15,7 +15,7 @@
#ifndef SRC_TINT_TYPE_TEXTURE_DIMENSION_H_
#define SRC_TINT_TYPE_TEXTURE_DIMENSION_H_
-#include "src/tint/utils/string_stream.h"
+#include "src/tint/core/string_stream.h"
namespace tint::type {
diff --git a/src/tint/type/type.h b/src/tint/type/type.h
index d7c0e0a..ef79def 100644
--- a/src/tint/type/type.h
+++ b/src/tint/type/type.h
@@ -18,10 +18,10 @@
#include <functional>
#include <string>
+#include "src/tint/core/enum_set.h"
+#include "src/tint/core/vector.h"
#include "src/tint/type/clone_context.h"
#include "src/tint/type/unique_node.h"
-#include "src/tint/utils/enum_set.h"
-#include "src/tint/utils/vector.h"
// Forward declarations
namespace tint {
diff --git a/src/tint/type/vector.cc b/src/tint/type/vector.cc
index 49f0f1b..9d66a17 100644
--- a/src/tint/type/vector.cc
+++ b/src/tint/type/vector.cc
@@ -14,11 +14,11 @@
#include "src/tint/type/vector.h"
+#include "src/tint/core/hash.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/debug.h"
#include "src/tint/diagnostic/diagnostic.h"
#include "src/tint/type/manager.h"
-#include "src/tint/utils/hash.h"
-#include "src/tint/utils/string_stream.h"
TINT_INSTANTIATE_TYPEINFO(tint::type::Vector);
diff --git a/src/tint/val/hlsl.cc b/src/tint/val/hlsl.cc
index eabbe68..b4711e1 100644
--- a/src/tint/val/hlsl.cc
+++ b/src/tint/val/hlsl.cc
@@ -16,9 +16,9 @@
#include "src/tint/val/val.h"
-#include "src/tint/utils/io/command.h"
-#include "src/tint/utils/io/tmpfile.h"
-#include "src/tint/utils/string.h"
+#include "src/tint/core/io/command.h"
+#include "src/tint/core/io/tmpfile.h"
+#include "src/tint/core/string.h"
#ifdef _WIN32
#include <Windows.h>
diff --git a/src/tint/val/msl.cc b/src/tint/val/msl.cc
index a0a0fc8..416df27 100644
--- a/src/tint/val/msl.cc
+++ b/src/tint/val/msl.cc
@@ -14,10 +14,10 @@
#include "src/tint/val/val.h"
+#include "src/tint/core/io/command.h"
+#include "src/tint/core/io/tmpfile.h"
#include "src/tint/lang/wgsl/ast/module.h"
#include "src/tint/program.h"
-#include "src/tint/utils/io/command.h"
-#include "src/tint/utils/io/tmpfile.h"
namespace tint::val {
diff --git a/src/tint/writer/append_vector.cc b/src/tint/writer/append_vector.cc
index f3e5643..6ed3392 100644
--- a/src/tint/writer/append_vector.cc
+++ b/src/tint/writer/append_vector.cc
@@ -17,12 +17,12 @@
#include <utility>
#include <vector>
+#include "src/tint/core/transform.h"
#include "src/tint/lang/wgsl/sem/call.h"
#include "src/tint/lang/wgsl/sem/value_constructor.h"
#include "src/tint/lang/wgsl/sem/value_conversion.h"
#include "src/tint/lang/wgsl/sem/value_expression.h"
#include "src/tint/switch.h"
-#include "src/tint/utils/transform.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/writer/ast_text_generator.cc b/src/tint/writer/ast_text_generator.cc
index 65bf618..6b666b0 100644
--- a/src/tint/writer/ast_text_generator.cc
+++ b/src/tint/writer/ast_text_generator.cc
@@ -17,7 +17,7 @@
#include <algorithm>
#include <limits>
-#include "src/tint/utils/map.h"
+#include "src/tint/core/map.h"
namespace tint::writer {
diff --git a/src/tint/writer/check_supported_extensions.cc b/src/tint/writer/check_supported_extensions.cc
index 6e7a371..6d44f01 100644
--- a/src/tint/writer/check_supported_extensions.cc
+++ b/src/tint/writer/check_supported_extensions.cc
@@ -16,10 +16,10 @@
#include <string>
+#include "src/tint/core/hashset.h"
+#include "src/tint/core/string.h"
#include "src/tint/diagnostic/diagnostic.h"
#include "src/tint/lang/wgsl/ast/module.h"
-#include "src/tint/utils/hashset.h"
-#include "src/tint/utils/string.h"
namespace tint::writer {
diff --git a/src/tint/writer/check_supported_extensions.h b/src/tint/writer/check_supported_extensions.h
index 8776102..ef4f302 100644
--- a/src/tint/writer/check_supported_extensions.h
+++ b/src/tint/writer/check_supported_extensions.h
@@ -16,7 +16,7 @@
#define SRC_TINT_WRITER_CHECK_SUPPORTED_EXTENSIONS_H_
#include "src/tint/builtin/extension.h"
-#include "src/tint/utils/vector.h"
+#include "src/tint/core/vector.h"
namespace tint::ast {
class Module;
diff --git a/src/tint/writer/float_to_string.cc b/src/tint/writer/float_to_string.cc
index fdf4675..b6369ed 100644
--- a/src/tint/writer/float_to_string.cc
+++ b/src/tint/writer/float_to_string.cc
@@ -20,8 +20,8 @@
#include <iomanip>
#include <limits>
+#include "src/tint/core/string_stream.h"
#include "src/tint/debug.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::writer {
diff --git a/src/tint/writer/float_to_string_test.cc b/src/tint/writer/float_to_string_test.cc
index eb70369..3af0e14 100644
--- a/src/tint/writer/float_to_string_test.cc
+++ b/src/tint/writer/float_to_string_test.cc
@@ -19,7 +19,7 @@
#include <limits>
#include "gtest/gtest.h"
-#include "src/tint/utils/bitcast.h"
+#include "src/tint/core/bitcast.h"
namespace tint::writer {
namespace {
diff --git a/src/tint/writer/ir_text_generator.cc b/src/tint/writer/ir_text_generator.cc
index d467dc7..7d476a9 100644
--- a/src/tint/writer/ir_text_generator.cc
+++ b/src/tint/writer/ir_text_generator.cc
@@ -14,7 +14,7 @@
#include "src/tint/writer/ir_text_generator.h"
-#include "src/tint/utils/map.h"
+#include "src/tint/core/map.h"
namespace tint::writer {
diff --git a/src/tint/writer/spirv/builder.cc b/src/tint/writer/spirv/builder.cc
index b85b6af..6f76c6f 100644
--- a/src/tint/writer/spirv/builder.cc
+++ b/src/tint/writer/spirv/builder.cc
@@ -19,6 +19,10 @@
#include "spirv/unified1/GLSL.std.450.h"
#include "src/tint/constant/value.h"
+#include "src/tint/core/compiler_macros.h"
+#include "src/tint/core/defer.h"
+#include "src/tint/core/map.h"
+#include "src/tint/core/string_stream.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/lang/wgsl/ast/id_attribute.h"
#include "src/tint/lang/wgsl/ast/internal_attribute.h"
@@ -46,10 +50,6 @@
#include "src/tint/type/sampled_texture.h"
#include "src/tint/type/texture_dimension.h"
#include "src/tint/type/vector.h"
-#include "src/tint/utils/compiler_macros.h"
-#include "src/tint/utils/defer.h"
-#include "src/tint/utils/map.h"
-#include "src/tint/utils/string_stream.h"
#include "src/tint/writer/append_vector.h"
#include "src/tint/writer/check_supported_extensions.h"
diff --git a/src/tint/writer/spirv/builder_builtin_test.cc b/src/tint/writer/spirv/builder_builtin_test.cc
index 923ad8d..578a8f9 100644
--- a/src/tint/writer/spirv/builder_builtin_test.cc
+++ b/src/tint/writer/spirv/builder_builtin_test.cc
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/core/string.h"
#include "src/tint/lang/wgsl/ast/call_statement.h"
#include "src/tint/lang/wgsl/ast/stage_attribute.h"
#include "src/tint/type/depth_texture.h"
#include "src/tint/type/texture_dimension.h"
-#include "src/tint/utils/string.h"
#include "src/tint/writer/spirv/spv_dump.h"
#include "src/tint/writer/spirv/test_helper.h"
diff --git a/src/tint/writer/spirv/ir/generator_impl_ir.cc b/src/tint/writer/spirv/ir/generator_impl_ir.cc
index de2623b..721048f 100644
--- a/src/tint/writer/spirv/ir/generator_impl_ir.cc
+++ b/src/tint/writer/spirv/ir/generator_impl_ir.cc
@@ -19,6 +19,7 @@
#include "spirv/unified1/GLSL.std.450.h"
#include "spirv/unified1/spirv.h"
#include "src/tint/constant/scalar.h"
+#include "src/tint/core/scoped_assignment.h"
#include "src/tint/ir/access.h"
#include "src/tint/ir/binary.h"
#include "src/tint/ir/block.h"
@@ -77,7 +78,6 @@
#include "src/tint/type/u32.h"
#include "src/tint/type/vector.h"
#include "src/tint/type/void.h"
-#include "src/tint/utils/scoped_assignment.h"
#include "src/tint/writer/spirv/generator.h"
#include "src/tint/writer/spirv/module.h"
diff --git a/src/tint/writer/spirv/ir/generator_impl_ir.h b/src/tint/writer/spirv/ir/generator_impl_ir.h
index 2a82d7f..0bc7e13 100644
--- a/src/tint/writer/spirv/ir/generator_impl_ir.h
+++ b/src/tint/writer/spirv/ir/generator_impl_ir.h
@@ -21,11 +21,11 @@
#include "src/tint/builtin/builtin_value.h"
#include "src/tint/builtin/texel_format.h"
#include "src/tint/constant/value.h"
+#include "src/tint/core/hashmap.h"
+#include "src/tint/core/vector.h"
#include "src/tint/diagnostic/diagnostic.h"
#include "src/tint/ir/constant.h"
#include "src/tint/symbol.h"
-#include "src/tint/utils/hashmap.h"
-#include "src/tint/utils/vector.h"
#include "src/tint/writer/spirv/binary_writer.h"
#include "src/tint/writer/spirv/function.h"
#include "src/tint/writer/spirv/module.h"
diff --git a/src/tint/writer/spirv/operand.h b/src/tint/writer/spirv/operand.h
index 0601ca0..9df5f1e 100644
--- a/src/tint/writer/spirv/operand.h
+++ b/src/tint/writer/spirv/operand.h
@@ -20,7 +20,7 @@
#include <variant>
#include <vector>
-#include "src/tint/utils/hash.h"
+#include "src/tint/core/hash.h"
namespace tint::writer::spirv {
diff --git a/src/tint/writer/spirv/scalar_constant.h b/src/tint/writer/spirv/scalar_constant.h
index 7d79dab..d397f93 100644
--- a/src/tint/writer/spirv/scalar_constant.h
+++ b/src/tint/writer/spirv/scalar_constant.h
@@ -21,7 +21,7 @@
#include <functional>
#include "src/tint/builtin/number.h"
-#include "src/tint/utils/hash.h"
+#include "src/tint/core/hash.h"
// Forward declarations
namespace tint::sem {
diff --git a/src/tint/writer/text_generator.cc b/src/tint/writer/text_generator.cc
index 1585e79..b61c0fb 100644
--- a/src/tint/writer/text_generator.cc
+++ b/src/tint/writer/text_generator.cc
@@ -17,8 +17,8 @@
#include <algorithm>
#include <limits>
+#include "src/tint/core/map.h"
#include "src/tint/debug.h"
-#include "src/tint/utils/map.h"
namespace tint::writer {
diff --git a/src/tint/writer/text_generator.h b/src/tint/writer/text_generator.h
index 348a31b..25c40c1 100644
--- a/src/tint/writer/text_generator.h
+++ b/src/tint/writer/text_generator.h
@@ -20,9 +20,9 @@
#include <utility>
#include <vector>
+#include "src/tint/core/string_stream.h"
#include "src/tint/diagnostic/diagnostic.h"
#include "src/tint/type/struct.h"
-#include "src/tint/utils/string_stream.h"
namespace tint::writer {
