commit f63bde80e20afb7f74dd12bf62b9a019e1b80e1c
author Stephan Pleines <pleines.stephan@gmail.com> Sat Jan 13 15:59:33 2024 -0800
committer Stephan Pleines <pleines.stephan@gmail.com> Fri Jan 19 18:06:09 2024 -0800
tree e485ef4a1d17d6195afba27dc30a583ec1c4ad68
parent d52f12d58b38919209076dfdff1b8292857bfa47

Nest all namespaces

The compiler supports this now.  We can type less going forward.
No functional changes.

Signed-off-by: Stephan Pleines <pleines.stephan@gmail.com>
Change-Id: I29d6fa4f9aacc0e381f1a7637294db0392466995

y2023_bot4/constants.cc

diff --git a/y2023_bot4/constants.cc b/y2023_bot4/constants.cc
index aab1935..701308d 100644
--- a/y2023_bot4/constants.cc
+++ b/y2023_bot4/constants.cc
@@ -6,8 +6,7 @@
 
 #include "aos/network/team_number.h"
 
-namespace y2023_bot4 {
-namespace constants {
+namespace y2023_bot4::constants {
 Values MakeValues(uint16_t team) {
   LOG(INFO) << "creating a Constants for team: " << team;
   Values r;
@@ -48,5 +47,4 @@
 }
 
 Values MakeValues() { return MakeValues(aos::network::GetTeamNumber()); }
-}  // namespace constants
-}  // namespace y2023_bot4
+}  // namespace y2023_bot4::constants

y2023_bot4/swerve_publisher_lib_test.cc

diff --git a/y2023_bot4/swerve_publisher_lib_test.cc b/y2023_bot4/swerve_publisher_lib_test.cc
index 817f295..e834659 100644
--- a/y2023_bot4/swerve_publisher_lib_test.cc
+++ b/y2023_bot4/swerve_publisher_lib_test.cc
@@ -4,8 +4,7 @@
 
 #include "aos/events/simulated_event_loop.h"
 
-namespace y2023_bot4 {
-namespace testing {
+namespace y2023_bot4::testing {
 class SwervePublisherTest : public ::testing::Test {
  public:
   SwervePublisherTest()
@@ -50,5 +49,4 @@
   SendOutput();
   CheckOutput();
 }
-}  // namespace testing
-}  // namespace y2023_bot4
+}  // namespace y2023_bot4::testing

y2023_bot4/wpilib_interface.cc

diff --git a/y2023_bot4/wpilib_interface.cc b/y2023_bot4/wpilib_interface.cc
index 9dd3604..e5b5a6f 100644
--- a/y2023_bot4/wpilib_interface.cc
+++ b/y2023_bot4/wpilib_interface.cc
@@ -24,8 +24,7 @@
 
 namespace drivetrain = frc971::control_loops::drivetrain;
 
-namespace y2023_bot4 {
-namespace wpilib {
+namespace y2023_bot4::wpilib {
 namespace {
 
 template <class T>
@@ -304,7 +303,6 @@
   }
 };
 
-}  // namespace wpilib
-}  // namespace y2023_bot4
+}  // namespace y2023_bot4::wpilib
 
 AOS_ROBOT_CLASS(::y2023_bot4::wpilib::WPILibRobot)