Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant C++ lambda parentheses (NFC) (#3433)

Browse Source
This commit is contained in:
Tyler Veness
2021-06-12 08:06:45 -07:00
committed by GitHub
parent f60994ad24
commit 04e64db945
37 changed files with 63 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cscore/src/main/native/cpp/cscore_c.cpp
View File

@@ -352,11 +352,11 @@ void CS_ReleaseSink(CS_Sink sink, CS_Status* status) {
}
void CS_SetListenerOnStart(void (*onStart)(void* data), void* data) {
cs::SetListenerOnStart([=]() { onStart(data); });
cs::SetListenerOnStart([=] { onStart(data); });
}
void CS_SetListenerOnExit(void (*onExit)(void* data), void* data) {
cs::SetListenerOnExit([=]() { onExit(data); });
cs::SetListenerOnExit([=] { onExit(data); });
}
CS_Listener CS_AddListener(void* data,

2
cscore/src/main/native/windows/WindowsMessagePump.cpp
View File

@@ -90,7 +90,7 @@ WindowsMessagePump::WindowsMessagePump(
std::function<LRESULT(HWND, UINT, WPARAM, LPARAM)> callback) {
m_callback = callback;
auto handle = CreateEvent(NULL, true, false, NULL);
m_mainThread = std::thread([=]() { ThreadMain(handle); });
m_mainThread = std::thread([=] { ThreadMain(handle); });
auto waitResult = WaitForSingleObject(handle, 1000);
if (waitResult == WAIT_OBJECT_0) {
CloseHandle(handle);

12
wpilibOldCommands/src/main/native/cpp/PIDBase.cpp
View File

@@ -230,17 +230,17 @@ void PIDBase::PIDWrite(double output) {
void PIDBase::InitSendable(SendableBuilder& builder) {
builder.SetSmartDashboardType("PIDController");
builder.SetSafeState([=]() { Reset(); });
builder.SetSafeState([=] { Reset(); });
builder.AddDoubleProperty(
"p", [=]() { return GetP(); }, [=](double value) { SetP(value); });
"p", [=] { return GetP(); }, [=](double value) { SetP(value); });
builder.AddDoubleProperty(
"i", [=]() { return GetI(); }, [=](double value) { SetI(value); });
"i", [=] { return GetI(); }, [=](double value) { SetI(value); });
builder.AddDoubleProperty(
"d", [=]() { return GetD(); }, [=](double value) { SetD(value); });
"d", [=] { return GetD(); }, [=](double value) { SetD(value); });
builder.AddDoubleProperty(
"f", [=]() { return GetF(); }, [=](double value) { SetF(value); });
"f", [=] { return GetF(); }, [=](double value) { SetF(value); });
builder.AddDoubleProperty(
"setpoint", [=]() { return GetSetpoint(); },
"setpoint", [=] { return GetSetpoint(); },
[=](double value) { SetSetpoint(value); });
}

2
wpilibOldCommands/src/main/native/cpp/PIDController.cpp
View File

@@ -78,6 +78,6 @@ void PIDController::Reset() {
void PIDController::InitSendable(SendableBuilder& builder) {
PIDBase::InitSendable(builder);
builder.AddBooleanProperty(
"enabled", [=]() { return IsEnabled(); },
"enabled", [=] { return IsEnabled(); },
[=](bool value) { SetEnabled(value); });
}

4
wpilibOldCommands/src/main/native/cpp/buttons/Trigger.cpp
View File

@@ -64,8 +64,8 @@ void Trigger::ToggleWhenActive(Command* command) {
void Trigger::InitSendable(SendableBuilder& builder) {
builder.SetSmartDashboardType("Button");
builder.SetSafeState([=]() { m_sendablePressed = false; });
builder.SetSafeState([=] { m_sendablePressed = false; });
builder.AddBooleanProperty(
"pressed", [=]() { return Grab(); },
"pressed", [=] { return Grab(); },
[=](bool value) { m_sendablePressed = value; });
}

6
wpilibOldCommands/src/main/native/cpp/commands/Command.cpp
View File

@@ -295,10 +295,10 @@ void Command::SetSubsystem(std::string_view name) {
void Command::InitSendable(SendableBuilder& builder) {
builder.SetSmartDashboardType("Command");
builder.AddStringProperty(
".name", [=]() { return SendableRegistry::GetInstance().GetName(this); },
".name", [=] { return SendableRegistry::GetInstance().GetName(this); },
nullptr);
builder.AddBooleanProperty(
"running", [=]() { return IsRunning(); },
"running", [=] { return IsRunning(); },
[=](bool value) {
if (value) {
if (!IsRunning()) {
@@ -311,5 +311,5 @@ void Command::InitSendable(SendableBuilder& builder) {
}
});
builder.AddBooleanProperty(
".isParented", [=]() { return IsParented(); }, nullptr);
".isParented", [=] { return IsParented(); }, nullptr);
}

2
wpilibOldCommands/src/main/native/cpp/commands/Scheduler.cpp
View File

@@ -162,7 +162,7 @@ void Scheduler::InitSendable(SendableBuilder& builder) {
auto namesEntry = builder.GetEntry("Names");
auto idsEntry = builder.GetEntry("Ids");
auto cancelEntry = builder.GetEntry("Cancel");
builder.SetUpdateTable([=]() {
builder.SetUpdateTable([=] {
// Get the list of possible commands to cancel
auto new_toCancel = cancelEntry.GetValue();
wpi::span<const double> toCancel;

8
wpilibOldCommands/src/main/native/cpp/commands/Subsystem.cpp
View File

@@ -125,12 +125,12 @@ void Subsystem::InitSendable(SendableBuilder& builder) {
builder.SetSmartDashboardType("Subsystem");
builder.AddBooleanProperty(
".hasDefault", [=]() { return m_defaultCommand != nullptr; }, nullptr);
".hasDefault", [=] { return m_defaultCommand != nullptr; }, nullptr);
builder.AddStringProperty(
".default", [=]() { return GetDefaultCommandName(); }, nullptr);
".default", [=] { return GetDefaultCommandName(); }, nullptr);
builder.AddBooleanProperty(
".hasCommand", [=]() { return m_currentCommand != nullptr; }, nullptr);
".hasCommand", [=] { return m_currentCommand != nullptr; }, nullptr);
builder.AddStringProperty(
".command", [=]() { return GetCurrentCommandName(); }, nullptr);
".command", [=] { return GetCurrentCommandName(); }, nullptr);
}

2
wpilibc/src/main/native/cpp/ADXL345_I2C.cpp
View File

@@ -89,7 +89,7 @@ void ADXL345_I2C::InitSendable(SendableBuilder& builder) {
auto x = builder.GetEntry("X").GetHandle();
auto y = builder.GetEntry("Y").GetHandle();
auto z = builder.GetEntry("Z").GetHandle();
builder.SetUpdateTable([=]() {
builder.SetUpdateTable([=] {
auto data = GetAccelerations();
nt::NetworkTableEntry(x).SetDouble(data.XAxis);
nt::NetworkTableEntry(y).SetDouble(data.YAxis);

2
wpilibc/src/main/native/cpp/ADXL345_SPI.cpp
View File

@@ -120,7 +120,7 @@ void ADXL345_SPI::InitSendable(SendableBuilder& builder) {
auto x = builder.GetEntry("X").GetHandle();
auto y = builder.GetEntry("Y").GetHandle();
auto z = builder.GetEntry("Z").GetHandle();
builder.SetUpdateTable([=]() {
builder.SetUpdateTable([=] {
auto data = GetAccelerations();
nt::NetworkTableEntry(x).SetDouble(data.XAxis);
nt::NetworkTableEntry(y).SetDouble(data.YAxis);

2
wpilibc/src/main/native/cpp/ADXL362.cpp
View File

@@ -183,7 +183,7 @@ void ADXL362::InitSendable(SendableBuilder& builder) {
auto x = builder.GetEntry("X").GetHandle();
auto y = builder.GetEntry("Y").GetHandle();
auto z = builder.GetEntry("Z").GetHandle();
builder.SetUpdateTable([=]() {
builder.SetUpdateTable([=] {
auto data = GetAccelerations();
nt::NetworkTableEntry(x).SetDouble(data.XAxis);
nt::NetworkTableEntry(y).SetDouble(data.YAxis);

2
wpilibc/src/main/native/cpp/ADXRS450_Gyro.cpp
View File

@@ -139,5 +139,5 @@ int ADXRS450_Gyro::GetPort() const {
void ADXRS450_Gyro::InitSendable(SendableBuilder& builder) {
builder.SetSmartDashboardType("Gyro");
builder.AddDoubleProperty(
"Value", [=]() { return GetAngle(); }, nullptr);
"Value", [=] { return GetAngle(); }, nullptr);
}

2
wpilibc/src/main/native/cpp/AnalogAccelerometer.cpp
View File

@@ -49,7 +49,7 @@ void AnalogAccelerometer::SetZero(double zero) {
void AnalogAccelerometer::InitSendable(SendableBuilder& builder) {
builder.SetSmartDashboardType("Accelerometer");
builder.AddDoubleProperty(
"Value", [=]() { return GetAcceleration(); }, nullptr);
"Value", [=] { return GetAcceleration(); }, nullptr);
}
void AnalogAccelerometer::InitAccelerometer() {

2
wpilibc/src/main/native/cpp/AnalogGyro.cpp
View File

@@ -141,5 +141,5 @@ std::shared_ptr<AnalogInput> AnalogGyro::GetAnalogInput() const {
void AnalogGyro::InitSendable(SendableBuilder& builder) {
builder.SetSmartDashboardType("Gyro");
builder.AddDoubleProperty(
"Value", [=]() { return GetAngle(); }, nullptr);
"Value", [=] { return GetAngle(); }, nullptr);
}

2
wpilibc/src/main/native/cpp/AnalogInput.cpp
View File

@@ -197,5 +197,5 @@ void AnalogInput::SetSimDevice(HAL_SimDeviceHandle device) {
void AnalogInput::InitSendable(SendableBuilder& builder) {
builder.SetSmartDashboardType("Analog Input");
builder.AddDoubleProperty(
"Value", [=]() { return GetAverageVoltage(); }, nullptr);
"Value", [=] { return GetAverageVoltage(); }, nullptr);
}

2
wpilibc/src/main/native/cpp/AnalogOutput.cpp
View File

@@ -61,6 +61,6 @@ int AnalogOutput::GetChannel() const {
void AnalogOutput::InitSendable(SendableBuilder& builder) {
builder.SetSmartDashboardType("Analog Output");
builder.AddDoubleProperty(
"Value", [=]() { return GetVoltage(); },
"Value", [=] { return GetVoltage(); },
[=](double value) { SetVoltage(value); });
}

2
wpilibc/src/main/native/cpp/AnalogPotentiometer.cpp
View File

@@ -46,5 +46,5 @@ double AnalogPotentiometer::Get() const {
void AnalogPotentiometer::InitSendable(SendableBuilder& builder) {
builder.SetSmartDashboardType("Analog Input");
builder.AddDoubleProperty(
"Value", [=]() { return Get(); }, nullptr);
"Value", [=] { return Get(); }, nullptr);
}

6
wpilibc/src/main/native/cpp/BuiltInAccelerometer.cpp
View File

@@ -47,9 +47,9 @@ double BuiltInAccelerometer::GetZ() {
void BuiltInAccelerometer::InitSendable(SendableBuilder& builder) {
builder.SetSmartDashboardType("3AxisAccelerometer");
builder.AddDoubleProperty(
"X", [=]() { return GetX(); }, nullptr);
"X", [=] { return GetX(); }, nullptr);
builder.AddDoubleProperty(
"Y", [=]() { return GetY(); }, nullptr);
"Y", [=] { return GetY(); }, nullptr);
builder.AddDoubleProperty(
"Z", [=]() { return GetZ(); }, nullptr);
"Z", [=] { return GetZ(); }, nullptr);
}

2
wpilibc/src/main/native/cpp/Counter.cpp
View File

@@ -309,5 +309,5 @@ bool Counter::GetDirection() const {
void Counter::InitSendable(SendableBuilder& builder) {
builder.SetSmartDashboardType("Counter");
builder.AddDoubleProperty(
"Value", [=]() { return Get(); }, nullptr);
"Value", [=] { return Get(); }, nullptr);
}

2
wpilibc/src/main/native/cpp/DigitalInput.cpp
View File

@@ -70,5 +70,5 @@ int DigitalInput::GetChannel() const {
void DigitalInput::InitSendable(SendableBuilder& builder) {
builder.SetSmartDashboardType("Digital Input");
builder.AddBooleanProperty(
"Value", [=]() { return Get(); }, nullptr);
"Value", [=] { return Get(); }, nullptr);
}

2
wpilibc/src/main/native/cpp/DigitalOutput.cpp
View File

@@ -143,5 +143,5 @@ void DigitalOutput::SetSimDevice(HAL_SimDeviceHandle device) {
void DigitalOutput::InitSendable(SendableBuilder& builder) {
builder.SetSmartDashboardType("Digital Output");
builder.AddBooleanProperty(
"Value", [=]() { return Get(); }, [=](bool value) { Set(value); });
"Value", [=] { return Get(); }, [=](bool value) { Set(value); });
}

2
wpilibc/src/main/native/cpp/DoubleSolenoid.cpp
View File

@@ -118,7 +118,7 @@ bool DoubleSolenoid::IsRevSolenoidDisabled() const {
void DoubleSolenoid::InitSendable(SendableBuilder& builder) {
builder.SetSmartDashboardType("Double Solenoid");
builder.SetActuator(true);
builder.SetSafeState([=]() { Set(kOff); });
builder.SetSafeState([=] { Set(kOff); });
builder.AddSmallStringProperty(
"Value",
[=](wpi::SmallVectorImpl<char>& buf) -> std::string_view {

6
wpilibc/src/main/native/cpp/Encoder.cpp
View File

@@ -218,11 +218,11 @@ void Encoder::InitSendable(SendableBuilder& builder) {
}
builder.AddDoubleProperty(
"Speed", [=]() { return GetRate(); }, nullptr);
"Speed", [=] { return GetRate(); }, nullptr);
builder.AddDoubleProperty(
"Distance", [=]() { return GetDistance(); }, nullptr);
"Distance", [=] { return GetDistance(); }, nullptr);
builder.AddDoubleProperty(
"Distance per Tick", [=]() { return GetDistancePerPulse(); }, nullptr);
"Distance per Tick", [=] { return GetDistancePerPulse(); }, nullptr);
}
void Encoder::InitEncoder(bool reverseDirection, EncodingType encodingType) {

6
wpilibc/src/main/native/cpp/PowerDistributionPanel.cpp
View File

@@ -97,10 +97,10 @@ void PowerDistributionPanel::InitSendable(SendableBuilder& builder) {
builder.SetSmartDashboardType("PowerDistributionPanel");
for (int i = 0; i < SensorUtil::kPDPChannels; ++i) {
builder.AddDoubleProperty(
fmt::format("Chan{}", i), [=]() { return GetCurrent(i); }, nullptr);
fmt::format("Chan{}", i), [=] { return GetCurrent(i); }, nullptr);
}
builder.AddDoubleProperty(
"Voltage", [=]() { return GetVoltage(); }, nullptr);
"Voltage", [=] { return GetVoltage(); }, nullptr);
builder.AddDoubleProperty(
"TotalCurrent", [=]() { return GetTotalCurrent(); }, nullptr);
"TotalCurrent", [=] { return GetTotalCurrent(); }, nullptr);
}

2
wpilibc/src/main/native/cpp/Relay.cpp
View File

@@ -175,7 +175,7 @@ std::string Relay::GetDescription() const {
void Relay::InitSendable(SendableBuilder& builder) {
builder.SetSmartDashboardType("Relay");
builder.SetActuator(true);
builder.SetSafeState([=]() { Set(kOff); });
builder.SetSafeState([=] { Set(kOff); });
builder.AddSmallStringProperty(
"Value",
[=](wpi::SmallVectorImpl<char>& buf) -> std::string_view {

2
wpilibc/src/main/native/cpp/SPI.cpp
View File

@@ -25,7 +25,7 @@ class SPI::Accumulator {
public:
Accumulator(HAL_SPIPort port, int xferSize, int validMask, int validValue,
int dataShift, int dataSize, bool isSigned, bool bigEndian)
: m_notifier([=]() {
: m_notifier([=] {
std::scoped_lock lock(m_mutex);
Update();
}),

2
wpilibc/src/main/native/cpp/Servo.cpp
View File

@@ -65,7 +65,7 @@ double Servo::GetMinAngle() const {
void Servo::InitSendable(SendableBuilder& builder) {
builder.SetSmartDashboardType("Servo");
builder.AddDoubleProperty(
"Value", [=]() { return Get(); }, [=](double value) { Set(value); });
"Value", [=] { return Get(); }, [=](double value) { Set(value); });
}
double Servo::GetServoAngleRange() const {

4
wpilibc/src/main/native/cpp/Solenoid.cpp
View File

@@ -75,7 +75,7 @@ void Solenoid::StartPulse() {
void Solenoid::InitSendable(SendableBuilder& builder) {
builder.SetSmartDashboardType("Solenoid");
builder.SetActuator(true);
builder.SetSafeState([=]() { Set(false); });
builder.SetSafeState([=] { Set(false); });
builder.AddBooleanProperty(
"Value", [=]() { return Get(); }, [=](bool value) { Set(value); });
"Value", [=] { return Get(); }, [=](bool value) { Set(value); });
}

4
wpilibc/src/main/native/cpp/SpeedControllerGroup.cpp
View File

@@ -63,7 +63,7 @@ void SpeedControllerGroup::StopMotor() {
void SpeedControllerGroup::InitSendable(SendableBuilder& builder) {
builder.SetSmartDashboardType("Speed Controller");
builder.SetActuator(true);
builder.SetSafeState([=]() { StopMotor(); });
builder.SetSafeState([=] { StopMotor(); });
builder.AddDoubleProperty(
"Value", [=]() { return Get(); }, [=](double value) { Set(value); });
"Value", [=] { return Get(); }, [=](double value) { Set(value); });
}

4
wpilibc/src/main/native/cpp/drive/DifferentialDrive.cpp
View File

@@ -198,9 +198,9 @@ void DifferentialDrive::InitSendable(SendableBuilder& builder) {
builder.SetActuator(true);
builder.SetSafeState([=] { StopMotor(); });
builder.AddDoubleProperty(
"Left Motor Speed", [=]() { return m_leftMotor->Get(); },
"Left Motor Speed", [=] { return m_leftMotor->Get(); },
[=](double value) { m_leftMotor->Set(value); });
builder.AddDoubleProperty(
"Right Motor Speed", [=]() { return m_rightMotor->Get(); },
"Right Motor Speed", [=] { return m_rightMotor->Get(); },
[=](double value) { m_rightMotor->Set(value); });
}

6
wpilibc/src/main/native/cpp/drive/KilloughDrive.cpp
View File

@@ -123,12 +123,12 @@ void KilloughDrive::InitSendable(SendableBuilder& builder) {
builder.SetActuator(true);
builder.SetSafeState([=] { StopMotor(); });
builder.AddDoubleProperty(
"Left Motor Speed", [=]() { return m_leftMotor->Get(); },
"Left Motor Speed", [=] { return m_leftMotor->Get(); },
[=](double value) { m_leftMotor->Set(value); });
builder.AddDoubleProperty(
"Right Motor Speed", [=]() { return m_rightMotor->Get(); },
"Right Motor Speed", [=] { return m_rightMotor->Get(); },
[=](double value) { m_rightMotor->Set(value); });
builder.AddDoubleProperty(
"Back Motor Speed", [=]() { return m_backMotor->Get(); },
"Back Motor Speed", [=] { return m_backMotor->Get(); },
[=](double value) { m_backMotor->Set(value); });
}

4
wpilibc/src/main/native/cpp/drive/MecanumDrive.cpp
View File

@@ -118,13 +118,13 @@ void MecanumDrive::InitSendable(SendableBuilder& builder) {
builder.SetActuator(true);
builder.SetSafeState([=] { StopMotor(); });
builder.AddDoubleProperty(
"Front Left Motor Speed", [=]() { return m_frontLeftMotor->Get(); },
"Front Left Motor Speed", [=] { return m_frontLeftMotor->Get(); },
[=](double value) { m_frontLeftMotor->Set(value); });
builder.AddDoubleProperty(
"Front Right Motor Speed", [=] { return m_frontRightMotor->Get(); },
[=](double value) { m_frontRightMotor->Set(value); });
builder.AddDoubleProperty(
"Rear Left Motor Speed", [=]() { return m_rearLeftMotor->Get(); },
"Rear Left Motor Speed", [=] { return m_rearLeftMotor->Get(); },
[=](double value) { m_rearLeftMotor->Set(value); });
builder.AddDoubleProperty(
"Rear Right Motor Speed", [=] { return m_rearRightMotor->Get(); },

4
wpilibc/src/main/native/cpp/motorcontrol/MotorControllerGroup.cpp
View File

@@ -63,7 +63,7 @@ void MotorControllerGroup::StopMotor() {
void MotorControllerGroup::InitSendable(SendableBuilder& builder) {
builder.SetSmartDashboardType("Motor Controller");
builder.SetActuator(true);
builder.SetSafeState([=]() { StopMotor(); });
builder.SetSafeState([=] { StopMotor(); });
builder.AddDoubleProperty(
"Value", [=]() { return Get(); }, [=](double value) { Set(value); });
"Value", [=] { return Get(); }, [=](double value) { Set(value); });
}

4
wpilibc/src/main/native/cpp/motorcontrol/NidecBrushless.cpp
View File

@@ -75,7 +75,7 @@ int NidecBrushless::GetChannel() const {
void NidecBrushless::InitSendable(SendableBuilder& builder) {
builder.SetSmartDashboardType("Nidec Brushless");
builder.SetActuator(true);
builder.SetSafeState([=]() { StopMotor(); });
builder.SetSafeState([=] { StopMotor(); });
builder.AddDoubleProperty(
"Value", [=]() { return Get(); }, [=](double value) { Set(value); });
"Value", [=] { return Get(); }, [=](double value) { Set(value); });
}

2
wpilibc/src/main/native/include/frc/smartdashboard/SendableChooser.inc
View File

@@ -49,7 +49,7 @@ void SendableChooser<T>::InitSendable(SendableBuilder& builder) {
builder.GetEntry(kInstance).SetDouble(m_instance);
builder.AddStringArrayProperty(
kOptions,
[=]() {
[=] {
std::vector<std::string> keys;
for (const auto& choice : m_choices) {
keys.emplace_back(choice.first());

2
wpiutil/src/main/native/cpp/TCPConnector_parallel.cpp
View File

@@ -82,7 +82,7 @@ std::unique_ptr<NetworkStream> TCPConnector::connect_parallel(
++num_workers;
// start the worker
std::thread([=]() {
std::thread([=] {
if (!result->done) {
// add to global state
{

3
wpiutil/src/main/native/include/wpi/raw_uv_ostream.h
View File

@@ -29,8 +29,7 @@ class raw_uv_ostream : public raw_ostream {
* performed using Buffer::Allocate().
*/
raw_uv_ostream(SmallVectorImpl<uv::Buffer>& bufs, size_t allocSize)
: m_bufs(bufs),
m_alloc([=]() { return uv::Buffer::Allocate(allocSize); }) {
: m_bufs(bufs), m_alloc([=] { return uv::Buffer::Allocate(allocSize); }) {
SetUnbuffered();
}