Condense namespaces in tint/transform.
This PR condenses the namespaces in the tint/transform folder.
Change-Id: Idf448870ccf90f892b9186f7aab7bb0ac9deda17
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/86029
Auto-Submit: Dan Sinclair <dsinclair@chromium.org>
Reviewed-by: Ben Clayton <bclayton@google.com>
Commit-Queue: Dan Sinclair <dsinclair@chromium.org>
diff --git a/src/tint/transform/add_empty_entry_point.cc b/src/tint/transform/add_empty_entry_point.cc
index 5e33ce8..0710d2b 100644
--- a/src/tint/transform/add_empty_entry_point.cc
+++ b/src/tint/transform/add_empty_entry_point.cc
@@ -20,8 +20,7 @@
TINT_INSTANTIATE_TYPEINFO(tint::transform::AddEmptyEntryPoint);
-namespace tint {
-namespace transform {
+namespace tint::transform {
AddEmptyEntryPoint::AddEmptyEntryPoint() = default;
@@ -47,5 +46,4 @@
ctx.Clone();
}
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/add_empty_entry_point.h b/src/tint/transform/add_empty_entry_point.h
index 33c3a26..eb9dccd 100644
--- a/src/tint/transform/add_empty_entry_point.h
+++ b/src/tint/transform/add_empty_entry_point.h
@@ -17,8 +17,7 @@
#include "src/tint/transform/transform.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// Add an empty entry point to the module, if no other entry points exist.
class AddEmptyEntryPoint final
@@ -47,7 +46,6 @@
DataMap& outputs) const override;
};
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_ADD_EMPTY_ENTRY_POINT_H_
diff --git a/src/tint/transform/add_empty_entry_point_test.cc b/src/tint/transform/add_empty_entry_point_test.cc
index e8c1c72..0854251 100644
--- a/src/tint/transform/add_empty_entry_point_test.cc
+++ b/src/tint/transform/add_empty_entry_point_test.cc
@@ -18,8 +18,7 @@
#include "src/tint/transform/test_helper.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using AddEmptyEntryPointTest = TransformTest;
@@ -84,5 +83,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/add_spirv_block_attribute.cc b/src/tint/transform/add_spirv_block_attribute.cc
index ffd3896..91ab991 100644
--- a/src/tint/transform/add_spirv_block_attribute.cc
+++ b/src/tint/transform/add_spirv_block_attribute.cc
@@ -26,8 +26,7 @@
TINT_INSTANTIATE_TYPEINFO(
tint::transform::AddSpirvBlockAttribute::SpirvBlockAttribute);
-namespace tint {
-namespace transform {
+namespace tint::transform {
AddSpirvBlockAttribute::AddSpirvBlockAttribute() = default;
@@ -118,5 +117,4 @@
.Create<AddSpirvBlockAttribute::SpirvBlockAttribute>(ctx->dst->ID());
}
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/add_spirv_block_attribute.h b/src/tint/transform/add_spirv_block_attribute.h
index 5e68dad..386a341 100644
--- a/src/tint/transform/add_spirv_block_attribute.h
+++ b/src/tint/transform/add_spirv_block_attribute.h
@@ -20,8 +20,7 @@
#include "src/tint/ast/internal_attribute.h"
#include "src/tint/transform/transform.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// AddSpirvBlockAttribute is a transform that adds an
/// `@internal(spirv_block)` attribute to any structure that is used as the
@@ -70,7 +69,6 @@
DataMap& outputs) const override;
};
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_ADD_SPIRV_BLOCK_ATTRIBUTE_H_
diff --git a/src/tint/transform/add_spirv_block_attribute_test.cc b/src/tint/transform/add_spirv_block_attribute_test.cc
index 046b9c1..b68920c 100644
--- a/src/tint/transform/add_spirv_block_attribute_test.cc
+++ b/src/tint/transform/add_spirv_block_attribute_test.cc
@@ -19,8 +19,7 @@
#include "src/tint/transform/test_helper.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using AddSpirvBlockAttributeTest = TransformTest;
@@ -611,5 +610,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/array_length_from_uniform.cc b/src/tint/transform/array_length_from_uniform.cc
index ff733ff..52c68f2 100644
--- a/src/tint/transform/array_length_from_uniform.cc
+++ b/src/tint/transform/array_length_from_uniform.cc
@@ -28,8 +28,7 @@
TINT_INSTANTIATE_TYPEINFO(tint::transform::ArrayLengthFromUniform::Config);
TINT_INSTANTIATE_TYPEINFO(tint::transform::ArrayLengthFromUniform::Result);
-namespace tint {
-namespace transform {
+namespace tint::transform {
ArrayLengthFromUniform::ArrayLengthFromUniform() = default;
ArrayLengthFromUniform::~ArrayLengthFromUniform() = default;
@@ -229,5 +228,4 @@
ArrayLengthFromUniform::Result::Result(const Result&) = default;
ArrayLengthFromUniform::Result::~Result() = default;
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/array_length_from_uniform.h b/src/tint/transform/array_length_from_uniform.h
index 2505f17..9d5cea6 100644
--- a/src/tint/transform/array_length_from_uniform.h
+++ b/src/tint/transform/array_length_from_uniform.h
@@ -21,12 +21,12 @@
#include "src/tint/sem/binding_point.h"
#include "src/tint/transform/transform.h"
-namespace tint {
-
// Forward declarations
+namespace tint {
class CloneContext;
+}
-namespace transform {
+namespace tint::transform {
/// ArrayLengthFromUniform is a transform that implements calls to arrayLength()
/// by calculating the length from the total size of the storage buffer, which
@@ -119,7 +119,6 @@
DataMap& outputs) const override;
};
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_ARRAY_LENGTH_FROM_UNIFORM_H_
diff --git a/src/tint/transform/array_length_from_uniform_test.cc b/src/tint/transform/array_length_from_uniform_test.cc
index 7cdcb5c..42a334c 100644
--- a/src/tint/transform/array_length_from_uniform_test.cc
+++ b/src/tint/transform/array_length_from_uniform_test.cc
@@ -20,8 +20,7 @@
#include "src/tint/transform/test_helper.h"
#include "src/tint/transform/unshadow.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using ArrayLengthFromUniformTest = TransformTest;
@@ -497,5 +496,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/binding_remapper.cc b/src/tint/transform/binding_remapper.cc
index 21155df..3934b20 100644
--- a/src/tint/transform/binding_remapper.cc
+++ b/src/tint/transform/binding_remapper.cc
@@ -26,8 +26,7 @@
TINT_INSTANTIATE_TYPEINFO(tint::transform::BindingRemapper);
TINT_INSTANTIATE_TYPEINFO(tint::transform::BindingRemapper::Remappings);
-namespace tint {
-namespace transform {
+namespace tint::transform {
BindingRemapper::Remappings::Remappings(BindingPoints bp,
AccessControls ac,
@@ -159,5 +158,4 @@
ctx.Clone();
}
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/binding_remapper.h b/src/tint/transform/binding_remapper.h
index f87f995..3e9f613 100644
--- a/src/tint/transform/binding_remapper.h
+++ b/src/tint/transform/binding_remapper.h
@@ -21,8 +21,7 @@
#include "src/tint/sem/binding_point.h"
#include "src/tint/transform/transform.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// BindingPoint is an alias to sem::BindingPoint
using BindingPoint = sem::BindingPoint;
@@ -86,7 +85,6 @@
DataMap& outputs) const override;
};
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_BINDING_REMAPPER_H_
diff --git a/src/tint/transform/binding_remapper_test.cc b/src/tint/transform/binding_remapper_test.cc
index 3fc0b19..70c7232 100644
--- a/src/tint/transform/binding_remapper_test.cc
+++ b/src/tint/transform/binding_remapper_test.cc
@@ -18,8 +18,7 @@
#include "src/tint/transform/test_helper.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using BindingRemapperTest = TransformTest;
@@ -359,5 +358,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/builtin_polyfill.cc b/src/tint/transform/builtin_polyfill.cc
index 9cd2c67..c33d40f 100644
--- a/src/tint/transform/builtin_polyfill.cc
+++ b/src/tint/transform/builtin_polyfill.cc
@@ -24,8 +24,7 @@
TINT_INSTANTIATE_TYPEINFO(tint::transform::BuiltinPolyfill);
TINT_INSTANTIATE_TYPEINFO(tint::transform::BuiltinPolyfill::Config);
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// The PIMPL state for the BuiltinPolyfill transform
struct BuiltinPolyfill::State {
@@ -598,5 +597,4 @@
BuiltinPolyfill::Config::Config(const Config&) = default;
BuiltinPolyfill::Config::~Config() = default;
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/builtin_polyfill.h b/src/tint/transform/builtin_polyfill.h
index dec716e..ada1015 100644
--- a/src/tint/transform/builtin_polyfill.h
+++ b/src/tint/transform/builtin_polyfill.h
@@ -17,8 +17,7 @@
#include "src/tint/transform/transform.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// Implements builtins for backends that do not have a native implementation.
class BuiltinPolyfill final : public Castable<BuiltinPolyfill, Transform> {
@@ -91,7 +90,6 @@
DataMap& outputs) const override;
};
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_BUILTIN_POLYFILL_H_
diff --git a/src/tint/transform/builtin_polyfill_test.cc b/src/tint/transform/builtin_polyfill_test.cc
index 49e0471..c5cc2c5 100644
--- a/src/tint/transform/builtin_polyfill_test.cc
+++ b/src/tint/transform/builtin_polyfill_test.cc
@@ -18,8 +18,7 @@
#include "src/tint/transform/test_helper.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using Level = BuiltinPolyfill::Level;
@@ -1117,5 +1116,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/calculate_array_length.cc b/src/tint/transform/calculate_array_length.cc
index 05fcb0f..589d21e 100644
--- a/src/tint/transform/calculate_array_length.cc
+++ b/src/tint/transform/calculate_array_length.cc
@@ -34,8 +34,7 @@
TINT_INSTANTIATE_TYPEINFO(
tint::transform::CalculateArrayLength::BufferSizeIntrinsic);
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
@@ -239,5 +238,4 @@
ctx.Clone();
}
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/calculate_array_length.h b/src/tint/transform/calculate_array_length.h
index dfc1508..0ed7a5d 100644
--- a/src/tint/transform/calculate_array_length.h
+++ b/src/tint/transform/calculate_array_length.h
@@ -20,12 +20,12 @@
#include "src/tint/ast/internal_attribute.h"
#include "src/tint/transform/transform.h"
-namespace tint {
-
// Forward declarations
+namespace tint {
class CloneContext;
+}
-namespace transform {
+namespace tint::transform {
/// CalculateArrayLength is a transform used to replace calls to arrayLength()
/// with a value calculated from the size of the storage buffer.
@@ -78,7 +78,6 @@
DataMap& outputs) const override;
};
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_CALCULATE_ARRAY_LENGTH_H_
diff --git a/src/tint/transform/calculate_array_length_test.cc b/src/tint/transform/calculate_array_length_test.cc
index 17d28fd..dec1698 100644
--- a/src/tint/transform/calculate_array_length_test.cc
+++ b/src/tint/transform/calculate_array_length_test.cc
@@ -18,8 +18,7 @@
#include "src/tint/transform/test_helper.h"
#include "src/tint/transform/unshadow.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using CalculateArrayLengthTest = TransformTest;
@@ -549,5 +548,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/canonicalize_entry_point_io.cc b/src/tint/transform/canonicalize_entry_point_io.cc
index 1eaa5db..9d72887 100644
--- a/src/tint/transform/canonicalize_entry_point_io.cc
+++ b/src/tint/transform/canonicalize_entry_point_io.cc
@@ -28,8 +28,7 @@
TINT_INSTANTIATE_TYPEINFO(tint::transform::CanonicalizeEntryPointIO);
TINT_INSTANTIATE_TYPEINFO(tint::transform::CanonicalizeEntryPointIO::Config);
-namespace tint {
-namespace transform {
+namespace tint::transform {
CanonicalizeEntryPointIO::CanonicalizeEntryPointIO() = default;
CanonicalizeEntryPointIO::~CanonicalizeEntryPointIO() = default;
@@ -775,5 +774,4 @@
CanonicalizeEntryPointIO::Config::Config(const Config&) = default;
CanonicalizeEntryPointIO::Config::~Config() = default;
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/canonicalize_entry_point_io.h b/src/tint/transform/canonicalize_entry_point_io.h
index 48b7f40..eab4128 100644
--- a/src/tint/transform/canonicalize_entry_point_io.h
+++ b/src/tint/transform/canonicalize_entry_point_io.h
@@ -17,8 +17,7 @@
#include "src/tint/transform/transform.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// CanonicalizeEntryPointIO is a transform used to rewrite shader entry point
/// interfaces into a form that the generators can handle. Each entry point
@@ -143,7 +142,6 @@
struct State;
};
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_CANONICALIZE_ENTRY_POINT_IO_H_
diff --git a/src/tint/transform/canonicalize_entry_point_io_test.cc b/src/tint/transform/canonicalize_entry_point_io_test.cc
index 6147fe0..bf4d699 100644
--- a/src/tint/transform/canonicalize_entry_point_io_test.cc
+++ b/src/tint/transform/canonicalize_entry_point_io_test.cc
@@ -17,8 +17,7 @@
#include "src/tint/transform/test_helper.h"
#include "src/tint/transform/unshadow.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using CanonicalizeEntryPointIOTest = TransformTest;
@@ -4037,5 +4036,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/combine_samplers.cc b/src/tint/transform/combine_samplers.cc
index ab0b90d..4b1e892 100644
--- a/src/tint/transform/combine_samplers.cc
+++ b/src/tint/transform/combine_samplers.cc
@@ -36,8 +36,7 @@
} // namespace
-namespace tint {
-namespace transform {
+namespace tint::transform {
CombineSamplers::BindingInfo::BindingInfo(const BindingMap& map,
const sem::BindingPoint& placeholder)
@@ -351,5 +350,4 @@
State(ctx, binding_info).Run();
}
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/combine_samplers.h b/src/tint/transform/combine_samplers.h
index f55c275..d15d2ab 100644
--- a/src/tint/transform/combine_samplers.h
+++ b/src/tint/transform/combine_samplers.h
@@ -21,8 +21,7 @@
#include "src/tint/sem/sampler_texture_pair.h"
#include "src/tint/transform/transform.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// This transform converts all separate texture/sampler refences in a
/// program into combined texture/samplers. This is required for GLSL,
@@ -104,7 +103,6 @@
DataMap& outputs) const override;
};
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_COMBINE_SAMPLERS_H_
diff --git a/src/tint/transform/combine_samplers_test.cc b/src/tint/transform/combine_samplers_test.cc
index f223cb1..cb60103 100644
--- a/src/tint/transform/combine_samplers_test.cc
+++ b/src/tint/transform/combine_samplers_test.cc
@@ -19,8 +19,7 @@
#include "src/tint/transform/test_helper.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using CombineSamplersTest = TransformTest;
@@ -1008,5 +1007,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/decompose_memory_access.cc b/src/tint/transform/decompose_memory_access.cc
index 5080551..699eeb4 100644
--- a/src/tint/transform/decompose_memory_access.cc
+++ b/src/tint/transform/decompose_memory_access.cc
@@ -41,8 +41,7 @@
TINT_INSTANTIATE_TYPEINFO(tint::transform::DecomposeMemoryAccess);
TINT_INSTANTIATE_TYPEINFO(tint::transform::DecomposeMemoryAccess::Intrinsic);
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
@@ -991,8 +990,7 @@
ctx.Clone();
}
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
TINT_INSTANTIATE_TYPEINFO(tint::transform::Offset);
TINT_INSTANTIATE_TYPEINFO(tint::transform::OffsetLiteral);
diff --git a/src/tint/transform/decompose_memory_access.h b/src/tint/transform/decompose_memory_access.h
index d1c2ce1..efcd39b 100644
--- a/src/tint/transform/decompose_memory_access.h
+++ b/src/tint/transform/decompose_memory_access.h
@@ -20,12 +20,12 @@
#include "src/tint/ast/internal_attribute.h"
#include "src/tint/transform/transform.h"
-namespace tint {
-
// Forward declarations
+namespace tint {
class CloneContext;
+}
-namespace transform {
+namespace tint::transform {
/// DecomposeMemoryAccess is a transform used to replace storage and uniform
/// buffer accesses with a combination of load, store or atomic functions on
@@ -125,7 +125,6 @@
struct State;
};
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_DECOMPOSE_MEMORY_ACCESS_H_
diff --git a/src/tint/transform/decompose_memory_access_test.cc b/src/tint/transform/decompose_memory_access_test.cc
index ec47d9a..dadb422 100644
--- a/src/tint/transform/decompose_memory_access_test.cc
+++ b/src/tint/transform/decompose_memory_access_test.cc
@@ -16,8 +16,7 @@
#include "src/tint/transform/test_helper.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using DecomposeMemoryAccessTest = TransformTest;
@@ -2800,5 +2799,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/decompose_strided_array.cc b/src/tint/transform/decompose_strided_array.cc
index 0265704..74b6903 100644
--- a/src/tint/transform/decompose_strided_array.cc
+++ b/src/tint/transform/decompose_strided_array.cc
@@ -29,8 +29,7 @@
TINT_INSTANTIATE_TYPEINFO(tint::transform::DecomposeStridedArray);
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using DecomposedArrays = std::unordered_map<const sem::Array*, Symbol>;
@@ -158,5 +157,4 @@
ctx.Clone();
}
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/decompose_strided_array.h b/src/tint/transform/decompose_strided_array.h
index ccf8691..505f5cb 100644
--- a/src/tint/transform/decompose_strided_array.h
+++ b/src/tint/transform/decompose_strided_array.h
@@ -17,8 +17,7 @@
#include "src/tint/transform/transform.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// DecomposeStridedArray transforms replaces arrays with a non-default
/// `@stride` attribute with an array of structure elements, where the
@@ -55,7 +54,6 @@
DataMap& outputs) const override;
};
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_DECOMPOSE_STRIDED_ARRAY_H_
diff --git a/src/tint/transform/decompose_strided_array_test.cc b/src/tint/transform/decompose_strided_array_test.cc
index 63c7823..98ef2c4 100644
--- a/src/tint/transform/decompose_strided_array_test.cc
+++ b/src/tint/transform/decompose_strided_array_test.cc
@@ -23,8 +23,7 @@
#include "src/tint/transform/test_helper.h"
#include "src/tint/transform/unshadow.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using DecomposeStridedArrayTest = TransformTest;
@@ -694,5 +693,4 @@
EXPECT_EQ(expect, str(got));
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/decompose_strided_matrix.cc b/src/tint/transform/decompose_strided_matrix.cc
index 6f06c80..fd7194d 100644
--- a/src/tint/transform/decompose_strided_matrix.cc
+++ b/src/tint/transform/decompose_strided_matrix.cc
@@ -27,8 +27,7 @@
TINT_INSTANTIATE_TYPEINFO(tint::transform::DecomposeStridedMatrix);
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
/// MatrixInfo describes a matrix member with a custom stride
@@ -247,5 +246,4 @@
ctx.Clone();
}
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/decompose_strided_matrix.h b/src/tint/transform/decompose_strided_matrix.h
index 9a4c7b7..bcde5aa 100644
--- a/src/tint/transform/decompose_strided_matrix.h
+++ b/src/tint/transform/decompose_strided_matrix.h
@@ -17,8 +17,7 @@
#include "src/tint/transform/transform.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// DecomposeStridedMatrix transforms replaces matrix members of storage or
/// uniform buffer structures, that have a stride attribute, into an array
@@ -55,7 +54,6 @@
DataMap& outputs) const override;
};
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_DECOMPOSE_STRIDED_MATRIX_H_
diff --git a/src/tint/transform/decompose_strided_matrix_test.cc b/src/tint/transform/decompose_strided_matrix_test.cc
index 4fe08a0..7338999 100644
--- a/src/tint/transform/decompose_strided_matrix_test.cc
+++ b/src/tint/transform/decompose_strided_matrix_test.cc
@@ -24,8 +24,7 @@
#include "src/tint/transform/test_helper.h"
#include "src/tint/transform/unshadow.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using DecomposeStridedMatrixTest = TransformTest;
@@ -667,5 +666,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/expand_compound_assignment.cc b/src/tint/transform/expand_compound_assignment.cc
index 3a986a2..0473fae 100644
--- a/src/tint/transform/expand_compound_assignment.cc
+++ b/src/tint/transform/expand_compound_assignment.cc
@@ -27,8 +27,7 @@
TINT_INSTANTIATE_TYPEINFO(tint::transform::ExpandCompoundAssignment);
-namespace tint {
-namespace transform {
+namespace tint::transform {
ExpandCompoundAssignment::ExpandCompoundAssignment() = default;
@@ -192,5 +191,4 @@
state.Finalize();
}
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/expand_compound_assignment.h b/src/tint/transform/expand_compound_assignment.h
index 6447117..b461bed 100644
--- a/src/tint/transform/expand_compound_assignment.h
+++ b/src/tint/transform/expand_compound_assignment.h
@@ -17,8 +17,7 @@
#include "src/tint/transform/transform.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// Converts compound assignment statements to regular assignment statements,
/// hoisting the LHS expression if necessary.
@@ -65,7 +64,6 @@
DataMap& outputs) const override;
};
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_EXPAND_COMPOUND_ASSIGNMENT_H_
diff --git a/src/tint/transform/expand_compound_assignment_test.cc b/src/tint/transform/expand_compound_assignment_test.cc
index dc0992f..d3fa510 100644
--- a/src/tint/transform/expand_compound_assignment_test.cc
+++ b/src/tint/transform/expand_compound_assignment_test.cc
@@ -18,8 +18,7 @@
#include "src/tint/transform/test_helper.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using ExpandCompoundAssignmentTest = TransformTest;
@@ -742,5 +741,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/first_index_offset.cc b/src/tint/transform/first_index_offset.cc
index 0a21017..46a2dcd2 100644
--- a/src/tint/transform/first_index_offset.cc
+++ b/src/tint/transform/first_index_offset.cc
@@ -28,8 +28,7 @@
TINT_INSTANTIATE_TYPEINFO(tint::transform::FirstIndexOffset::BindingPoint);
TINT_INSTANTIATE_TYPEINFO(tint::transform::FirstIndexOffset::Data);
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
// Uniform buffer member names
@@ -184,5 +183,4 @@
instance_index_offset);
}
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/first_index_offset.h b/src/tint/transform/first_index_offset.h
index 21636f3..43d003d 100644
--- a/src/tint/transform/first_index_offset.h
+++ b/src/tint/transform/first_index_offset.h
@@ -17,8 +17,7 @@
#include "src/tint/transform/transform.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// Adds firstVertex/Instance (injected via root constants) to
/// vertex/instance index builtins.
@@ -137,7 +136,6 @@
uint32_t group_ = 0;
};
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_FIRST_INDEX_OFFSET_H_
diff --git a/src/tint/transform/first_index_offset_test.cc b/src/tint/transform/first_index_offset_test.cc
index 00822ff..ee91439 100644
--- a/src/tint/transform/first_index_offset_test.cc
+++ b/src/tint/transform/first_index_offset_test.cc
@@ -20,8 +20,7 @@
#include "src/tint/transform/test_helper.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using FirstIndexOffsetTest = TransformTest;
@@ -646,5 +645,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/fold_constants.cc b/src/tint/transform/fold_constants.cc
index 08995eb..b814c5c 100644
--- a/src/tint/transform/fold_constants.cc
+++ b/src/tint/transform/fold_constants.cc
@@ -26,8 +26,7 @@
TINT_INSTANTIATE_TYPEINFO(tint::transform::FoldConstants);
-namespace tint {
-namespace transform {
+namespace tint::transform {
FoldConstants::FoldConstants() = default;
@@ -95,5 +94,4 @@
ctx.Clone();
}
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/fold_constants.h b/src/tint/transform/fold_constants.h
index 7f964d1..fbe7abd 100644
--- a/src/tint/transform/fold_constants.h
+++ b/src/tint/transform/fold_constants.h
@@ -17,8 +17,7 @@
#include "src/tint/transform/transform.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// FoldConstants transforms the AST by folding constant expressions
class FoldConstants final : public Castable<FoldConstants, Transform> {
@@ -41,7 +40,6 @@
DataMap& outputs) const override;
};
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_FOLD_CONSTANTS_H_
diff --git a/src/tint/transform/fold_constants_test.cc b/src/tint/transform/fold_constants_test.cc
index fd57c92..d8121bc 100644
--- a/src/tint/transform/fold_constants_test.cc
+++ b/src/tint/transform/fold_constants_test.cc
@@ -20,8 +20,7 @@
#include "src/tint/transform/test_helper.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using FoldConstantsTest = TransformTest;
@@ -423,5 +422,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/fold_trivial_single_use_lets.cc b/src/tint/transform/fold_trivial_single_use_lets.cc
index 33dc55d..a0f02a8 100644
--- a/src/tint/transform/fold_trivial_single_use_lets.cc
+++ b/src/tint/transform/fold_trivial_single_use_lets.cc
@@ -23,8 +23,7 @@
TINT_INSTANTIATE_TYPEINFO(tint::transform::FoldTrivialSingleUseLets);
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
const ast::VariableDeclStatement* AsTrivialLetDecl(const ast::Statement* stmt) {
@@ -88,5 +87,4 @@
ctx.Clone();
}
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/fold_trivial_single_use_lets.h b/src/tint/transform/fold_trivial_single_use_lets.h
index 858f6da..d343b76 100644
--- a/src/tint/transform/fold_trivial_single_use_lets.h
+++ b/src/tint/transform/fold_trivial_single_use_lets.h
@@ -20,8 +20,7 @@
#include "src/tint/transform/transform.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// FoldTrivialSingleUseLets is an optimizer for folding away trivial `let`
/// statements into their single place of use. This transform is intended to
@@ -55,7 +54,6 @@
DataMap& outputs) const override;
};
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_FOLD_TRIVIAL_SINGLE_USE_LETS_H_
diff --git a/src/tint/transform/fold_trivial_single_use_lets_test.cc b/src/tint/transform/fold_trivial_single_use_lets_test.cc
index 09939e1..e08c191 100644
--- a/src/tint/transform/fold_trivial_single_use_lets_test.cc
+++ b/src/tint/transform/fold_trivial_single_use_lets_test.cc
@@ -16,8 +16,7 @@
#include "src/tint/transform/test_helper.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using FoldTrivialSingleUseLetsTest = TransformTest;
@@ -184,5 +183,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/for_loop_to_loop.cc b/src/tint/transform/for_loop_to_loop.cc
index f7fda57..14d5edb 100644
--- a/src/tint/transform/for_loop_to_loop.cc
+++ b/src/tint/transform/for_loop_to_loop.cc
@@ -19,8 +19,7 @@
TINT_INSTANTIATE_TYPEINFO(tint::transform::ForLoopToLoop);
-namespace tint {
-namespace transform {
+namespace tint::transform {
ForLoopToLoop::ForLoopToLoop() = default;
ForLoopToLoop::~ForLoopToLoop() = default;
@@ -72,5 +71,4 @@
ctx.Clone();
}
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/for_loop_to_loop.h b/src/tint/transform/for_loop_to_loop.h
index 94b0460..54286d4 100644
--- a/src/tint/transform/for_loop_to_loop.h
+++ b/src/tint/transform/for_loop_to_loop.h
@@ -17,8 +17,7 @@
#include "src/tint/transform/transform.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// ForLoopToLoop is a Transform that converts a for-loop statement into a loop
/// statement. This is required by the SPIR-V writer.
@@ -48,7 +47,6 @@
DataMap& outputs) const override;
};
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_FOR_LOOP_TO_LOOP_H_
diff --git a/src/tint/transform/for_loop_to_loop_test.cc b/src/tint/transform/for_loop_to_loop_test.cc
index 07fe2a9..84ffa98 100644
--- a/src/tint/transform/for_loop_to_loop_test.cc
+++ b/src/tint/transform/for_loop_to_loop_test.cc
@@ -16,8 +16,7 @@
#include "src/tint/transform/test_helper.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using ForLoopToLoopTest = TransformTest;
@@ -370,5 +369,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/glsl.cc b/src/tint/transform/glsl.cc
index df6b6b3..f0120e8 100644
--- a/src/tint/transform/glsl.cc
+++ b/src/tint/transform/glsl.cc
@@ -42,8 +42,7 @@
TINT_INSTANTIATE_TYPEINFO(tint::transform::Glsl);
TINT_INSTANTIATE_TYPEINFO(tint::transform::Glsl::Config);
-namespace tint {
-namespace transform {
+namespace tint::transform {
Glsl::Glsl() = default;
Glsl::~Glsl() = default;
@@ -143,5 +142,4 @@
Glsl::Config::Config(const Config&) = default;
Glsl::Config::~Config() = default;
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/glsl.h b/src/tint/transform/glsl.h
index 414f871..73bc76b 100644
--- a/src/tint/transform/glsl.h
+++ b/src/tint/transform/glsl.h
@@ -19,12 +19,12 @@
#include "src/tint/transform/transform.h"
-namespace tint {
-
// Forward declarations
+namespace tint {
class CloneContext;
+}
-namespace transform {
+namespace tint::transform {
/// Glsl is a transform used to sanitize a Program for use with the Glsl writer.
/// Passing a non-sanitized Program to the Glsl writer will result in undefined
@@ -70,7 +70,6 @@
Output Run(const Program* program, const DataMap& data = {}) const override;
};
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_GLSL_H_
diff --git a/src/tint/transform/glsl_test.cc b/src/tint/transform/glsl_test.cc
index 5a2d872..555701b 100644
--- a/src/tint/transform/glsl_test.cc
+++ b/src/tint/transform/glsl_test.cc
@@ -16,8 +16,7 @@
#include "src/tint/transform/test_helper.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using GlslTest = TransformTest;
@@ -37,5 +36,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/localize_struct_array_assignment.cc b/src/tint/transform/localize_struct_array_assignment.cc
index ff2289b..e888c01 100644
--- a/src/tint/transform/localize_struct_array_assignment.cc
+++ b/src/tint/transform/localize_struct_array_assignment.cc
@@ -30,8 +30,7 @@
TINT_INSTANTIATE_TYPEINFO(tint::transform::LocalizeStructArrayAssignment);
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// Private implementation of LocalizeStructArrayAssignment transform
class LocalizeStructArrayAssignment::State {
@@ -220,5 +219,4 @@
state.Run();
}
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/localize_struct_array_assignment.h b/src/tint/transform/localize_struct_array_assignment.h
index ec5faa6..2c45203 100644
--- a/src/tint/transform/localize_struct_array_assignment.h
+++ b/src/tint/transform/localize_struct_array_assignment.h
@@ -17,8 +17,7 @@
#include "src/tint/transform/transform.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// This transforms replaces assignment to dynamically-indexed fixed-size arrays
/// in structs on shader-local variables with code that copies the arrays to a
@@ -52,7 +51,6 @@
class State;
};
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_LOCALIZE_STRUCT_ARRAY_ASSIGNMENT_H_
diff --git a/src/tint/transform/localize_struct_array_assignment_test.cc b/src/tint/transform/localize_struct_array_assignment_test.cc
index 2c75f76..d202785 100644
--- a/src/tint/transform/localize_struct_array_assignment_test.cc
+++ b/src/tint/transform/localize_struct_array_assignment_test.cc
@@ -18,8 +18,7 @@
#include "src/tint/transform/test_helper.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using LocalizeStructArrayAssignmentTest = TransformTest;
@@ -865,5 +864,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/loop_to_for_loop.cc b/src/tint/transform/loop_to_for_loop.cc
index ac205c0..d01ac48 100644
--- a/src/tint/transform/loop_to_for_loop.cc
+++ b/src/tint/transform/loop_to_for_loop.cc
@@ -25,8 +25,7 @@
TINT_INSTANTIATE_TYPEINFO(tint::transform::LoopToForLoop);
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
bool IsBlockWithSingleBreak(const ast::BlockStatement* block) {
@@ -141,5 +140,4 @@
ctx.Clone();
}
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/loop_to_for_loop.h b/src/tint/transform/loop_to_for_loop.h
index 94e09f6..b6482ae 100644
--- a/src/tint/transform/loop_to_for_loop.h
+++ b/src/tint/transform/loop_to_for_loop.h
@@ -17,8 +17,7 @@
#include "src/tint/transform/transform.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// LoopToForLoop is a Transform that attempts to convert WGSL `loop {}`
/// statements into a for-loop statement.
@@ -48,7 +47,6 @@
DataMap& outputs) const override;
};
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_LOOP_TO_FOR_LOOP_H_
diff --git a/src/tint/transform/loop_to_for_loop_test.cc b/src/tint/transform/loop_to_for_loop_test.cc
index df51e10..c34b0e8 100644
--- a/src/tint/transform/loop_to_for_loop_test.cc
+++ b/src/tint/transform/loop_to_for_loop_test.cc
@@ -16,8 +16,7 @@
#include "src/tint/transform/test_helper.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using LoopToForLoopTest = TransformTest;
@@ -304,5 +303,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/manager.cc b/src/tint/transform/manager.cc
index 158a28e..a52f175 100644
--- a/src/tint/transform/manager.cc
+++ b/src/tint/transform/manager.cc
@@ -26,8 +26,7 @@
TINT_INSTANTIATE_TYPEINFO(tint::transform::Manager);
-namespace tint {
-namespace transform {
+namespace tint::transform {
Manager::Manager() = default;
Manager::~Manager() = default;
@@ -82,5 +81,4 @@
return out;
}
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/manager.h b/src/tint/transform/manager.h
index 092b568..fb614d3 100644
--- a/src/tint/transform/manager.h
+++ b/src/tint/transform/manager.h
@@ -21,8 +21,7 @@
#include "src/tint/transform/transform.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// A collection of Transforms that act as a single Transform.
/// The inner transforms will execute in the appended order.
@@ -58,7 +57,6 @@
std::vector<std::unique_ptr<Transform>> transforms_;
};
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_MANAGER_H_
diff --git a/src/tint/transform/module_scope_var_to_entry_point_param.cc b/src/tint/transform/module_scope_var_to_entry_point_param.cc
index e213c45..b510d7d 100644
--- a/src/tint/transform/module_scope_var_to_entry_point_param.cc
+++ b/src/tint/transform/module_scope_var_to_entry_point_param.cc
@@ -28,8 +28,7 @@
TINT_INSTANTIATE_TYPEINFO(tint::transform::ModuleScopeVarToEntryPointParam);
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
// Returns `true` if `type` is or contains a matrix type.
bool ContainsMatrix(const sem::Type* type) {
@@ -395,5 +394,4 @@
ctx.Clone();
}
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/module_scope_var_to_entry_point_param.h b/src/tint/transform/module_scope_var_to_entry_point_param.h
index 334fcd4..8297057 100644
--- a/src/tint/transform/module_scope_var_to_entry_point_param.h
+++ b/src/tint/transform/module_scope_var_to_entry_point_param.h
@@ -17,8 +17,7 @@
#include "src/tint/transform/transform.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// Move module-scope variables into the entry point as parameters.
///
@@ -90,7 +89,6 @@
struct State;
};
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_MODULE_SCOPE_VAR_TO_ENTRY_POINT_PARAM_H_
diff --git a/src/tint/transform/module_scope_var_to_entry_point_param_test.cc b/src/tint/transform/module_scope_var_to_entry_point_param_test.cc
index 3997d9a..3089355 100644
--- a/src/tint/transform/module_scope_var_to_entry_point_param_test.cc
+++ b/src/tint/transform/module_scope_var_to_entry_point_param_test.cc
@@ -18,8 +18,7 @@
#include "src/tint/transform/test_helper.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using ModuleScopeVarToEntryPointParamTest = TransformTest;
@@ -1166,5 +1165,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/multiplanar_external_texture.cc b/src/tint/transform/multiplanar_external_texture.cc
index 801c593..00466ac 100644
--- a/src/tint/transform/multiplanar_external_texture.cc
+++ b/src/tint/transform/multiplanar_external_texture.cc
@@ -27,8 +27,7 @@
TINT_INSTANTIATE_TYPEINFO(
tint::transform::MultiplanarExternalTexture::NewBindingPoints);
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
/// This struct stores symbols for new bindings created as a result of
@@ -450,5 +449,4 @@
ctx.Clone();
}
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/multiplanar_external_texture.h b/src/tint/transform/multiplanar_external_texture.h
index 240d520..ab2298c 100644
--- a/src/tint/transform/multiplanar_external_texture.h
+++ b/src/tint/transform/multiplanar_external_texture.h
@@ -23,8 +23,7 @@
#include "src/tint/sem/builtin_type.h"
#include "src/tint/transform/transform.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// BindingPoint is an alias to sem::BindingPoint
using BindingPoint = sem::BindingPoint;
@@ -96,7 +95,6 @@
DataMap& outputs) const override;
};
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_MULTIPLANAR_EXTERNAL_TEXTURE_H_
diff --git a/src/tint/transform/multiplanar_external_texture_test.cc b/src/tint/transform/multiplanar_external_texture_test.cc
index 85150a6..b0a79d6 100644
--- a/src/tint/transform/multiplanar_external_texture_test.cc
+++ b/src/tint/transform/multiplanar_external_texture_test.cc
@@ -15,8 +15,7 @@
#include "src/tint/transform/multiplanar_external_texture.h"
#include "src/tint/transform/test_helper.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using MultiplanarExternalTextureTest = TransformTest;
@@ -1293,5 +1292,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/num_workgroups_from_uniform.cc b/src/tint/transform/num_workgroups_from_uniform.cc
index db71158..72f7fb8 100644
--- a/src/tint/transform/num_workgroups_from_uniform.cc
+++ b/src/tint/transform/num_workgroups_from_uniform.cc
@@ -27,8 +27,7 @@
TINT_INSTANTIATE_TYPEINFO(tint::transform::NumWorkgroupsFromUniform);
TINT_INSTANTIATE_TYPEINFO(tint::transform::NumWorkgroupsFromUniform::Config);
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
/// Accessor describes the identifiers used in a member accessor that is being
/// used to retrieve the num_workgroups builtin from a parameter.
@@ -166,5 +165,4 @@
NumWorkgroupsFromUniform::Config::Config(const Config&) = default;
NumWorkgroupsFromUniform::Config::~Config() = default;
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/num_workgroups_from_uniform.h b/src/tint/transform/num_workgroups_from_uniform.h
index 0d20a02..4cbecb68 100644
--- a/src/tint/transform/num_workgroups_from_uniform.h
+++ b/src/tint/transform/num_workgroups_from_uniform.h
@@ -18,12 +18,12 @@
#include "src/tint/sem/binding_point.h"
#include "src/tint/transform/transform.h"
-namespace tint {
-
// Forward declarations
+namespace tint {
class CloneContext;
+}
-namespace transform {
+namespace tint::transform {
/// NumWorkgroupsFromUniform is a transform that implements the `num_workgroups`
/// builtin by loading it from a uniform buffer.
@@ -84,7 +84,6 @@
DataMap& outputs) const override;
};
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_NUM_WORKGROUPS_FROM_UNIFORM_H_
diff --git a/src/tint/transform/num_workgroups_from_uniform_test.cc b/src/tint/transform/num_workgroups_from_uniform_test.cc
index 6290d0b..734d11b 100644
--- a/src/tint/transform/num_workgroups_from_uniform_test.cc
+++ b/src/tint/transform/num_workgroups_from_uniform_test.cc
@@ -20,8 +20,7 @@
#include "src/tint/transform/test_helper.h"
#include "src/tint/transform/unshadow.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using NumWorkgroupsFromUniformTest = TransformTest;
@@ -452,5 +451,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/promote_initializers_to_const_var_test.cc b/src/tint/transform/promote_initializers_to_const_var_test.cc
index b99f965..87b9edc 100644
--- a/src/tint/transform/promote_initializers_to_const_var_test.cc
+++ b/src/tint/transform/promote_initializers_to_const_var_test.cc
@@ -16,8 +16,7 @@
#include "src/tint/transform/test_helper.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using PromoteInitializersToConstVarTest = TransformTest;
@@ -623,5 +622,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/promote_side_effects_to_decl_test.cc b/src/tint/transform/promote_side_effects_to_decl_test.cc
index 0f8c59a..299d706 100644
--- a/src/tint/transform/promote_side_effects_to_decl_test.cc
+++ b/src/tint/transform/promote_side_effects_to_decl_test.cc
@@ -16,8 +16,7 @@
#include "src/tint/transform/test_helper.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using PromoteSideEffectsToDeclTest = TransformTest;
@@ -4008,5 +4007,4 @@
EXPECT_EQ(expect, str(got));
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/remove_continue_in_switch_test.cc b/src/tint/transform/remove_continue_in_switch_test.cc
index cd485b0..70f167d 100644
--- a/src/tint/transform/remove_continue_in_switch_test.cc
+++ b/src/tint/transform/remove_continue_in_switch_test.cc
@@ -15,8 +15,7 @@
#include "src/tint/transform/remove_continue_in_switch.h"
#include "src/tint/transform/test_helper.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using RemoveContinueInSwitchTest = TransformTest;
@@ -561,5 +560,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/remove_phonies.cc b/src/tint/transform/remove_phonies.cc
index 35bad3f..9904e34 100644
--- a/src/tint/transform/remove_phonies.cc
+++ b/src/tint/transform/remove_phonies.cc
@@ -30,8 +30,7 @@
TINT_INSTANTIATE_TYPEINFO(tint::transform::RemovePhonies);
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
struct SinkSignature {
@@ -152,5 +151,4 @@
ctx.Clone();
}
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/remove_phonies.h b/src/tint/transform/remove_phonies.h
index 16de708..6e355f1 100644
--- a/src/tint/transform/remove_phonies.h
+++ b/src/tint/transform/remove_phonies.h
@@ -20,8 +20,7 @@
#include "src/tint/transform/transform.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// RemovePhonies is a Transform that removes all phony-assignment statements,
/// while preserving function call expressions in the RHS of the assignment that
@@ -52,7 +51,6 @@
DataMap& outputs) const override;
};
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_REMOVE_PHONIES_H_
diff --git a/src/tint/transform/remove_phonies_test.cc b/src/tint/transform/remove_phonies_test.cc
index dc6099c..e6faa3e 100644
--- a/src/tint/transform/remove_phonies_test.cc
+++ b/src/tint/transform/remove_phonies_test.cc
@@ -20,8 +20,7 @@
#include "src/tint/transform/test_helper.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using RemovePhoniesTest = TransformTest;
@@ -427,5 +426,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/remove_unreachable_statements.cc b/src/tint/transform/remove_unreachable_statements.cc
index fd56ef0..3e13ad7 100644
--- a/src/tint/transform/remove_unreachable_statements.cc
+++ b/src/tint/transform/remove_unreachable_statements.cc
@@ -30,8 +30,7 @@
TINT_INSTANTIATE_TYPEINFO(tint::transform::RemoveUnreachableStatements);
-namespace tint {
-namespace transform {
+namespace tint::transform {
RemoveUnreachableStatements::RemoveUnreachableStatements() = default;
@@ -63,5 +62,4 @@
ctx.Clone();
}
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/remove_unreachable_statements.h b/src/tint/transform/remove_unreachable_statements.h
index dfc9f15..a474efb 100644
--- a/src/tint/transform/remove_unreachable_statements.h
+++ b/src/tint/transform/remove_unreachable_statements.h
@@ -20,8 +20,7 @@
#include "src/tint/transform/transform.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// RemoveUnreachableStatements is a Transform that removes all statements
/// marked as unreachable.
@@ -52,7 +51,6 @@
DataMap& outputs) const override;
};
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_REMOVE_UNREACHABLE_STATEMENTS_H_
diff --git a/src/tint/transform/remove_unreachable_statements_test.cc b/src/tint/transform/remove_unreachable_statements_test.cc
index 4e5670f..43c1950 100644
--- a/src/tint/transform/remove_unreachable_statements_test.cc
+++ b/src/tint/transform/remove_unreachable_statements_test.cc
@@ -16,8 +16,7 @@
#include "src/tint/transform/test_helper.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using RemoveUnreachableStatementsTest = TransformTest;
@@ -567,5 +566,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/renamer_test.cc b/src/tint/transform/renamer_test.cc
index 70d4322..e3f9458 100644
--- a/src/tint/transform/renamer_test.cc
+++ b/src/tint/transform/renamer_test.cc
@@ -19,8 +19,7 @@
#include "gmock/gmock.h"
#include "src/tint/transform/test_helper.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
constexpr const char kUnicodeIdentifier[] = // "𝖎𝖉𝖊𝖓𝖙𝖎𝖋𝖎𝖊𝖗123"
@@ -1459,5 +1458,4 @@
kUnicodeIdentifier));
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/robustness.cc b/src/tint/transform/robustness.cc
index 44b5f72..4a67d49 100644
--- a/src/tint/transform/robustness.cc
+++ b/src/tint/transform/robustness.cc
@@ -28,8 +28,7 @@
TINT_INSTANTIATE_TYPEINFO(tint::transform::Robustness);
TINT_INSTANTIATE_TYPEINFO(tint::transform::Robustness::Config);
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// State holds the current transform state
struct Robustness::State {
@@ -316,5 +315,4 @@
ctx.Clone();
}
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/robustness.h b/src/tint/transform/robustness.h
index 733cf47..79ddf08 100644
--- a/src/tint/transform/robustness.h
+++ b/src/tint/transform/robustness.h
@@ -20,15 +20,12 @@
#include "src/tint/transform/transform.h"
// Forward declarations
-namespace tint {
-namespace ast {
+namespace tint::ast {
class IndexAccessorExpression;
class CallExpression;
-} // namespace ast
-} // namespace tint
+} // namespace tint::ast
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// This transform is responsible for clamping all array accesses to be within
/// the bounds of the array. Any access before the start of the array will clamp
@@ -82,7 +79,6 @@
struct State;
};
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_ROBUSTNESS_H_
diff --git a/src/tint/transform/robustness_test.cc b/src/tint/transform/robustness_test.cc
index 1e1dac6..db113b2 100644
--- a/src/tint/transform/robustness_test.cc
+++ b/src/tint/transform/robustness_test.cc
@@ -16,8 +16,7 @@
#include "src/tint/transform/test_helper.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using RobustnessTest = TransformTest;
@@ -1741,5 +1740,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/simplify_pointers.cc b/src/tint/transform/simplify_pointers.cc
index 715894b..4cc9391 100644
--- a/src/tint/transform/simplify_pointers.cc
+++ b/src/tint/transform/simplify_pointers.cc
@@ -28,8 +28,7 @@
TINT_INSTANTIATE_TYPEINFO(tint::transform::SimplifyPointers);
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
@@ -235,5 +234,4 @@
State(ctx).Run();
}
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/simplify_pointers.h b/src/tint/transform/simplify_pointers.h
index 39ebc26..3bd4950 100644
--- a/src/tint/transform/simplify_pointers.h
+++ b/src/tint/transform/simplify_pointers.h
@@ -17,8 +17,7 @@
#include "src/tint/transform/transform.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// SimplifyPointers is a Transform that moves all usage of function-scope
/// `let` statements of a pointer type into their places of usage, while also
@@ -54,7 +53,6 @@
DataMap& outputs) const override;
};
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_SIMPLIFY_POINTERS_H_
diff --git a/src/tint/transform/simplify_pointers_test.cc b/src/tint/transform/simplify_pointers_test.cc
index 0e9d44b..6266b6f 100644
--- a/src/tint/transform/simplify_pointers_test.cc
+++ b/src/tint/transform/simplify_pointers_test.cc
@@ -17,8 +17,7 @@
#include "src/tint/transform/test_helper.h"
#include "src/tint/transform/unshadow.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using SimplifyPointersTest = TransformTest;
@@ -366,5 +365,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/single_entry_point.cc b/src/tint/transform/single_entry_point.cc
index 62a6624..fe92483 100644
--- a/src/tint/transform/single_entry_point.cc
+++ b/src/tint/transform/single_entry_point.cc
@@ -24,8 +24,7 @@
TINT_INSTANTIATE_TYPEINFO(tint::transform::SingleEntryPoint);
TINT_INSTANTIATE_TYPEINFO(tint::transform::SingleEntryPoint::Config);
-namespace tint {
-namespace transform {
+namespace tint::transform {
SingleEntryPoint::SingleEntryPoint() = default;
@@ -113,5 +112,4 @@
SingleEntryPoint::Config& SingleEntryPoint::Config::operator=(const Config&) =
default;
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/single_entry_point.h b/src/tint/transform/single_entry_point.h
index 8780761..b5aed68 100644
--- a/src/tint/transform/single_entry_point.h
+++ b/src/tint/transform/single_entry_point.h
@@ -19,8 +19,7 @@
#include "src/tint/transform/transform.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// Strip all but one entry point a module.
///
@@ -66,7 +65,6 @@
DataMap& outputs) const override;
};
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_SINGLE_ENTRY_POINT_H_
diff --git a/src/tint/transform/single_entry_point_test.cc b/src/tint/transform/single_entry_point_test.cc
index b6a9d35..750f5c3 100644
--- a/src/tint/transform/single_entry_point_test.cc
+++ b/src/tint/transform/single_entry_point_test.cc
@@ -18,8 +18,7 @@
#include "src/tint/transform/test_helper.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using SingleEntryPointTest = TransformTest;
@@ -513,5 +512,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/test_helper.h b/src/tint/transform/test_helper.h
index 8a36df1..7d7015c 100644
--- a/src/tint/transform/test_helper.h
+++ b/src/tint/transform/test_helper.h
@@ -25,8 +25,7 @@
#include "src/tint/transform/manager.h"
#include "src/tint/writer/wgsl/generator.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// @param program the program to get an output WGSL string from
/// @returns the output program as a WGSL string, or an error string if the
@@ -148,7 +147,6 @@
template <typename T>
using TransformTestWithParam = TransformTestBase<testing::TestWithParam<T>>;
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_TEST_HELPER_H_
diff --git a/src/tint/transform/transform.cc b/src/tint/transform/transform.cc
index 2254ce4..018bc95 100644
--- a/src/tint/transform/transform.cc
+++ b/src/tint/transform/transform.cc
@@ -28,8 +28,7 @@
TINT_INSTANTIATE_TYPEINFO(tint::transform::Transform);
TINT_INSTANTIATE_TYPEINFO(tint::transform::Data);
-namespace tint {
-namespace transform {
+namespace tint::transform {
Data::Data() = default;
Data::Data(const Data&) = default;
@@ -156,5 +155,4 @@
return nullptr;
}
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/transform.h b/src/tint/transform/transform.h
index 199cb86..5051816 100644
--- a/src/tint/transform/transform.h
+++ b/src/tint/transform/transform.h
@@ -22,8 +22,7 @@
#include "src/tint/castable.h"
#include "src/tint/program.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// Data is the base class for transforms that accept extra input or emit extra
/// output information along with a Program.
@@ -193,7 +192,6 @@
const sem::Type* ty);
};
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_TRANSFORM_H_
diff --git a/src/tint/transform/transform_test.cc b/src/tint/transform/transform_test.cc
index 318778d..c100c09 100644
--- a/src/tint/transform/transform_test.cc
+++ b/src/tint/transform/transform_test.cc
@@ -18,8 +18,7 @@
#include "gtest/gtest.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
// Inherit from Transform so we have access to protected methods
@@ -119,5 +118,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/unshadow.cc b/src/tint/transform/unshadow.cc
index 017258f..9c28675 100644
--- a/src/tint/transform/unshadow.cc
+++ b/src/tint/transform/unshadow.cc
@@ -26,8 +26,7 @@
TINT_INSTANTIATE_TYPEINFO(tint::transform::Unshadow);
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// The PIMPL state for the Unshadow transform
struct Unshadow::State {
@@ -95,5 +94,4 @@
State(ctx).Run();
}
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/unshadow.h b/src/tint/transform/unshadow.h
index f8119a9..bfea677 100644
--- a/src/tint/transform/unshadow.h
+++ b/src/tint/transform/unshadow.h
@@ -17,8 +17,7 @@
#include "src/tint/transform/transform.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// Unshadow is a Transform that renames any variables that shadow another
/// variable.
@@ -44,7 +43,6 @@
DataMap& outputs) const override;
};
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_UNSHADOW_H_
diff --git a/src/tint/transform/unshadow_test.cc b/src/tint/transform/unshadow_test.cc
index 6ca1375..ccb9fba 100644
--- a/src/tint/transform/unshadow_test.cc
+++ b/src/tint/transform/unshadow_test.cc
@@ -16,8 +16,7 @@
#include "src/tint/transform/test_helper.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using UnshadowTest = TransformTest;
@@ -605,5 +604,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/unwind_discard_functions_test.cc b/src/tint/transform/unwind_discard_functions_test.cc
index ae0a1f1..0b8c0fc 100644
--- a/src/tint/transform/unwind_discard_functions_test.cc
+++ b/src/tint/transform/unwind_discard_functions_test.cc
@@ -16,8 +16,7 @@
#include "src/tint/transform/promote_side_effects_to_decl.h"
#include "src/tint/transform/test_helper.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using UnwindDiscardFunctionsTest = TransformTest;
@@ -1417,5 +1416,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/var_for_dynamic_index_test.cc b/src/tint/transform/var_for_dynamic_index_test.cc
index 2bd8a6e..a222ad7 100644
--- a/src/tint/transform/var_for_dynamic_index_test.cc
+++ b/src/tint/transform/var_for_dynamic_index_test.cc
@@ -17,8 +17,7 @@
#include "src/tint/transform/test_helper.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using VarForDynamicIndexTest = TransformTest;
@@ -549,5 +548,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/vectorize_scalar_matrix_constructors.cc b/src/tint/transform/vectorize_scalar_matrix_constructors.cc
index bccc50b..8af0272 100644
--- a/src/tint/transform/vectorize_scalar_matrix_constructors.cc
+++ b/src/tint/transform/vectorize_scalar_matrix_constructors.cc
@@ -23,8 +23,7 @@
TINT_INSTANTIATE_TYPEINFO(tint::transform::VectorizeScalarMatrixConstructors);
-namespace tint {
-namespace transform {
+namespace tint::transform {
VectorizeScalarMatrixConstructors::VectorizeScalarMatrixConstructors() =
default;
@@ -93,5 +92,4 @@
ctx.Clone();
}
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/vectorize_scalar_matrix_constructors.h b/src/tint/transform/vectorize_scalar_matrix_constructors.h
index 44754e1..f1abb4f 100644
--- a/src/tint/transform/vectorize_scalar_matrix_constructors.h
+++ b/src/tint/transform/vectorize_scalar_matrix_constructors.h
@@ -17,8 +17,7 @@
#include "src/tint/transform/transform.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// A transform that converts scalar matrix constructors to the vector form.
class VectorizeScalarMatrixConstructors
@@ -48,7 +47,6 @@
DataMap& outputs) const override;
};
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_VECTORIZE_SCALAR_MATRIX_CONSTRUCTORS_H_
diff --git a/src/tint/transform/vectorize_scalar_matrix_constructors_test.cc b/src/tint/transform/vectorize_scalar_matrix_constructors_test.cc
index d6d496c..edd68e2 100644
--- a/src/tint/transform/vectorize_scalar_matrix_constructors_test.cc
+++ b/src/tint/transform/vectorize_scalar_matrix_constructors_test.cc
@@ -20,8 +20,7 @@
#include "src/tint/transform/test_helper.h"
#include "src/tint/utils/string.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using VectorizeScalarMatrixConstructorsTest =
@@ -120,5 +119,4 @@
std::make_pair(4, 4)));
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/vertex_pulling.cc b/src/tint/transform/vertex_pulling.cc
index e0d3128..4200767 100644
--- a/src/tint/transform/vertex_pulling.cc
+++ b/src/tint/transform/vertex_pulling.cc
@@ -28,8 +28,7 @@
TINT_INSTANTIATE_TYPEINFO(tint::transform::VertexPulling);
TINT_INSTANTIATE_TYPEINFO(tint::transform::VertexPulling::Config);
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
@@ -958,5 +957,4 @@
VertexBufferLayoutDescriptor::~VertexBufferLayoutDescriptor() = default;
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/vertex_pulling.h b/src/tint/transform/vertex_pulling.h
index 95bc25d..ec0769b 100644
--- a/src/tint/transform/vertex_pulling.h
+++ b/src/tint/transform/vertex_pulling.h
@@ -22,8 +22,7 @@
#include "src/tint/transform/transform.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// Describes the format of data in a vertex buffer
enum class VertexFormat {
@@ -180,7 +179,6 @@
Config cfg_;
};
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_VERTEX_PULLING_H_
diff --git a/src/tint/transform/vertex_pulling_test.cc b/src/tint/transform/vertex_pulling_test.cc
index 313133d..3c19aa6 100644
--- a/src/tint/transform/vertex_pulling_test.cc
+++ b/src/tint/transform/vertex_pulling_test.cc
@@ -18,8 +18,7 @@
#include "src/tint/transform/test_helper.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using VertexPullingTest = TransformTest;
@@ -1286,5 +1285,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/wrap_arrays_in_structs.cc b/src/tint/transform/wrap_arrays_in_structs.cc
index f910497..7cf3fcb 100644
--- a/src/tint/transform/wrap_arrays_in_structs.cc
+++ b/src/tint/transform/wrap_arrays_in_structs.cc
@@ -26,8 +26,7 @@
TINT_INSTANTIATE_TYPEINFO(tint::transform::WrapArraysInStructs);
-namespace tint {
-namespace transform {
+namespace tint::transform {
WrapArraysInStructs::WrappedArrayInfo::WrappedArrayInfo() = default;
WrapArraysInStructs::WrappedArrayInfo::WrappedArrayInfo(
@@ -167,5 +166,4 @@
});
}
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/wrap_arrays_in_structs.h b/src/tint/transform/wrap_arrays_in_structs.h
index 0d97a44..a256ff8 100644
--- a/src/tint/transform/wrap_arrays_in_structs.h
+++ b/src/tint/transform/wrap_arrays_in_structs.h
@@ -21,14 +21,11 @@
#include "src/tint/transform/transform.h"
// Forward declarations
-namespace tint {
-namespace ast {
+namespace tint::ast {
class Type;
-} // namespace ast
-} // namespace tint
+} // namespace tint::ast
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// WrapArraysInStructs is a transform that replaces all array types with a
/// structure holding a single field of that array type.
@@ -89,7 +86,6 @@
const sem::Array* array) const;
};
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_WRAP_ARRAYS_IN_STRUCTS_H_
diff --git a/src/tint/transform/wrap_arrays_in_structs_test.cc b/src/tint/transform/wrap_arrays_in_structs_test.cc
index 7627484..7ba884c 100644
--- a/src/tint/transform/wrap_arrays_in_structs_test.cc
+++ b/src/tint/transform/wrap_arrays_in_structs_test.cc
@@ -19,8 +19,7 @@
#include "src/tint/transform/test_helper.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using WrapArraysInStructsTest = TransformTest;
@@ -420,5 +419,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/zero_init_workgroup_memory.cc b/src/tint/transform/zero_init_workgroup_memory.cc
index e051988..8441e17 100644
--- a/src/tint/transform/zero_init_workgroup_memory.cc
+++ b/src/tint/transform/zero_init_workgroup_memory.cc
@@ -30,8 +30,7 @@
TINT_INSTANTIATE_TYPEINFO(tint::transform::ZeroInitWorkgroupMemory);
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// PIMPL state for the ZeroInitWorkgroupMemory transform
struct ZeroInitWorkgroupMemory::State {
@@ -457,5 +456,4 @@
ctx.Clone();
}
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
diff --git a/src/tint/transform/zero_init_workgroup_memory.h b/src/tint/transform/zero_init_workgroup_memory.h
index 6069b12..33ae52c 100644
--- a/src/tint/transform/zero_init_workgroup_memory.h
+++ b/src/tint/transform/zero_init_workgroup_memory.h
@@ -17,8 +17,7 @@
#include "src/tint/transform/transform.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
/// ZeroInitWorkgroupMemory is a transform that injects code at the top of entry
/// points to zero-initialize workgroup memory used by that entry point (and all
@@ -53,7 +52,6 @@
struct State;
};
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
#endif // SRC_TINT_TRANSFORM_ZERO_INIT_WORKGROUP_MEMORY_H_
diff --git a/src/tint/transform/zero_init_workgroup_memory_test.cc b/src/tint/transform/zero_init_workgroup_memory_test.cc
index cfe4647..32c73db 100644
--- a/src/tint/transform/zero_init_workgroup_memory_test.cc
+++ b/src/tint/transform/zero_init_workgroup_memory_test.cc
@@ -18,8 +18,7 @@
#include "src/tint/transform/test_helper.h"
-namespace tint {
-namespace transform {
+namespace tint::transform {
namespace {
using ZeroInitWorkgroupMemoryTest = TransformTest;
@@ -1377,5 +1376,4 @@
}
} // namespace
-} // namespace transform
-} // namespace tint
+} // namespace tint::transform
