Condense namespaces in tint/resolver.
This PR condenses the namespaces in the tint/resolver folder.
Change-Id: I7ed4d677a3d1dd39a672fc2d4e6721a6a4f6157d
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/86031
Commit-Queue: Dan Sinclair <dsinclair@chromium.org>
Auto-Submit: Dan Sinclair <dsinclair@chromium.org>
Reviewed-by: Ben Clayton <bclayton@google.com>
Commit-Queue: Ben Clayton <bclayton@google.com>
diff --git a/src/tint/resolver/array_accessor_test.cc b/src/tint/resolver/array_accessor_test.cc
index 4ccf8e2..e506f23 100644
--- a/src/tint/resolver/array_accessor_test.cc
+++ b/src/tint/resolver/array_accessor_test.cc
@@ -18,8 +18,7 @@
#include "src/tint/resolver/resolver_test_helper.h"
#include "src/tint/sem/reference_type.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
using ResolverIndexAccessorTest = ResolverTest;
@@ -308,5 +307,4 @@
}
} // namespace
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/assignment_validation_test.cc b/src/tint/resolver/assignment_validation_test.cc
index 3e8f7e6..cc2519a 100644
--- a/src/tint/resolver/assignment_validation_test.cc
+++ b/src/tint/resolver/assignment_validation_test.cc
@@ -18,8 +18,7 @@
#include "src/tint/resolver/resolver_test_helper.h"
#include "src/tint/sem/storage_texture_type.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
using ResolverAssignmentValidationTest = ResolverTest;
@@ -389,5 +388,4 @@
}
} // namespace
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/atomics_test.cc b/src/tint/resolver/atomics_test.cc
index 0d3b51f..02f800d 100644
--- a/src/tint/resolver/atomics_test.cc
+++ b/src/tint/resolver/atomics_test.cc
@@ -19,8 +19,7 @@
#include "gmock/gmock.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
struct ResolverAtomicTest : public resolver::TestHelper,
@@ -69,5 +68,4 @@
}
} // namespace
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/atomics_validation_test.cc b/src/tint/resolver/atomics_validation_test.cc
index c241da1..5e9668f 100644
--- a/src/tint/resolver/atomics_validation_test.cc
+++ b/src/tint/resolver/atomics_validation_test.cc
@@ -19,8 +19,7 @@
#include "gmock/gmock.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
struct ResolverAtomicValidationTest : public resolver::TestHelper,
@@ -334,5 +333,4 @@
}
} // namespace
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/attribute_validation_test.cc b/src/tint/resolver/attribute_validation_test.cc
index 1ad15f9..3b8781b 100644
--- a/src/tint/resolver/attribute_validation_test.cc
+++ b/src/tint/resolver/attribute_validation_test.cc
@@ -19,8 +19,7 @@
#include "gmock/gmock.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
// Helpers and typedefs
template <typename T>
@@ -1367,5 +1366,4 @@
} // namespace
} // namespace InterpolateTests
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/bitcast_validation_test.cc b/src/tint/resolver/bitcast_validation_test.cc
index d13ffd9..b7b7e9e 100644
--- a/src/tint/resolver/bitcast_validation_test.cc
+++ b/src/tint/resolver/bitcast_validation_test.cc
@@ -18,8 +18,7 @@
#include "gmock/gmock.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
struct Type {
@@ -224,5 +223,4 @@
testing::ValuesIn(kNumericScalars)));
} // namespace
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/builtin_test.cc b/src/tint/resolver/builtin_test.cc
index 49ca147..732e707 100644
--- a/src/tint/resolver/builtin_test.cc
+++ b/src/tint/resolver/builtin_test.cc
@@ -39,8 +39,7 @@
using ::testing::ElementsAre;
using ::testing::HasSubstr;
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
using BuiltinType = sem::BuiltinType;
@@ -1987,5 +1986,4 @@
}
} // namespace
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/builtin_validation_test.cc b/src/tint/resolver/builtin_validation_test.cc
index 0ed2f50..df6a0a9 100644
--- a/src/tint/resolver/builtin_validation_test.cc
+++ b/src/tint/resolver/builtin_validation_test.cc
@@ -15,8 +15,7 @@
#include "src/tint/ast/builtin_texture_helper_test.h"
#include "src/tint/resolver/resolver_test_helper.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
using ResolverBuiltinValidationTest = ResolverTest;
@@ -398,5 +397,4 @@
} // namespace texture_constexpr_args
} // namespace
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/builtins_validation_test.cc b/src/tint/resolver/builtins_validation_test.cc
index 7fd5bd6..4defd2c 100644
--- a/src/tint/resolver/builtins_validation_test.cc
+++ b/src/tint/resolver/builtins_validation_test.cc
@@ -15,8 +15,7 @@
#include "src/tint/ast/call_statement.h"
#include "src/tint/resolver/resolver_test_helper.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
template <typename T>
@@ -1288,5 +1287,4 @@
"pack2x16float"));
} // namespace
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/call_test.cc b/src/tint/resolver/call_test.cc
index 038654d..20c80bc 100644
--- a/src/tint/resolver/call_test.cc
+++ b/src/tint/resolver/call_test.cc
@@ -18,8 +18,7 @@
#include "src/tint/ast/call_statement.h"
#include "src/tint/resolver/resolver_test_helper.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
// Helpers and typedefs
template <typename T>
@@ -114,5 +113,4 @@
}
} // namespace
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/call_validation_test.cc b/src/tint/resolver/call_validation_test.cc
index c8be5e4..56cc348 100644
--- a/src/tint/resolver/call_validation_test.cc
+++ b/src/tint/resolver/call_validation_test.cc
@@ -18,8 +18,7 @@
#include "src/tint/ast/call_statement.h"
#include "src/tint/resolver/resolver_test_helper.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
using ResolverCallValidationTest = ResolverTest;
@@ -284,5 +283,4 @@
}
} // namespace
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/compound_assignment_validation_test.cc b/src/tint/resolver/compound_assignment_validation_test.cc
index 06ff43c..740643c 100644
--- a/src/tint/resolver/compound_assignment_validation_test.cc
+++ b/src/tint/resolver/compound_assignment_validation_test.cc
@@ -18,8 +18,7 @@
#include "src/tint/resolver/resolver_test_helper.h"
#include "src/tint/sem/storage_texture_type.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
using ResolverCompoundAssignmentValidationTest = ResolverTest;
@@ -296,5 +295,4 @@
}
} // namespace
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/compound_statement_test.cc b/src/tint/resolver/compound_statement_test.cc
index bf130ca..29c0384 100644
--- a/src/tint/resolver/compound_statement_test.cc
+++ b/src/tint/resolver/compound_statement_test.cc
@@ -22,8 +22,7 @@
#include "src/tint/sem/loop_statement.h"
#include "src/tint/sem/switch_statement.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
using ResolverCompoundStatementTest = ResolverTest;
@@ -376,5 +375,4 @@
}
} // namespace
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/control_block_validation_test.cc b/src/tint/resolver/control_block_validation_test.cc
index 9406da4..fdb2059 100644
--- a/src/tint/resolver/control_block_validation_test.cc
+++ b/src/tint/resolver/control_block_validation_test.cc
@@ -18,10 +18,10 @@
#include "src/tint/ast/switch_statement.h"
#include "src/tint/resolver/resolver_test_helper.h"
-namespace tint {
+namespace tint::resolver {
namespace {
-class ResolverControlBlockValidationTest : public resolver::TestHelper,
+class ResolverControlBlockValidationTest : public TestHelper,
public testing::Test {};
TEST_F(ResolverControlBlockValidationTest,
@@ -361,4 +361,4 @@
}
} // namespace
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/dependency_graph.cc b/src/tint/resolver/dependency_graph.cc
index be83f73..fd71ebe 100644
--- a/src/tint/resolver/dependency_graph.cc
+++ b/src/tint/resolver/dependency_graph.cc
@@ -32,8 +32,7 @@
#define TINT_DUMP_DEPENDENCY_GRAPH 0
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
// Forward declaration
@@ -738,5 +737,4 @@
return da.Run(module);
}
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/dependency_graph.h b/src/tint/resolver/dependency_graph.h
index a943708..e8042f1 100644
--- a/src/tint/resolver/dependency_graph.h
+++ b/src/tint/resolver/dependency_graph.h
@@ -21,8 +21,7 @@
#include "src/tint/ast/module.h"
#include "src/tint/diagnostic/diagnostic.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
/// DependencyGraph holds information about module-scope declaration dependency
/// analysis and symbol resolutions.
@@ -60,7 +59,6 @@
std::unordered_map<const ast::Variable*, const ast::Node*> shadows;
};
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
#endif // SRC_TINT_RESOLVER_DEPENDENCY_GRAPH_H_
diff --git a/src/tint/resolver/dependency_graph_test.cc b/src/tint/resolver/dependency_graph_test.cc
index 032d2ad..606fc59 100644
--- a/src/tint/resolver/dependency_graph_test.cc
+++ b/src/tint/resolver/dependency_graph_test.cc
@@ -20,8 +20,7 @@
#include "src/tint/resolver/dependency_graph.h"
#include "src/tint/resolver/resolver_test_helper.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
using ::testing::ElementsAre;
@@ -1338,5 +1337,4 @@
} // namespace ast_traversal
} // namespace
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/entry_point_validation_test.cc b/src/tint/resolver/entry_point_validation_test.cc
index b8a83e6..8458a10 100644
--- a/src/tint/resolver/entry_point_validation_test.cc
+++ b/src/tint/resolver/entry_point_validation_test.cc
@@ -21,8 +21,7 @@
#include "gmock/gmock.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
// Helpers and typedefs
@@ -793,5 +792,4 @@
} // namespace LocationAttributeTests
} // namespace
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/function_validation_test.cc b/src/tint/resolver/function_validation_test.cc
index cb33381..d694f0e 100644
--- a/src/tint/resolver/function_validation_test.cc
+++ b/src/tint/resolver/function_validation_test.cc
@@ -20,10 +20,10 @@
#include "gmock/gmock.h"
-namespace tint {
+namespace tint::resolver {
namespace {
-class ResolverFunctionValidationTest : public resolver::TestHelper,
+class ResolverFunctionValidationTest : public TestHelper,
public testing::Test {};
TEST_F(ResolverFunctionValidationTest, DuplicateParameterName) {
@@ -793,7 +793,7 @@
bool should_pass;
};
-struct TestWithParams : resolver::ResolverTestWithParam<TestParams> {};
+struct TestWithParams : ResolverTestWithParam<TestParams> {};
using ResolverFunctionParameterValidationTest = TestWithParams;
TEST_P(ResolverFunctionParameterValidationTest, StorageClass) {
@@ -827,4 +827,4 @@
TestParams{ast::StorageClass::kFunction, true}));
} // namespace
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/host_shareable_validation_test.cc b/src/tint/resolver/host_shareable_validation_test.cc
index d01470d..80254f6 100644
--- a/src/tint/resolver/host_shareable_validation_test.cc
+++ b/src/tint/resolver/host_shareable_validation_test.cc
@@ -18,8 +18,7 @@
#include "src/tint/resolver/resolver_test_helper.h"
#include "src/tint/sem/struct.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
using ResolverHostShareableValidationTest = ResolverTest;
@@ -141,5 +140,4 @@
}
} // namespace
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/inferred_type_test.cc b/src/tint/resolver/inferred_type_test.cc
index 676ca68..32ed284 100644
--- a/src/tint/resolver/inferred_type_test.cc
+++ b/src/tint/resolver/inferred_type_test.cc
@@ -17,8 +17,7 @@
#include "gmock/gmock.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
// Helpers and typedefs
@@ -171,5 +170,4 @@
}
} // namespace
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/is_host_shareable_test.cc b/src/tint/resolver/is_host_shareable_test.cc
index c7069d7..df28e72 100644
--- a/src/tint/resolver/is_host_shareable_test.cc
+++ b/src/tint/resolver/is_host_shareable_test.cc
@@ -18,8 +18,7 @@
#include "src/tint/resolver/resolver_test_helper.h"
#include "src/tint/sem/atomic_type.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
using ResolverIsHostShareable = ResolverTest;
@@ -120,5 +119,4 @@
// Note: Structure tests covered in host_shareable_validation_test.cc
} // namespace
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/is_storeable_test.cc b/src/tint/resolver/is_storeable_test.cc
index 739ae22..c9691f7 100644
--- a/src/tint/resolver/is_storeable_test.cc
+++ b/src/tint/resolver/is_storeable_test.cc
@@ -18,8 +18,7 @@
#include "src/tint/resolver/resolver_test_helper.h"
#include "src/tint/sem/atomic_type.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
using ResolverIsStorableTest = ResolverTest;
@@ -136,5 +135,4 @@
}
} // namespace
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/pipeline_overridable_constant_test.cc b/src/tint/resolver/pipeline_overridable_constant_test.cc
index 9672174..222a5c0 100644
--- a/src/tint/resolver/pipeline_overridable_constant_test.cc
+++ b/src/tint/resolver/pipeline_overridable_constant_test.cc
@@ -16,8 +16,7 @@
#include "src/tint/resolver/resolver_test_helper.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
class ResolverPipelineOverridableConstantTest : public ResolverTest {
@@ -104,5 +103,4 @@
}
} // namespace
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/ptr_ref_test.cc b/src/tint/resolver/ptr_ref_test.cc
index 1a1e83c..f19f964 100644
--- a/src/tint/resolver/ptr_ref_test.cc
+++ b/src/tint/resolver/ptr_ref_test.cc
@@ -18,8 +18,7 @@
#include "gmock/gmock.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
struct ResolverPtrRefTest : public resolver::TestHelper,
@@ -120,5 +119,4 @@
}
} // namespace
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/ptr_ref_validation_test.cc b/src/tint/resolver/ptr_ref_validation_test.cc
index ccc3991..f86f6e2 100644
--- a/src/tint/resolver/ptr_ref_validation_test.cc
+++ b/src/tint/resolver/ptr_ref_validation_test.cc
@@ -19,8 +19,7 @@
#include "gmock/gmock.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
struct ResolverPtrRefValidationTest : public resolver::TestHelper,
@@ -170,5 +169,4 @@
}
} // namespace
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/resolver.cc b/src/tint/resolver/resolver.cc
index befbd8b..9d125e7 100644
--- a/src/tint/resolver/resolver.cc
+++ b/src/tint/resolver/resolver.cc
@@ -79,8 +79,7 @@
#include "src/tint/utils/scoped_assignment.h"
#include "src/tint/utils/transform.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
Resolver::Resolver(ProgramBuilder* builder)
: builder_(builder),
@@ -518,7 +517,7 @@
[&](sem::LocalVariable* local) { local->SetShadows(Sem(it.second)); },
[&](sem::Parameter* param) { param->SetShadows(Sem(it.second)); });
}
-} // namespace resolver
+}
sem::GlobalVariable* Resolver::GlobalVariable(const ast::Variable* var) {
auto* sem = Variable(var, VariableKind::kGlobal);
@@ -2928,5 +2927,4 @@
return utils::Hash(sig.type, sig.parameters);
}
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/resolver.h b/src/tint/resolver/resolver.h
index e257682..850eb95 100644
--- a/src/tint/resolver/resolver.h
+++ b/src/tint/resolver/resolver.h
@@ -35,9 +35,8 @@
#include "src/tint/utils/map.h"
#include "src/tint/utils/unique_vector.h"
-namespace tint {
-
// Forward declarations
+namespace tint {
namespace ast {
class IndexAccessorExpression;
class BinaryExpression;
@@ -69,8 +68,9 @@
class SwitchStatement;
class TypeConstructor;
} // namespace sem
+} // namespace tint
-namespace resolver {
+namespace tint::resolver {
/// Resolves types for all items in the given tint program
class Resolver {
@@ -551,7 +551,6 @@
sem::BlockStatement* current_block_ = nullptr;
};
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
#endif // SRC_TINT_RESOLVER_RESOLVER_H_
diff --git a/src/tint/resolver/resolver_behavior_test.cc b/src/tint/resolver/resolver_behavior_test.cc
index 7cc6cb1..af0c9ce 100644
--- a/src/tint/resolver/resolver_behavior_test.cc
+++ b/src/tint/resolver/resolver_behavior_test.cc
@@ -20,8 +20,7 @@
#include "src/tint/sem/for_loop_statement.h"
#include "src/tint/sem/if_statement.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
class ResolverBehaviorTest : public ResolverTest {
@@ -655,5 +654,4 @@
}
} // namespace
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/resolver_constants.cc b/src/tint/resolver/resolver_constants.cc
index a83ae73..85f0abd 100644
--- a/src/tint/resolver/resolver_constants.cc
+++ b/src/tint/resolver/resolver_constants.cc
@@ -18,8 +18,7 @@
#include "src/tint/sem/type_constructor.h"
#include "src/tint/utils/map.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
using i32 = ProgramBuilder::i32;
@@ -140,5 +139,4 @@
return sem::Constant(target_type, elems);
}
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/resolver_constants_test.cc b/src/tint/resolver/resolver_constants_test.cc
index 6d06bef..b3a1be7 100644
--- a/src/tint/resolver/resolver_constants_test.cc
+++ b/src/tint/resolver/resolver_constants_test.cc
@@ -18,8 +18,7 @@
#include "src/tint/resolver/resolver_test_helper.h"
#include "src/tint/sem/expression.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
using Scalar = sem::Constant::Scalar;
@@ -429,5 +428,4 @@
}
} // namespace
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/resolver_test.cc b/src/tint/resolver/resolver_test.cc
index e9b55f8..e7c2fb4 100644
--- a/src/tint/resolver/resolver_test.cc
+++ b/src/tint/resolver/resolver_test.cc
@@ -47,8 +47,7 @@
using ::testing::ElementsAre;
using ::testing::HasSubstr;
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
// Helpers and typedefs
@@ -2179,5 +2178,4 @@
}
} // namespace
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/resolver_test_helper.cc b/src/tint/resolver/resolver_test_helper.cc
index aea14cf..dd590d9 100644
--- a/src/tint/resolver/resolver_test_helper.cc
+++ b/src/tint/resolver/resolver_test_helper.cc
@@ -16,12 +16,10 @@
#include <memory>
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
TestHelper::TestHelper() : resolver_(std::make_unique<Resolver>(this)) {}
TestHelper::~TestHelper() = default;
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/resolver_test_helper.h b/src/tint/resolver/resolver_test_helper.h
index 74c7eb3..236b854 100644
--- a/src/tint/resolver/resolver_test_helper.h
+++ b/src/tint/resolver/resolver_test_helper.h
@@ -26,8 +26,7 @@
#include "src/tint/sem/statement.h"
#include "src/tint/sem/variable.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
/// Helper class for testing
class TestHelper : public ProgramBuilder {
@@ -483,7 +482,6 @@
} // namespace builder
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
#endif // SRC_TINT_RESOLVER_RESOLVER_TEST_HELPER_H_
diff --git a/src/tint/resolver/resolver_validation.cc b/src/tint/resolver/resolver_validation.cc
index fb018d6..708a4fa 100644
--- a/src/tint/resolver/resolver_validation.cc
+++ b/src/tint/resolver/resolver_validation.cc
@@ -77,8 +77,7 @@
#include "src/tint/utils/scoped_assignment.h"
#include "src/tint/utils/transform.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
bool IsValidStorageTextureDimension(ast::TextureDimension dim) {
@@ -2426,5 +2425,4 @@
return !IsValidationDisabled(attributes, validation);
}
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/storage_class_layout_validation_test.cc b/src/tint/resolver/storage_class_layout_validation_test.cc
index 103948c..23d4c87 100644
--- a/src/tint/resolver/storage_class_layout_validation_test.cc
+++ b/src/tint/resolver/storage_class_layout_validation_test.cc
@@ -17,8 +17,7 @@
#include "gmock/gmock.h"
#include "src/tint/resolver/resolver_test_helper.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
using ResolverStorageClassLayoutValidationTest = ResolverTest;
@@ -539,5 +538,4 @@
}
} // namespace
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/storage_class_validation_test.cc b/src/tint/resolver/storage_class_validation_test.cc
index 2afab8c..1173578 100644
--- a/src/tint/resolver/storage_class_validation_test.cc
+++ b/src/tint/resolver/storage_class_validation_test.cc
@@ -18,8 +18,7 @@
#include "src/tint/resolver/resolver_test_helper.h"
#include "src/tint/sem/struct.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
using ResolverStorageClassValidationTest = ResolverTest;
@@ -360,5 +359,4 @@
}
} // namespace
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/struct_layout_test.cc b/src/tint/resolver/struct_layout_test.cc
index e2b017f..7c2f450 100644
--- a/src/tint/resolver/struct_layout_test.cc
+++ b/src/tint/resolver/struct_layout_test.cc
@@ -18,8 +18,7 @@
#include "src/tint/resolver/resolver_test_helper.h"
#include "src/tint/sem/struct.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
using ResolverStructLayoutTest = ResolverTest;
@@ -401,5 +400,4 @@
}
} // namespace
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/struct_pipeline_stage_use_test.cc b/src/tint/resolver/struct_pipeline_stage_use_test.cc
index e13b5f2..b843cea 100644
--- a/src/tint/resolver/struct_pipeline_stage_use_test.cc
+++ b/src/tint/resolver/struct_pipeline_stage_use_test.cc
@@ -21,8 +21,7 @@
using ::testing::UnorderedElementsAre;
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
using ResolverPipelineStageUseTest = ResolverTest;
@@ -187,5 +186,4 @@
}
} // namespace
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/struct_storage_class_use_test.cc b/src/tint/resolver/struct_storage_class_use_test.cc
index 55a1330..bc7e7a0 100644
--- a/src/tint/resolver/struct_storage_class_use_test.cc
+++ b/src/tint/resolver/struct_storage_class_use_test.cc
@@ -20,8 +20,7 @@
using ::testing::UnorderedElementsAre;
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
using ResolverStorageClassUseTest = ResolverTest;
@@ -191,5 +190,4 @@
}
} // namespace
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/type_constructor_validation_test.cc b/src/tint/resolver/type_constructor_validation_test.cc
index 21bc698..07bc95e 100644
--- a/src/tint/resolver/type_constructor_validation_test.cc
+++ b/src/tint/resolver/type_constructor_validation_test.cc
@@ -18,8 +18,7 @@
#include "src/tint/sem/type_constructor.h"
#include "src/tint/sem/type_conversion.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
using ::testing::HasSubstr;
@@ -2933,5 +2932,4 @@
}
} // namespace
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/type_validation_test.cc b/src/tint/resolver/type_validation_test.cc
index 64f0658..dadd7d2 100644
--- a/src/tint/resolver/type_validation_test.cc
+++ b/src/tint/resolver/type_validation_test.cc
@@ -22,8 +22,7 @@
#include "gmock/gmock.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
// Helpers and typedefs
@@ -1154,5 +1153,4 @@
} // namespace VectorTests
} // namespace
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/validation_test.cc b/src/tint/resolver/validation_test.cc
index dbf8115..8b89f99 100644
--- a/src/tint/resolver/validation_test.cc
+++ b/src/tint/resolver/validation_test.cc
@@ -41,8 +41,7 @@
using ::testing::ElementsAre;
using ::testing::HasSubstr;
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
using ResolverValidationTest = ResolverTest;
@@ -1313,8 +1312,7 @@
}
} // namespace
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
TINT_INSTANTIATE_TYPEINFO(tint::resolver::FakeStmt);
TINT_INSTANTIATE_TYPEINFO(tint::resolver::FakeExpr);
diff --git a/src/tint/resolver/var_let_test.cc b/src/tint/resolver/var_let_test.cc
index 0d47712..2ace933 100644
--- a/src/tint/resolver/var_let_test.cc
+++ b/src/tint/resolver/var_let_test.cc
@@ -18,8 +18,7 @@
#include "gmock/gmock.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
struct ResolverVarLetTest : public resolver::TestHelper,
@@ -693,5 +692,4 @@
}
} // namespace
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
diff --git a/src/tint/resolver/var_let_validation_test.cc b/src/tint/resolver/var_let_validation_test.cc
index 2d26988..6b86529 100644
--- a/src/tint/resolver/var_let_validation_test.cc
+++ b/src/tint/resolver/var_let_validation_test.cc
@@ -17,8 +17,7 @@
#include "gmock/gmock.h"
-namespace tint {
-namespace resolver {
+namespace tint::resolver {
namespace {
struct ResolverVarLetValidationTest : public resolver::TestHelper,
@@ -345,5 +344,4 @@
}
} // namespace
-} // namespace resolver
-} // namespace tint
+} // namespace tint::resolver
