clang-tidy: modernize-concat-nested-namespaces (NFC)

This commit is contained in:
Peter Johnson
2020-12-28 01:19:59 -08:00
parent 67e03e625d
commit 6131f4e32b
162 changed files with 324 additions and 656 deletions

View File

@@ -6,9 +6,8 @@
#include <wpi/SmallVector.h>
namespace frc {
/** WPILib FileSystem namespace */
namespace filesystem {
namespace frc::filesystem {
/**
* Obtains the current working path that the program was launched with.
@@ -37,5 +36,4 @@ void GetOperatingDirectory(wpi::SmallVectorImpl<char>& result);
*/
void GetDeployDirectory(wpi::SmallVectorImpl<char>& result);
} // namespace filesystem
} // namespace frc
} // namespace frc::filesystem

View File

@@ -14,8 +14,7 @@
#include "frc/shuffleboard/ShuffleboardEventImportance.h"
namespace frc {
namespace detail {
namespace frc::detail {
class RecordingController final {
public:
@@ -36,5 +35,4 @@ class RecordingController final {
std::shared_ptr<nt::NetworkTable> m_eventsTable;
};
} // namespace detail
} // namespace frc
} // namespace frc::detail

View File

@@ -9,8 +9,7 @@
#include "frc/shuffleboard/ShuffleboardRoot.h"
#include "frc/shuffleboard/ShuffleboardTab.h"
namespace frc {
namespace detail {
namespace frc::detail {
class ShuffleboardInstance final : public ShuffleboardRoot {
public:
@@ -37,5 +36,4 @@ class ShuffleboardInstance final : public ShuffleboardRoot {
std::unique_ptr<Impl> m_impl;
};
} // namespace detail
} // namespace frc
} // namespace frc::detail

View File

@@ -9,8 +9,7 @@
#include <hal/Value.h>
#include <wpi/StringRef.h>
namespace frc {
namespace sim {
namespace frc::sim {
using NotifyCallback = std::function<void(wpi::StringRef, const HAL_Value*)>;
using ConstBufferCallback = std::function<void(
@@ -73,5 +72,4 @@ class CallbackStore {
enum CancelType { Normal, Channel, NoIndex };
CancelType cancelType;
};
} // namespace sim
} // namespace frc
} // namespace frc::sim

View File

@@ -11,8 +11,7 @@
#include "frc/DriverStation.h"
#include "frc/simulation/CallbackStore.h"
namespace frc {
namespace sim {
namespace frc::sim {
/**
* Class to control a simulated driver station.
@@ -241,5 +240,4 @@ class DriverStationSim {
static void ResetData();
};
} // namespace sim
} // namespace frc
} // namespace frc::sim

View File

@@ -11,8 +11,7 @@
#include "frc/simulation/CallbackStore.h"
namespace frc {
namespace sim {
namespace frc::sim {
/**
* Class to control a simulated RoboRIO.
@@ -126,5 +125,4 @@ class RoboRioSim {
static void ResetData();
};
} // namespace sim
} // namespace frc
} // namespace frc::sim

View File

@@ -8,8 +8,7 @@
#include "frc/simulation/CallbackStore.h"
namespace frc {
namespace sim {
namespace frc::sim {
class SPIAccelerometerSim {
public:
explicit SPIAccelerometerSim(int index);
@@ -54,5 +53,4 @@ class SPIAccelerometerSim {
private:
int m_index;
};
} // namespace sim
} // namespace frc
} // namespace frc::sim

View File

@@ -11,8 +11,7 @@
#include <hal/SimDevice.h>
#include <hal/simulation/SimDeviceData.h>
namespace frc {
namespace sim {
namespace frc::sim {
/**
* Class to control the simulation side of a SimDevice.
@@ -62,5 +61,4 @@ class SimDeviceSim {
private:
HAL_SimDeviceHandle m_handle;
};
} // namespace sim
} // namespace frc
} // namespace frc::sim

View File

@@ -9,8 +9,7 @@
#include <hal/HALBase.h>
#include <units/time.h>
namespace frc {
namespace sim {
namespace frc::sim {
void SetRuntimeType(HAL_RuntimeType type);
@@ -32,5 +31,4 @@ void StepTiming(units::second_t delta);
void StepTimingAsync(units::second_t delta);
} // namespace sim
} // namespace frc
} // namespace frc::sim