tint->dawn: Shuffle source tree in preperation of merging repos

docs/    -> docs/tint/
fuzzers/ -> src/tint/fuzzers/
samples/ -> src/tint/cmd/
src/     -> src/tint/
test/    -> test/tint/

BUG=tint:1418,tint:1433

Change-Id: Id2aa79f989aef3245b80ef4aa37a27ff16cd700b
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/80482
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>

BUILD.gn

@@ -16,9 +16,9 @@
 group("default") {
   testonly = true
   deps = [
-    "fuzzers",
+    "src/tint:libtint",
-    "samples:tint",
+    "src/tint/cmd:tint",
-    "src:libtint",
+    "src/tint/fuzzers",
-    "test:tint_unittests",
+    "test/tint:tint_unittests",
   ]
 }

CMakeLists.txt

@@ -389,13 +389,13 @@ function(tint_default_compile_options TARGET)
 endfunction()
 
 add_subdirectory(third_party)
-add_subdirectory(src)
+add_subdirectory(src/tint)
 if (TINT_BUILD_SAMPLES)
-  add_subdirectory(samples)
+  add_subdirectory(src/tint/cmd)
 endif()
 
 if (TINT_BUILD_FUZZERS)
-  add_subdirectory(fuzzers)
+  add_subdirectory(src/tint/fuzzers)
 endif()
 
 add_custom_target(tint-lint

CONTRIBUTING.md

@@ -20,7 +20,7 @@ again.
 All submissions, including submissions by project members, require review. We
 use [Dawn's Gerrit](https://dawn-review.googlesource.com/) for this purpose.
 
-Submissions should follow the [Tint style guide](docs/style_guide.md).
+Submissions should follow the [Tint style guide](docs/tint/style_guide.md).
 
 ## Pushing to Gerrit
 

Doxyfile

@@ -786,11 +786,11 @@ WARN_LOGFILE           =
 # Note: If this tag is empty the current directory is searched.
 
 INPUT                  = CODE_OF_CONDUCT.md \
-                         fuzzers/tint_spirv_tools_fuzzer \
+                         src/tint/fuzzers/tint_spirv_tools_fuzzer \
                          src \
                          tools/src \
-                         fuzzers/tint_spirv_tools_fuzzer \
+                         src/tint/fuzzers/tint_spirv_tools_fuzzer \
-                         fuzzers/tint_ast_fuzzer
+                         src/tint/fuzzers/tint_ast_fuzzer
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

README.md

@@ -103,4 +103,4 @@ https://bugs.chromium.org/p/tint/issues/entry
 Please see the CONTRIBUTING and CODE_OF_CONDUCT files on how to contribute to
 Tint.
 
-Tint has a process for supporting [experimental extensions](docs/experimental_extensions.md).
+Tint has a process for supporting [experimental extensions](docs/tint/experimental_extensions.md).

include/tint/tint.h

@@ -18,51 +18,51 @@
 // TODO(tint:88): When implementing support for an install target, all of these
 //                headers will need to be moved to include/tint/.
 
-#include "src/ast/pipeline_stage.h"
+#include "src/tint/ast/pipeline_stage.h"
-#include "src/demangler.h"
+#include "src/tint/demangler.h"
-#include "src/diagnostic/printer.h"
+#include "src/tint/diagnostic/printer.h"
-#include "src/inspector/inspector.h"
+#include "src/tint/inspector/inspector.h"
-#include "src/reader/reader.h"
+#include "src/tint/reader/reader.h"
-#include "src/sem/type_manager.h"
+#include "src/tint/sem/type_manager.h"
-#include "src/transform/binding_remapper.h"
+#include "src/tint/transform/binding_remapper.h"
-#include "src/transform/first_index_offset.h"
+#include "src/tint/transform/first_index_offset.h"
-#include "src/transform/fold_trivial_single_use_lets.h"
+#include "src/tint/transform/fold_trivial_single_use_lets.h"
-#include "src/transform/manager.h"
+#include "src/tint/transform/manager.h"
-#include "src/transform/multiplanar_external_texture.h"
+#include "src/tint/transform/multiplanar_external_texture.h"
-#include "src/transform/renamer.h"
+#include "src/tint/transform/renamer.h"
-#include "src/transform/robustness.h"
+#include "src/tint/transform/robustness.h"
-#include "src/transform/single_entry_point.h"
+#include "src/tint/transform/single_entry_point.h"
-#include "src/transform/vertex_pulling.h"
+#include "src/tint/transform/vertex_pulling.h"
-#include "src/writer/writer.h"
+#include "src/tint/writer/writer.h"
 
 #if TINT_BUILD_SPV_READER
-#include "src/reader/spirv/parser.h"
+#include "src/tint/reader/spirv/parser.h"
 #endif  // TINT_BUILD_SPV_READER
 
 #if TINT_BUILD_WGSL_READER
-#include "src/reader/wgsl/parser.h"
+#include "src/tint/reader/wgsl/parser.h"
 #endif  // TINT_BUILD_WGSL_READER
 
 #if TINT_BUILD_SPV_WRITER
 #include "spirv-tools/libspirv.hpp"
-#include "src/writer/spirv/generator.h"
+#include "src/tint/writer/spirv/generator.h"
 #endif  // TINT_BUILD_SPV_WRITER
 
 #if TINT_BUILD_WGSL_WRITER
-#include "src/writer/wgsl/generator.h"
+#include "src/tint/writer/wgsl/generator.h"
 #endif  // TINT_BUILD_WGSL_WRITER
 
 #if TINT_BUILD_MSL_WRITER
-#include "src/writer/msl/generator.h"
+#include "src/tint/writer/msl/generator.h"
 #endif  // TINT_BUILD_MSL_WRITER
 
 #if TINT_BUILD_HLSL_WRITER
-#include "src/writer/hlsl/generator.h"
+#include "src/tint/writer/hlsl/generator.h"
 #endif  // TINT_BUILD_HLSL_WRITER
 
 #if TINT_BUILD_GLSL_WRITER
-#include "src/transform/glsl.h"
+#include "src/tint/transform/glsl.h"
-#include "src/writer/glsl/generator.h"
+#include "src/tint/writer/glsl/generator.h"
 #endif  // TINT_BUILD_GLSL_WRITER
 
 #endif  // INCLUDE_TINT_TINT_H_

kokoro/linux/docker.sh

@@ -157,9 +157,9 @@ if [ "$BUILD_SYSTEM" == "cmake" ]; then
         hide_cmds
     fi
 
-    status "Testing test/test-all.sh"
+    status "Testing test/tint/test-all.sh"
     show_cmds
-        ${SRC_DIR}/test/test-all.sh "${BUILD_DIR}/tint" --verbose
+        ${SRC_DIR}/test/tint/test-all.sh "${BUILD_DIR}/tint" --verbose
     hide_cmds
 
     status "Checking _other.cc files also build"

kokoro/windows/build.bat

@@ -139,7 +139,7 @@ call :status "Running tint_unittests"
 tint_unittests.exe || goto :error
 @echo off
 
-call :status "Testing test/test-all.sh"
+call :status "Testing test/tint/test-all.sh"
 @echo on
 cd /d %SRC_DIR% || goto :error
 rem Run tests with DXC and Metal validation
@@ -148,13 +148,13 @@ set PATH=C:\Program Files\Metal Developer Tools\macos\bin;%PATH%
 where metal.exe
 set PATH=%DXC_PATH%;%OLD_PATH%
 where dxc.exe dxil.dll
-call git bash -- ./test/test-all.sh ../tint-build/tint.exe --verbose || goto :error
+call git bash -- ./test/tint/test-all.sh ../tint-build/tint.exe --verbose || goto :error
 @echo on
 set PATH=%OLD_PATH%
 rem Run again to test with FXC validation
 set PATH=%D3DCOMPILER_PATH%;%OLD_PATH%
 where d3dcompiler_47.dll
-call git bash -- ./test/test-all.sh ../tint-build/tint.exe --verbose --format hlsl --fxc || goto :error
+call git bash -- ./test/tint/test-all.sh ../tint-build/tint.exe --verbose --format hlsl --fxc || goto :error
 @echo on
 set PATH=%OLD_PATH%
 @echo off

src/tint/BUILD.gn

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import("//build_overrides/build.gni")
-import("../tint_overrides_with_defaults.gni")
+import("../../tint_overrides_with_defaults.gni")
 
 ###############################################################################
 # Common - Configs, etc. shared across targets

src/tint/CMakeLists.txt

@@ -59,7 +59,7 @@ if (TINT_ENABLE_BREAK_IN_DEBUGGER)
 endif()
 
 set(TINT_LIB_SRCS
-  ../include/tint/tint.h
+  ../../include/tint/tint.h
   ast/access.cc
   ast/access.h
   ast/attribute.cc
@@ -1149,13 +1149,13 @@ if(TINT_BUILD_TESTS)
 
   if (${TINT_BUILD_FUZZERS})
     list(APPEND TINT_TEST_SRCS
-      ../fuzzers/mersenne_twister_engine.cc
+      fuzzers/mersenne_twister_engine.cc
-      ../fuzzers/mersenne_twister_engine.h
+      fuzzers/mersenne_twister_engine.h
-      ../fuzzers/random_generator.cc
+      fuzzers/random_generator.cc
-      ../fuzzers/random_generator.h
+      fuzzers/random_generator.h
-      ../fuzzers/random_generator_engine.cc
+      fuzzers/random_generator_engine.cc
-      ../fuzzers/random_generator_engine.h
+      fuzzers/random_generator_engine.h
-      ../fuzzers/random_generator_test.cc
+      fuzzers/random_generator_test.cc
     )
   endif()
 

src/tint/ast/access.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/access.h"
+#include "src/tint/ast/access.h"
 
 namespace tint {
 namespace ast {

src/tint/ast/access.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_AST_ACCESS_H_
+#ifndef SRC_TINT_AST_ACCESS_H_
-#define SRC_AST_ACCESS_H_
+#define SRC_TINT_AST_ACCESS_H_
 
 #include <ostream>
 #include <string>
@@ -43,4 +43,4 @@ std::ostream& operator<<(std::ostream& out, Access access);
 }  // namespace ast
 }  // namespace tint
 
-#endif  // SRC_AST_ACCESS_H_
+#endif  // SRC_TINT_AST_ACCESS_H_

src/tint/ast/alias.cc

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/alias.h"
+#include "src/tint/ast/alias.h"
 
-#include "src/program_builder.h"
+#include "src/tint/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::ast::Alias);
 

src/tint/ast/alias.h

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_AST_ALIAS_H_
+#ifndef SRC_TINT_AST_ALIAS_H_
-#define SRC_AST_ALIAS_H_
+#define SRC_TINT_AST_ALIAS_H_
 
 #include <string>
 
-#include "src/ast/type_decl.h"
+#include "src/tint/ast/type_decl.h"
 
 namespace tint {
 namespace ast {
@@ -51,4 +51,4 @@ class Alias : public Castable<Alias, TypeDecl> {
 }  // namespace ast
 }  // namespace tint
 
-#endif  // SRC_AST_ALIAS_H_
+#endif  // SRC_TINT_AST_ALIAS_H_

src/tint/ast/alias_test.cc

@@ -12,20 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/alias.h"
+#include "src/tint/ast/alias.h"
-#include "src/ast/access.h"
+#include "src/tint/ast/access.h"
-#include "src/ast/array.h"
+#include "src/tint/ast/array.h"
-#include "src/ast/bool.h"
+#include "src/tint/ast/bool.h"
-#include "src/ast/f32.h"
+#include "src/tint/ast/f32.h"
-#include "src/ast/i32.h"
+#include "src/tint/ast/i32.h"
-#include "src/ast/matrix.h"
+#include "src/tint/ast/matrix.h"
-#include "src/ast/pointer.h"
+#include "src/tint/ast/pointer.h"
-#include "src/ast/sampler.h"
+#include "src/tint/ast/sampler.h"
-#include "src/ast/struct.h"
+#include "src/tint/ast/struct.h"
-#include "src/ast/test_helper.h"
+#include "src/tint/ast/test_helper.h"
-#include "src/ast/texture.h"
+#include "src/tint/ast/texture.h"
-#include "src/ast/u32.h"
+#include "src/tint/ast/u32.h"
-#include "src/ast/vector.h"
+#include "src/tint/ast/vector.h"
 
 namespace tint {
 namespace ast {

src/tint/ast/array.cc

@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/array.h"
+#include "src/tint/ast/array.h"
 
 #include <cmath>
 
-#include "src/program_builder.h"
+#include "src/tint/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::ast::Array);
 

src/tint/ast/array.h

@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_AST_ARRAY_H_
+#ifndef SRC_TINT_AST_ARRAY_H_
-#define SRC_AST_ARRAY_H_
+#define SRC_TINT_AST_ARRAY_H_
 
 #include <string>
 
-#include "src/ast/attribute.h"
+#include "src/tint/ast/attribute.h"
-#include "src/ast/type.h"
+#include "src/tint/ast/type.h"
 
 namespace tint {
 namespace ast {
@@ -72,4 +72,4 @@ class Array : public Castable<Array, Type> {
 }  // namespace ast
 }  // namespace tint
 
-#endif  // SRC_AST_ARRAY_H_
+#endif  // SRC_TINT_AST_ARRAY_H_

src/tint/ast/array_test.cc

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/array.h"
+#include "src/tint/ast/array.h"
 
-#include "src/ast/test_helper.h"
+#include "src/tint/ast/test_helper.h"
 
 namespace tint {
 namespace ast {

src/tint/ast/assignment_statement.cc

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/assignment_statement.h"
+#include "src/tint/ast/assignment_statement.h"
 
-#include "src/program_builder.h"
+#include "src/tint/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::ast::AssignmentStatement);
 

src/tint/ast/assignment_statement.h

@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_AST_ASSIGNMENT_STATEMENT_H_
+#ifndef SRC_TINT_AST_ASSIGNMENT_STATEMENT_H_
-#define SRC_AST_ASSIGNMENT_STATEMENT_H_
+#define SRC_TINT_AST_ASSIGNMENT_STATEMENT_H_
 
-#include "src/ast/expression.h"
+#include "src/tint/ast/expression.h"
-#include "src/ast/statement.h"
+#include "src/tint/ast/statement.h"
 
 namespace tint {
 namespace ast {
@@ -53,4 +53,4 @@ class AssignmentStatement : public Castable<AssignmentStatement, Statement> {
 }  // namespace ast
 }  // namespace tint
 
-#endif  // SRC_AST_ASSIGNMENT_STATEMENT_H_
+#endif  // SRC_TINT_AST_ASSIGNMENT_STATEMENT_H_

src/tint/ast/assignment_statement_test.cc

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/assignment_statement.h"
+#include "src/tint/ast/assignment_statement.h"
 
 #include "gtest/gtest-spi.h"
-#include "src/ast/test_helper.h"
+#include "src/tint/ast/test_helper.h"
 
 namespace tint {
 namespace ast {

src/tint/ast/ast_type.cc

@@ -12,19 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/type.h"
+#include "src/tint/ast/type.h"
 
-#include "src/ast/alias.h"
+#include "src/tint/ast/alias.h"
-#include "src/ast/bool.h"
+#include "src/tint/ast/bool.h"
-#include "src/ast/f32.h"
+#include "src/tint/ast/f32.h"
-#include "src/ast/i32.h"
+#include "src/tint/ast/i32.h"
-#include "src/ast/matrix.h"
+#include "src/tint/ast/matrix.h"
-#include "src/ast/pointer.h"
+#include "src/tint/ast/pointer.h"
-#include "src/ast/sampler.h"
+#include "src/tint/ast/sampler.h"
-#include "src/ast/texture.h"
+#include "src/tint/ast/texture.h"
-#include "src/ast/u32.h"
+#include "src/tint/ast/u32.h"
-#include "src/ast/vector.h"
+#include "src/tint/ast/vector.h"
-#include "src/symbol_table.h"
+#include "src/tint/symbol_table.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::ast::Type);
 

src/tint/ast/atomic.cc

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/atomic.h"
+#include "src/tint/ast/atomic.h"
 
-#include "src/program_builder.h"
+#include "src/tint/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::ast::Atomic);
 

src/tint/ast/atomic.h

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_AST_ATOMIC_H_
+#ifndef SRC_TINT_AST_ATOMIC_H_
-#define SRC_AST_ATOMIC_H_
+#define SRC_TINT_AST_ATOMIC_H_
 
 #include <string>
 
-#include "src/ast/type.h"
+#include "src/tint/ast/type.h"
 
 namespace tint {
 namespace ast {
@@ -51,4 +51,4 @@ class Atomic : public Castable<Atomic, Type> {
 }  // namespace ast
 }  // namespace tint
 
-#endif  // SRC_AST_ATOMIC_H_
+#endif  // SRC_TINT_AST_ATOMIC_H_

src/tint/ast/atomic_test.cc

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/atomic.h"
+#include "src/tint/ast/atomic.h"
 
-#include "src/ast/i32.h"
+#include "src/tint/ast/i32.h"
-#include "src/ast/test_helper.h"
+#include "src/tint/ast/test_helper.h"
 
 namespace tint {
 namespace ast {

src/tint/ast/attribute.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/attribute.h"
+#include "src/tint/ast/attribute.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::ast::Attribute);
 

src/tint/ast/attribute.h

@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_AST_ATTRIBUTE_H_
+#ifndef SRC_TINT_AST_ATTRIBUTE_H_
-#define SRC_AST_ATTRIBUTE_H_
+#define SRC_TINT_AST_ATTRIBUTE_H_
 
 #include <string>
 #include <vector>
 
-#include "src/ast/node.h"
+#include "src/tint/ast/node.h"
 
 namespace tint {
 namespace ast {
@@ -68,4 +68,4 @@ const T* GetAttribute(const AttributeList& attributes) {
 }  // namespace ast
 }  // namespace tint
 
-#endif  // SRC_AST_ATTRIBUTE_H_
+#endif  // SRC_TINT_AST_ATTRIBUTE_H_

src/tint/ast/binary_expression.cc

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/binary_expression.h"
+#include "src/tint/ast/binary_expression.h"
 
-#include "src/program_builder.h"
+#include "src/tint/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::ast::BinaryExpression);
 

src/tint/ast/binary_expression.h

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_AST_BINARY_EXPRESSION_H_
+#ifndef SRC_TINT_AST_BINARY_EXPRESSION_H_
-#define SRC_AST_BINARY_EXPRESSION_H_
+#define SRC_TINT_AST_BINARY_EXPRESSION_H_
 
-#include "src/ast/expression.h"
+#include "src/tint/ast/expression.h"
 
 namespace tint {
 namespace ast {
@@ -225,4 +225,4 @@ inline std::ostream& operator<<(std::ostream& out, BinaryOp op) {
 }  // namespace ast
 }  // namespace tint
 
-#endif  // SRC_AST_BINARY_EXPRESSION_H_
+#endif  // SRC_TINT_AST_BINARY_EXPRESSION_H_

src/tint/ast/binary_expression_test.cc

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "gtest/gtest-spi.h"
-#include "src/ast/test_helper.h"
+#include "src/tint/ast/test_helper.h"
 
 namespace tint {
 namespace ast {

src/tint/ast/binding_attribute.cc

@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/binding_attribute.h"
+#include "src/tint/ast/binding_attribute.h"
 
 #include <string>
 
-#include "src/program_builder.h"
+#include "src/tint/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::ast::BindingAttribute);
 

src/tint/ast/binding_attribute.h

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_AST_BINDING_ATTRIBUTE_H_
+#ifndef SRC_TINT_AST_BINDING_ATTRIBUTE_H_
-#define SRC_AST_BINDING_ATTRIBUTE_H_
+#define SRC_TINT_AST_BINDING_ATTRIBUTE_H_
 
 #include <string>
 
-#include "src/ast/attribute.h"
+#include "src/tint/ast/attribute.h"
 
 namespace tint {
 namespace ast {
@@ -48,4 +48,4 @@ class BindingAttribute : public Castable<BindingAttribute, Attribute> {
 }  // namespace ast
 }  // namespace tint
 
-#endif  // SRC_AST_BINDING_ATTRIBUTE_H_
+#endif  // SRC_TINT_AST_BINDING_ATTRIBUTE_H_

src/tint/ast/binding_attribute_test.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/test_helper.h"
+#include "src/tint/ast/test_helper.h"
 
 namespace tint {
 namespace ast {

src/tint/ast/bitcast_expression.cc

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/bitcast_expression.h"
+#include "src/tint/ast/bitcast_expression.h"
 
-#include "src/program_builder.h"
+#include "src/tint/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::ast::BitcastExpression);
 

src/tint/ast/bitcast_expression.h

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_AST_BITCAST_EXPRESSION_H_
+#ifndef SRC_TINT_AST_BITCAST_EXPRESSION_H_
-#define SRC_AST_BITCAST_EXPRESSION_H_
+#define SRC_TINT_AST_BITCAST_EXPRESSION_H_
 
-#include "src/ast/expression.h"
+#include "src/tint/ast/expression.h"
 
 namespace tint {
 namespace ast {
@@ -54,4 +54,4 @@ class BitcastExpression : public Castable<BitcastExpression, Expression> {
 }  // namespace ast
 }  // namespace tint
 
-#endif  // SRC_AST_BITCAST_EXPRESSION_H_
+#endif  // SRC_TINT_AST_BITCAST_EXPRESSION_H_

src/tint/ast/bitcast_expression_test.cc

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/bitcast_expression.h"
+#include "src/tint/ast/bitcast_expression.h"
 
 #include "gtest/gtest-spi.h"
-#include "src/ast/test_helper.h"
+#include "src/tint/ast/test_helper.h"
 
 namespace tint {
 namespace ast {

src/tint/ast/block_statement.cc

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/block_statement.h"
+#include "src/tint/ast/block_statement.h"
 
-#include "src/program_builder.h"
+#include "src/tint/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::ast::BlockStatement);
 

src/tint/ast/block_statement.h

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_AST_BLOCK_STATEMENT_H_
+#ifndef SRC_TINT_AST_BLOCK_STATEMENT_H_
-#define SRC_AST_BLOCK_STATEMENT_H_
+#define SRC_TINT_AST_BLOCK_STATEMENT_H_
 
 #include <utility>
 
-#include "src/ast/statement.h"
+#include "src/tint/ast/statement.h"
 
 namespace tint {
 namespace ast {
@@ -57,4 +57,4 @@ class BlockStatement : public Castable<BlockStatement, Statement> {
 }  // namespace ast
 }  // namespace tint
 
-#endif  // SRC_AST_BLOCK_STATEMENT_H_
+#endif  // SRC_TINT_AST_BLOCK_STATEMENT_H_

src/tint/ast/block_statement_test.cc

@@ -13,9 +13,9 @@
 // limitations under the License.
 
 #include "gtest/gtest-spi.h"
-#include "src/ast/discard_statement.h"
+#include "src/tint/ast/discard_statement.h"
-#include "src/ast/if_statement.h"
+#include "src/tint/ast/if_statement.h"
-#include "src/ast/test_helper.h"
+#include "src/tint/ast/test_helper.h"
 
 namespace tint {
 namespace ast {

src/tint/ast/bool.cc

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/bool.h"
+#include "src/tint/ast/bool.h"
 
-#include "src/program_builder.h"
+#include "src/tint/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::ast::Bool);
 

src/tint/ast/bool.h

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_AST_BOOL_H_
+#ifndef SRC_TINT_AST_BOOL_H_
-#define SRC_AST_BOOL_H_
+#define SRC_TINT_AST_BOOL_H_
 
 #include <string>
 
-#include "src/ast/type.h"
+#include "src/tint/ast/type.h"
 
 // X11 likes to #define Bool leading to confusing error messages.
 // If its defined, undefine it.
@@ -53,4 +53,4 @@ class Bool : public Castable<Bool, Type> {
 }  // namespace ast
 }  // namespace tint
 
-#endif  // SRC_AST_BOOL_H_
+#endif  // SRC_TINT_AST_BOOL_H_

src/tint/ast/bool_literal_expression.cc

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/bool_literal_expression.h"
+#include "src/tint/ast/bool_literal_expression.h"
 
-#include "src/program_builder.h"
+#include "src/tint/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::ast::BoolLiteralExpression);
 

src/tint/ast/bool_literal_expression.h

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_AST_BOOL_LITERAL_EXPRESSION_H_
+#ifndef SRC_TINT_AST_BOOL_LITERAL_EXPRESSION_H_
-#define SRC_AST_BOOL_LITERAL_EXPRESSION_H_
+#define SRC_TINT_AST_BOOL_LITERAL_EXPRESSION_H_
 
 #include <string>
 
-#include "src/ast/literal_expression.h"
+#include "src/tint/ast/literal_expression.h"
 
 namespace tint {
 namespace ast {
@@ -46,4 +46,4 @@ class BoolLiteralExpression
 }  // namespace ast
 }  // namespace tint
 
-#endif  // SRC_AST_BOOL_LITERAL_EXPRESSION_H_
+#endif  // SRC_TINT_AST_BOOL_LITERAL_EXPRESSION_H_

src/tint/ast/bool_literal_expression_test.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/test_helper.h"
+#include "src/tint/ast/test_helper.h"
 
 namespace tint {
 namespace ast {

src/tint/ast/bool_test.cc

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/bool.h"
+#include "src/tint/ast/bool.h"
 
-#include "src/ast/test_helper.h"
+#include "src/tint/ast/test_helper.h"
 
 namespace tint {
 namespace ast {

src/tint/ast/break_statement.cc

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/break_statement.h"
+#include "src/tint/ast/break_statement.h"
 
-#include "src/program_builder.h"
+#include "src/tint/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::ast::BreakStatement);
 

src/tint/ast/break_statement.h

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_AST_BREAK_STATEMENT_H_
+#ifndef SRC_TINT_AST_BREAK_STATEMENT_H_
-#define SRC_AST_BREAK_STATEMENT_H_
+#define SRC_TINT_AST_BREAK_STATEMENT_H_
 
-#include "src/ast/statement.h"
+#include "src/tint/ast/statement.h"
 
 namespace tint {
 namespace ast {
@@ -41,4 +41,4 @@ class BreakStatement : public Castable<BreakStatement, Statement> {
 }  // namespace ast
 }  // namespace tint
 
-#endif  // SRC_AST_BREAK_STATEMENT_H_
+#endif  // SRC_TINT_AST_BREAK_STATEMENT_H_

src/tint/ast/break_statement_test.cc

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/break_statement.h"
+#include "src/tint/ast/break_statement.h"
 
-#include "src/ast/test_helper.h"
+#include "src/tint/ast/test_helper.h"
 
 namespace tint {
 namespace ast {

src/tint/ast/builtin.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/builtin.h"
+#include "src/tint/ast/builtin.h"
 
 namespace tint {
 namespace ast {

src/tint/ast/builtin.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_AST_BUILTIN_H_
+#ifndef SRC_TINT_AST_BUILTIN_H_
-#define SRC_AST_BUILTIN_H_
+#define SRC_TINT_AST_BUILTIN_H_
 
 #include <ostream>
 
@@ -49,4 +49,4 @@ std::ostream& operator<<(std::ostream& out, Builtin builtin);
 }  // namespace ast
 }  // namespace tint
 
-#endif  // SRC_AST_BUILTIN_H_
+#endif  // SRC_TINT_AST_BUILTIN_H_

src/tint/ast/builtin_attribute.cc

@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/builtin_attribute.h"
+#include "src/tint/ast/builtin_attribute.h"
 
 #include <string>
 
-#include "src/program_builder.h"
+#include "src/tint/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::ast::BuiltinAttribute);
 

src/tint/ast/builtin_attribute.h

@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_AST_BUILTIN_ATTRIBUTE_H_
+#ifndef SRC_TINT_AST_BUILTIN_ATTRIBUTE_H_
-#define SRC_AST_BUILTIN_ATTRIBUTE_H_
+#define SRC_TINT_AST_BUILTIN_ATTRIBUTE_H_
 
 #include <string>
 
-#include "src/ast/attribute.h"
+#include "src/tint/ast/attribute.h"
-#include "src/ast/builtin.h"
+#include "src/tint/ast/builtin.h"
 
 namespace tint {
 namespace ast {
@@ -49,4 +49,4 @@ class BuiltinAttribute : public Castable<BuiltinAttribute, Attribute> {
 }  // namespace ast
 }  // namespace tint
 
-#endif  // SRC_AST_BUILTIN_ATTRIBUTE_H_
+#endif  // SRC_TINT_AST_BUILTIN_ATTRIBUTE_H_

src/tint/ast/builtin_attribute_test.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/test_helper.h"
+#include "src/tint/ast/test_helper.h"
 
 namespace tint {
 namespace ast {

src/tint/ast/builtin_texture_helper_test.cc

@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/builtin_texture_helper_test.h"
+#include "src/tint/ast/builtin_texture_helper_test.h"
 
-#include "src/sem/depth_texture_type.h"
+#include "src/tint/sem/depth_texture_type.h"
-#include "src/sem/multisampled_texture_type.h"
+#include "src/tint/sem/multisampled_texture_type.h"
-#include "src/sem/sampled_texture_type.h"
+#include "src/tint/sem/sampled_texture_type.h"
 
 namespace tint {
 namespace ast {

src/tint/ast/builtin_texture_helper_test.h

@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_AST_BUILTIN_TEXTURE_HELPER_TEST_H_
+#ifndef SRC_TINT_AST_BUILTIN_TEXTURE_HELPER_TEST_H_
-#define SRC_AST_BUILTIN_TEXTURE_HELPER_TEST_H_
+#define SRC_TINT_AST_BUILTIN_TEXTURE_HELPER_TEST_H_
 
 #include <vector>
 
-#include "src/ast/access.h"
+#include "src/tint/ast/access.h"
-#include "src/program_builder.h"
+#include "src/tint/program_builder.h"
-#include "src/sem/storage_texture_type.h"
+#include "src/tint/sem/storage_texture_type.h"
 
 namespace tint {
 namespace ast {
@@ -266,4 +266,4 @@ std::ostream& operator<<(std::ostream& out, const TextureOverloadCase& data);
 }  // namespace ast
 }  // namespace tint
 
-#endif  // SRC_AST_BUILTIN_TEXTURE_HELPER_TEST_H_
+#endif  // SRC_TINT_AST_BUILTIN_TEXTURE_HELPER_TEST_H_

src/tint/ast/call_expression.cc

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/call_expression.h"
+#include "src/tint/ast/call_expression.h"
 
-#include "src/program_builder.h"
+#include "src/tint/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::ast::CallExpression);
 

src/tint/ast/call_expression.h

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_AST_CALL_EXPRESSION_H_
+#ifndef SRC_TINT_AST_CALL_EXPRESSION_H_
-#define SRC_AST_CALL_EXPRESSION_H_
+#define SRC_TINT_AST_CALL_EXPRESSION_H_
 
-#include "src/ast/expression.h"
+#include "src/tint/ast/expression.h"
 
 namespace tint {
 namespace ast {
@@ -81,4 +81,4 @@ class CallExpression : public Castable<CallExpression, Expression> {
 }  // namespace ast
 }  // namespace tint
 
-#endif  // SRC_AST_CALL_EXPRESSION_H_
+#endif  // SRC_TINT_AST_CALL_EXPRESSION_H_

src/tint/ast/call_expression_test.cc

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "gtest/gtest-spi.h"
-#include "src/ast/test_helper.h"
+#include "src/tint/ast/test_helper.h"
 
 namespace tint {
 namespace ast {

src/tint/ast/call_statement.cc

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/call_statement.h"
+#include "src/tint/ast/call_statement.h"
 
-#include "src/program_builder.h"
+#include "src/tint/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::ast::CallStatement);
 

src/tint/ast/call_statement.h

@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_AST_CALL_STATEMENT_H_
+#ifndef SRC_TINT_AST_CALL_STATEMENT_H_
-#define SRC_AST_CALL_STATEMENT_H_
+#define SRC_TINT_AST_CALL_STATEMENT_H_
 
-#include "src/ast/call_expression.h"
+#include "src/tint/ast/call_expression.h"
-#include "src/ast/statement.h"
+#include "src/tint/ast/statement.h"
 
 namespace tint {
 namespace ast {
@@ -46,4 +46,4 @@ class CallStatement : public Castable<CallStatement, Statement> {
 }  // namespace ast
 }  // namespace tint
 
-#endif  // SRC_AST_CALL_STATEMENT_H_
+#endif  // SRC_TINT_AST_CALL_STATEMENT_H_

src/tint/ast/call_statement_test.cc

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/call_statement.h"
+#include "src/tint/ast/call_statement.h"
 
 #include "gtest/gtest-spi.h"
-#include "src/ast/test_helper.h"
+#include "src/tint/ast/test_helper.h"
 
 namespace tint {
 namespace ast {

src/tint/ast/case_statement.cc

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/case_statement.h"
+#include "src/tint/ast/case_statement.h"
 
-#include "src/program_builder.h"
+#include "src/tint/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::ast::CaseStatement);
 

src/tint/ast/case_statement.h

@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_AST_CASE_STATEMENT_H_
+#ifndef SRC_TINT_AST_CASE_STATEMENT_H_
-#define SRC_AST_CASE_STATEMENT_H_
+#define SRC_TINT_AST_CASE_STATEMENT_H_
 
 #include <vector>
 
-#include "src/ast/block_statement.h"
+#include "src/tint/ast/block_statement.h"
-#include "src/ast/int_literal_expression.h"
+#include "src/tint/ast/int_literal_expression.h"
 
 namespace tint {
 namespace ast {
@@ -64,4 +64,4 @@ using CaseStatementList = std::vector<const CaseStatement*>;
 }  // namespace ast
 }  // namespace tint
 
-#endif  // SRC_AST_CASE_STATEMENT_H_
+#endif  // SRC_TINT_AST_CASE_STATEMENT_H_

src/tint/ast/case_statement_test.cc

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/case_statement.h"
+#include "src/tint/ast/case_statement.h"
 
 #include "gtest/gtest-spi.h"
-#include "src/ast/discard_statement.h"
+#include "src/tint/ast/discard_statement.h"
-#include "src/ast/if_statement.h"
+#include "src/tint/ast/if_statement.h"
-#include "src/ast/test_helper.h"
+#include "src/tint/ast/test_helper.h"
 
 namespace tint {
 namespace ast {

src/tint/ast/continue_statement.cc

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/continue_statement.h"
+#include "src/tint/ast/continue_statement.h"
 
-#include "src/program_builder.h"
+#include "src/tint/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::ast::ContinueStatement);
 

src/tint/ast/continue_statement.h

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_AST_CONTINUE_STATEMENT_H_
+#ifndef SRC_TINT_AST_CONTINUE_STATEMENT_H_
-#define SRC_AST_CONTINUE_STATEMENT_H_
+#define SRC_TINT_AST_CONTINUE_STATEMENT_H_
 
-#include "src/ast/statement.h"
+#include "src/tint/ast/statement.h"
 
 namespace tint {
 namespace ast {
@@ -41,4 +41,4 @@ class ContinueStatement : public Castable<ContinueStatement, Statement> {
 }  // namespace ast
 }  // namespace tint
 
-#endif  // SRC_AST_CONTINUE_STATEMENT_H_
+#endif  // SRC_TINT_AST_CONTINUE_STATEMENT_H_

src/tint/ast/continue_statement_test.cc

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/continue_statement.h"
+#include "src/tint/ast/continue_statement.h"
 
-#include "src/ast/test_helper.h"
+#include "src/tint/ast/test_helper.h"
 
 namespace tint {
 namespace ast {

src/tint/ast/depth_multisampled_texture.cc

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/depth_multisampled_texture.h"
+#include "src/tint/ast/depth_multisampled_texture.h"
 
-#include "src/program_builder.h"
+#include "src/tint/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::ast::DepthMultisampledTexture);
 

src/tint/ast/depth_multisampled_texture.h

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_AST_DEPTH_MULTISAMPLED_TEXTURE_H_
+#ifndef SRC_TINT_AST_DEPTH_MULTISAMPLED_TEXTURE_H_
-#define SRC_AST_DEPTH_MULTISAMPLED_TEXTURE_H_
+#define SRC_TINT_AST_DEPTH_MULTISAMPLED_TEXTURE_H_
 
 #include <string>
 
-#include "src/ast/texture.h"
+#include "src/tint/ast/texture.h"
 
 namespace tint {
 namespace ast {
@@ -51,4 +51,4 @@ class DepthMultisampledTexture
 }  // namespace ast
 }  // namespace tint
 
-#endif  // SRC_AST_DEPTH_MULTISAMPLED_TEXTURE_H_
+#endif  // SRC_TINT_AST_DEPTH_MULTISAMPLED_TEXTURE_H_

src/tint/ast/depth_multisampled_texture_test.cc

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/depth_multisampled_texture.h"
+#include "src/tint/ast/depth_multisampled_texture.h"
 
-#include "src/ast/test_helper.h"
+#include "src/tint/ast/test_helper.h"
 
 namespace tint {
 namespace ast {

src/tint/ast/depth_texture.cc

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/depth_texture.h"
+#include "src/tint/ast/depth_texture.h"
 
-#include "src/program_builder.h"
+#include "src/tint/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::ast::DepthTexture);
 

src/tint/ast/depth_texture.h

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_AST_DEPTH_TEXTURE_H_
+#ifndef SRC_TINT_AST_DEPTH_TEXTURE_H_
-#define SRC_AST_DEPTH_TEXTURE_H_
+#define SRC_TINT_AST_DEPTH_TEXTURE_H_
 
 #include <string>
 
-#include "src/ast/texture.h"
+#include "src/tint/ast/texture.h"
 
 namespace tint {
 namespace ast {
@@ -48,4 +48,4 @@ class DepthTexture : public Castable<DepthTexture, Texture> {
 }  // namespace ast
 }  // namespace tint
 
-#endif  // SRC_AST_DEPTH_TEXTURE_H_
+#endif  // SRC_TINT_AST_DEPTH_TEXTURE_H_

src/tint/ast/depth_texture_test.cc

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/depth_texture.h"
+#include "src/tint/ast/depth_texture.h"
 
-#include "src/ast/test_helper.h"
+#include "src/tint/ast/test_helper.h"
 
 namespace tint {
 namespace ast {

src/tint/ast/disable_validation_attribute.cc

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/disable_validation_attribute.h"
+#include "src/tint/ast/disable_validation_attribute.h"
-#include "src/clone_context.h"
+#include "src/tint/clone_context.h"
-#include "src/program_builder.h"
+#include "src/tint/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::ast::DisableValidationAttribute);
 

src/tint/ast/disable_validation_attribute.h

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_AST_DISABLE_VALIDATION_ATTRIBUTE_H_
+#ifndef SRC_TINT_AST_DISABLE_VALIDATION_ATTRIBUTE_H_
-#define SRC_AST_DISABLE_VALIDATION_ATTRIBUTE_H_
+#define SRC_TINT_AST_DISABLE_VALIDATION_ATTRIBUTE_H_
 
 #include <string>
 
-#include "src/ast/internal_attribute.h"
+#include "src/tint/ast/internal_attribute.h"
 
 namespace tint {
 namespace ast {
@@ -80,4 +80,4 @@ class DisableValidationAttribute
 }  // namespace ast
 }  // namespace tint
 
-#endif  // SRC_AST_DISABLE_VALIDATION_ATTRIBUTE_H_
+#endif  // SRC_TINT_AST_DISABLE_VALIDATION_ATTRIBUTE_H_

src/tint/ast/discard_statement.cc

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/discard_statement.h"
+#include "src/tint/ast/discard_statement.h"
 
-#include "src/program_builder.h"
+#include "src/tint/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::ast::DiscardStatement);
 

src/tint/ast/discard_statement.h

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_AST_DISCARD_STATEMENT_H_
+#ifndef SRC_TINT_AST_DISCARD_STATEMENT_H_
-#define SRC_AST_DISCARD_STATEMENT_H_
+#define SRC_TINT_AST_DISCARD_STATEMENT_H_
 
-#include "src/ast/statement.h"
+#include "src/tint/ast/statement.h"
 
 namespace tint {
 namespace ast {
@@ -41,4 +41,4 @@ class DiscardStatement : public Castable<DiscardStatement, Statement> {
 }  // namespace ast
 }  // namespace tint
 
-#endif  // SRC_AST_DISCARD_STATEMENT_H_
+#endif  // SRC_TINT_AST_DISCARD_STATEMENT_H_

src/tint/ast/discard_statement_test.cc

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/discard_statement.h"
+#include "src/tint/ast/discard_statement.h"
 
-#include "src/ast/test_helper.h"
+#include "src/tint/ast/test_helper.h"
 
 namespace tint {
 namespace ast {

src/tint/ast/else_statement.cc

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/else_statement.h"
+#include "src/tint/ast/else_statement.h"
 
-#include "src/program_builder.h"
+#include "src/tint/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::ast::ElseStatement);
 

src/tint/ast/else_statement.h

@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_AST_ELSE_STATEMENT_H_
+#ifndef SRC_TINT_AST_ELSE_STATEMENT_H_
-#define SRC_AST_ELSE_STATEMENT_H_
+#define SRC_TINT_AST_ELSE_STATEMENT_H_
 
 #include <vector>
 
-#include "src/ast/block_statement.h"
+#include "src/tint/ast/block_statement.h"
-#include "src/ast/expression.h"
+#include "src/tint/ast/expression.h"
 
 namespace tint {
 namespace ast {
@@ -58,4 +58,4 @@ using ElseStatementList = std::vector<const ElseStatement*>;
 }  // namespace ast
 }  // namespace tint
 
-#endif  // SRC_AST_ELSE_STATEMENT_H_
+#endif  // SRC_TINT_AST_ELSE_STATEMENT_H_

src/tint/ast/else_statement_test.cc

@@ -13,9 +13,9 @@
 // limitations under the License.
 
 #include "gtest/gtest-spi.h"
-#include "src/ast/discard_statement.h"
+#include "src/tint/ast/discard_statement.h"
-#include "src/ast/if_statement.h"
+#include "src/tint/ast/if_statement.h"
-#include "src/ast/test_helper.h"
+#include "src/tint/ast/test_helper.h"
 
 namespace tint {
 namespace ast {

src/tint/ast/expression.cc

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/expression.h"
+#include "src/tint/ast/expression.h"
 
-#include "src/sem/expression.h"
+#include "src/tint/sem/expression.h"
-#include "src/sem/info.h"
+#include "src/tint/sem/info.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::ast::Expression);
 

src/tint/ast/expression.h

@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_AST_EXPRESSION_H_
+#ifndef SRC_TINT_AST_EXPRESSION_H_
-#define SRC_AST_EXPRESSION_H_
+#define SRC_TINT_AST_EXPRESSION_H_
 
 #include <string>
 #include <vector>
 
-#include "src/ast/node.h"
+#include "src/tint/ast/node.h"
-#include "src/sem/type.h"
+#include "src/tint/sem/type.h"
 
 namespace tint {
 namespace ast {
@@ -44,4 +44,4 @@ using ExpressionList = std::vector<const Expression*>;
 }  // namespace ast
 }  // namespace tint
 
-#endif  // SRC_AST_EXPRESSION_H_
+#endif  // SRC_TINT_AST_EXPRESSION_H_

src/tint/ast/external_texture.cc

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/external_texture.h"
+#include "src/tint/ast/external_texture.h"
 
-#include "src/program_builder.h"
+#include "src/tint/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::ast::ExternalTexture);
 

src/tint/ast/external_texture.h

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_AST_EXTERNAL_TEXTURE_H_
+#ifndef SRC_TINT_AST_EXTERNAL_TEXTURE_H_
-#define SRC_AST_EXTERNAL_TEXTURE_H_
+#define SRC_TINT_AST_EXTERNAL_TEXTURE_H_
 
 #include <string>
 
-#include "src/ast/texture.h"
+#include "src/tint/ast/texture.h"
 
 namespace tint {
 namespace ast {
@@ -48,4 +48,4 @@ class ExternalTexture : public Castable<ExternalTexture, Texture> {
 }  // namespace ast
 }  // namespace tint
 
-#endif  // SRC_AST_EXTERNAL_TEXTURE_H_
+#endif  // SRC_TINT_AST_EXTERNAL_TEXTURE_H_

src/tint/ast/external_texture_test.cc

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/external_texture.h"
+#include "src/tint/ast/external_texture.h"
 
-#include "src/ast/test_helper.h"
+#include "src/tint/ast/test_helper.h"
 
 namespace tint {
 namespace ast {

src/tint/ast/f32.cc

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/f32.h"
+#include "src/tint/ast/f32.h"
 
-#include "src/program_builder.h"
+#include "src/tint/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::ast::F32);
 

src/tint/ast/f32.h

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_AST_F32_H_
+#ifndef SRC_TINT_AST_F32_H_
-#define SRC_AST_F32_H_
+#define SRC_TINT_AST_F32_H_
 
 #include <string>
 
-#include "src/ast/type.h"
+#include "src/tint/ast/type.h"
 
 namespace tint {
 namespace ast {
@@ -47,4 +47,4 @@ class F32 : public Castable<F32, Type> {
 }  // namespace ast
 }  // namespace tint
 
-#endif  // SRC_AST_F32_H_
+#endif  // SRC_TINT_AST_F32_H_

src/tint/ast/f32_test.cc

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/ast/f32.h"
+#include "src/tint/ast/f32.h"
 
-#include "src/ast/test_helper.h"
+#include "src/tint/ast/test_helper.h"
 
 namespace tint {
 namespace ast {