Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-27 02:01:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpilibc] Use std::string_view instead of Twine (#3380)

Browse Source 
Use fmtlib where needed for string formatting into std::string_view.
This commit is contained in:
Peter Johnson
2021-05-26 17:44:18 -07:00
committed by GitHub
parent 50915cb7ed
commit 4e2c3051be
76 changed files with 387 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wpilibc/src/main/native/include/frc/smartdashboard/Field2d.h
View File

@@ -5,12 +5,12 @@
#pragma once
#include <memory>
#include <string_view>
#include <vector>
#include <networktables/NetworkTable.h>
#include <networktables/NetworkTableEntry.h>
#include <units/length.h>
#include <wpi/Twine.h>
#include <wpi/mutex.h>
#include "frc/geometry/Pose2d.h"
@@ -76,7 +76,7 @@ class Field2d : public Sendable, public SendableHelper<Field2d> {
*
* @return Field object
*/
FieldObject2d* GetObject(const wpi::Twine& name);
FieldObject2d* GetObject(std::string_view name);
/**
* Get the robot object.

4
wpilibc/src/main/native/include/frc/smartdashboard/FieldObject2d.h
View File

@@ -6,6 +6,7 @@
#include <initializer_list>
#include <string>
#include <string_view>
#include <utility>
#include <vector>
@@ -31,8 +32,7 @@ class FieldObject2d {
struct private_init {};
public:
FieldObject2d(std::string&& name, const private_init&)
: m_name{std::move(name)} {}
FieldObject2d(std::string_view name, const private_init&) : m_name{name} {}
FieldObject2d(FieldObject2d&& rhs);
FieldObject2d& operator=(FieldObject2d&& rhs);

3
wpilibc/src/main/native/include/frc/smartdashboard/MechanismLigament2d.h
View File

@@ -5,6 +5,7 @@
#pragma once
#include <memory>
#include <string_view>
#include <networktables/NetworkTableEntry.h>
#include <units/angle.h>
@@ -21,7 +22,7 @@ namespace frc {
*/
class MechanismLigament2d : public MechanismObject2d {
public:
MechanismLigament2d(const wpi::Twine& name, double length,
MechanismLigament2d(std::string_view name, double length,
units::degree_t angle, double lineWidth = 6,
const frc::Color8Bit& color = {235, 137, 52});

4
wpilibc/src/main/native/include/frc/smartdashboard/MechanismObject2d.h
View File

@@ -7,12 +7,12 @@
#include <memory>
#include <stdexcept>
#include <string>
#include <string_view>
#include <type_traits>
#include <utility>
#include <networktables/NetworkTable.h>
#include <wpi/StringMap.h>
#include <wpi/Twine.h>
namespace frc {
@@ -30,7 +30,7 @@ class MechanismObject2d {
friend class Mechanism2d;
protected:
explicit MechanismObject2d(const wpi::Twine& name);
explicit MechanismObject2d(std::string_view name);
/**
* Update all entries with new ones from a new table.

4
wpilibc/src/main/native/include/frc/smartdashboard/MechanismRoot2d.h
View File

@@ -5,9 +5,9 @@
#pragma once
#include <memory>
#include <string_view>
#include <networktables/NetworkTableEntry.h>
#include <wpi/Twine.h>
#include "MechanismObject2d.h"
@@ -24,7 +24,7 @@ class MechanismRoot2d : private MechanismObject2d {
struct private_init {};
public:
MechanismRoot2d(const wpi::Twine& name, double x, double y,
MechanismRoot2d(std::string_view name, double x, double y,
const private_init&);
/**

32
wpilibc/src/main/native/include/frc/smartdashboard/SendableBuilder.h
View File

@@ -7,6 +7,7 @@
#include <functional>
#include <memory>
#include <string>
#include <string_view>
#include <vector>
#include <networktables/NetworkTable.h>
@@ -14,7 +15,6 @@
#include <networktables/NetworkTableValue.h>
#include <wpi/ArrayRef.h>
#include <wpi/SmallVector.h>
#include <wpi/Twine.h>
namespace frc {
@@ -28,7 +28,7 @@ class SendableBuilder {
*
* @param type data type
*/
virtual void SetSmartDashboardType(const wpi::Twine& type) = 0;
virtual void SetSmartDashboardType(std::string_view type) = 0;
/**
* Set a flag indicating if this sendable should be treated as an actuator.
@@ -63,7 +63,7 @@ class SendableBuilder {
* @param key property name
* @return Network table entry
*/
virtual nt::NetworkTableEntry GetEntry(const wpi::Twine& key) = 0;
virtual nt::NetworkTableEntry GetEntry(std::string_view key) = 0;
/**
* Add a boolean property.
@@ -72,7 +72,7 @@ class SendableBuilder {
* @param getter getter function (returns current value)
* @param setter setter function (sets new value)
*/
virtual void AddBooleanProperty(const wpi::Twine& key,
virtual void AddBooleanProperty(std::string_view key,
std::function<bool()> getter,
std::function<void(bool)> setter) = 0;
@@ -83,7 +83,7 @@ class SendableBuilder {
* @param getter getter function (returns current value)
* @param setter setter function (sets new value)
*/
virtual void AddDoubleProperty(const wpi::Twine& key,
virtual void AddDoubleProperty(std::string_view key,
std::function<double()> getter,
std::function<void(double)> setter) = 0;
@@ -95,7 +95,7 @@ class SendableBuilder {
* @param setter setter function (sets new value)
*/
virtual void AddStringProperty(
const wpi::Twine& key, std::function<std::string()> getter,
std::string_view key, std::function<std::string()> getter,
std::function<void(wpi::StringRef)> setter) = 0;
/**
@@ -106,7 +106,7 @@ class SendableBuilder {
* @param setter setter function (sets new value)
*/
virtual void AddBooleanArrayProperty(
const wpi::Twine& key, std::function<std::vector<int>()> getter,
std::string_view key, std::function<std::vector<int>()> getter,
std::function<void(wpi::ArrayRef<int>)> setter) = 0;
/**
@@ -117,7 +117,7 @@ class SendableBuilder {
* @param setter setter function (sets new value)
*/
virtual void AddDoubleArrayProperty(
const wpi::Twine& key, std::function<std::vector<double>()> getter,
std::string_view key, std::function<std::vector<double>()> getter,
std::function<void(wpi::ArrayRef<double>)> setter) = 0;
/**
@@ -128,7 +128,7 @@ class SendableBuilder {
* @param setter setter function (sets new value)
*/
virtual void AddStringArrayProperty(
const wpi::Twine& key, std::function<std::vector<std::string>()> getter,
std::string_view key, std::function<std::vector<std::string>()> getter,
std::function<void(wpi::ArrayRef<std::string>)> setter) = 0;
/**
@@ -138,7 +138,7 @@ class SendableBuilder {
* @param getter getter function (returns current value)
* @param setter setter function (sets new value)
*/
virtual void AddRawProperty(const wpi::Twine& key,
virtual void AddRawProperty(std::string_view key,
std::function<std::string()> getter,
std::function<void(wpi::StringRef)> setter) = 0;
@@ -150,7 +150,7 @@ class SendableBuilder {
* @param setter setter function (sets new value)
*/
virtual void AddValueProperty(
const wpi::Twine& key, std::function<std::shared_ptr<nt::Value>()> getter,
std::string_view key, std::function<std::shared_ptr<nt::Value>()> getter,
std::function<void(std::shared_ptr<nt::Value>)> setter) = 0;
/**
@@ -161,7 +161,7 @@ class SendableBuilder {
* @param setter setter function (sets new value)
*/
virtual void AddSmallStringProperty(
const wpi::Twine& key,
std::string_view key,
std::function<wpi::StringRef(wpi::SmallVectorImpl<char>& buf)> getter,
std::function<void(wpi::StringRef)> setter) = 0;
@@ -173,7 +173,7 @@ class SendableBuilder {
* @param setter setter function (sets new value)
*/
virtual void AddSmallBooleanArrayProperty(
const wpi::Twine& key,
std::string_view key,
std::function<wpi::ArrayRef<int>(wpi::SmallVectorImpl<int>& buf)> getter,
std::function<void(wpi::ArrayRef<int>)> setter) = 0;
@@ -185,7 +185,7 @@ class SendableBuilder {
* @param setter setter function (sets new value)
*/
virtual void AddSmallDoubleArrayProperty(
const wpi::Twine& key,
std::string_view key,
std::function<wpi::ArrayRef<double>(wpi::SmallVectorImpl<double>& buf)>
getter,
std::function<void(wpi::ArrayRef<double>)> setter) = 0;
@@ -198,7 +198,7 @@ class SendableBuilder {
* @param setter setter function (sets new value)
*/
virtual void AddSmallStringArrayProperty(
const wpi::Twine& key,
std::string_view key,
std::function<
wpi::ArrayRef<std::string>(wpi::SmallVectorImpl<std::string>& buf)>
getter,
@@ -212,7 +212,7 @@ class SendableBuilder {
* @param setter setter function (sets new value)
*/
virtual void AddSmallRawProperty(
const wpi::Twine& key,
std::string_view key,
std::function<wpi::StringRef(wpi::SmallVectorImpl<char>& buf)> getter,
std::function<void(wpi::StringRef)> setter) = 0;

35
wpilibc/src/main/native/include/frc/smartdashboard/SendableBuilderImpl.h
View File

@@ -7,6 +7,7 @@
#include <functional>
#include <memory>
#include <string>
#include <string_view>
#include <utility>
#include <vector>
@@ -15,7 +16,6 @@
#include <networktables/NetworkTableValue.h>
#include <wpi/ArrayRef.h>
#include <wpi/SmallVector.h>
#include <wpi/Twine.h>
#include "frc/smartdashboard/SendableBuilder.h"
@@ -86,73 +86,72 @@ class SendableBuilderImpl : public SendableBuilder {
*/
void ClearProperties();
void SetSmartDashboardType(const wpi::Twine& type) override;
void SetSmartDashboardType(std::string_view type) override;
void SetActuator(bool value) override;
void SetSafeState(std::function<void()> func) override;
void SetUpdateTable(std::function<void()> func) override;
nt::NetworkTableEntry GetEntry(const wpi::Twine& key) override;
nt::NetworkTableEntry GetEntry(std::string_view key) override;
void AddBooleanProperty(const wpi::Twine& key, std::function<bool()> getter,
void AddBooleanProperty(std::string_view key, std::function<bool()> getter,
std::function<void(bool)> setter) override;
void AddDoubleProperty(const wpi::Twine& key, std::function<double()> getter,
void AddDoubleProperty(std::string_view key, std::function<double()> getter,
std::function<void(double)> setter) override;
void AddStringProperty(const wpi::Twine& key,
void AddStringProperty(std::string_view key,
std::function<std::string()> getter,
std::function<void(wpi::StringRef)> setter) override;
void AddBooleanArrayProperty(
const wpi::Twine& key, std::function<std::vector<int>()> getter,
std::string_view key, std::function<std::vector<int>()> getter,
std::function<void(wpi::ArrayRef<int>)> setter) override;
void AddDoubleArrayProperty(
const wpi::Twine& key, std::function<std::vector<double>()> getter,
std::string_view key, std::function<std::vector<double>()> getter,
std::function<void(wpi::ArrayRef<double>)> setter) override;
void AddStringArrayProperty(
const wpi::Twine& key, std::function<std::vector<std::string>()> getter,
std::string_view key, std::function<std::vector<std::string>()> getter,
std::function<void(wpi::ArrayRef<std::string>)> setter) override;
void AddRawProperty(const wpi::Twine& key,
std::function<std::string()> getter,
void AddRawProperty(std::string_view key, std::function<std::string()> getter,
std::function<void(wpi::StringRef)> setter) override;
void AddValueProperty(
const wpi::Twine& key, std::function<std::shared_ptr<nt::Value>()> getter,
std::string_view key, std::function<std::shared_ptr<nt::Value>()> getter,
std::function<void(std::shared_ptr<nt::Value>)> setter) override;
void AddSmallStringProperty(
const wpi::Twine& key,
std::string_view key,
std::function<wpi::StringRef(wpi::SmallVectorImpl<char>& buf)> getter,
std::function<void(wpi::StringRef)> setter) override;
void AddSmallBooleanArrayProperty(
const wpi::Twine& key,
std::string_view key,
std::function<wpi::ArrayRef<int>(wpi::SmallVectorImpl<int>& buf)> getter,
std::function<void(wpi::ArrayRef<int>)> setter) override;
void AddSmallDoubleArrayProperty(
const wpi::Twine& key,
std::string_view key,
std::function<wpi::ArrayRef<double>(wpi::SmallVectorImpl<double>& buf)>
getter,
std::function<void(wpi::ArrayRef<double>)> setter) override;
void AddSmallStringArrayProperty(
const wpi::Twine& key,
std::string_view key,
std::function<
wpi::ArrayRef<std::string>(wpi::SmallVectorImpl<std::string>& buf)>
getter,
std::function<void(wpi::ArrayRef<std::string>)> setter) override;
void AddSmallRawProperty(
const wpi::Twine& key,
std::string_view key,
std::function<wpi::StringRef(wpi::SmallVectorImpl<char>& buf)> getter,
std::function<void(wpi::StringRef)> setter) override;
private:
struct Property {
Property(nt::NetworkTable& table, const wpi::Twine& key)
Property(nt::NetworkTable& table, std::string_view key)
: entry(table.GetEntry(key)) {}
Property(const Property&) = delete;

12
wpilibc/src/main/native/include/frc/smartdashboard/SendableHelper.h
View File

@@ -6,8 +6,8 @@
#include <memory>
#include <string>
#include <string_view>
#include <wpi/Twine.h>
#include <wpi/deprecated.h>
#include "frc/smartdashboard/SendableRegistry.h"
@@ -61,7 +61,7 @@ class SendableHelper {
* @param name name
*/
WPI_DEPRECATED("use SendableRegistry::SetName()")
void SetName(const wpi::Twine& name) {
void SetName(std::string_view name) {
SendableRegistry::GetInstance().SetName(static_cast<Derived*>(this), name);
}
@@ -74,7 +74,7 @@ class SendableHelper {
* @param name device name
*/
WPI_DEPRECATED("use SendableRegistry::SetName()")
void SetName(const wpi::Twine& subsystem, const wpi::Twine& name) {
void SetName(std::string_view subsystem, std::string_view name) {
SendableRegistry::GetInstance().SetName(static_cast<Derived*>(this),
subsystem, name);
}
@@ -100,7 +100,7 @@ class SendableHelper {
* @param subsystem subsystem name
*/
WPI_DEPRECATED("use SendableRegistry::SetSubsystem()")
void SetSubsystem(const wpi::Twine& subsystem) {
void SetSubsystem(std::string_view subsystem) {
SendableRegistry::GetInstance().SetSubsystem(static_cast<Derived*>(this),
subsystem);
}
@@ -142,7 +142,7 @@ class SendableHelper {
* @param channel The channel number the device is plugged into
*/
WPI_DEPRECATED("use SendableRegistry::SetName()")
void SetName(const wpi::Twine& moduleType, int channel) {
void SetName(std::string_view moduleType, int channel) {
SendableRegistry::GetInstance().SetName(static_cast<Derived*>(this),
moduleType, channel);
}
@@ -159,7 +159,7 @@ class SendableHelper {
* PWM)
*/
WPI_DEPRECATED("use SendableRegistry::SetName()")
void SetName(const wpi::Twine& moduleType, int moduleNumber, int channel) {
void SetName(std::string_view moduleType, int moduleNumber, int channel) {
SendableRegistry::GetInstance().SetName(static_cast<Derived*>(this),
moduleType, moduleNumber, channel);
}

34
wpilibc/src/main/native/include/frc/smartdashboard/SendableRegistry.h
View File

@@ -6,10 +6,10 @@
#include <memory>
#include <string>
#include <string_view>
#include <networktables/NetworkTable.h>
#include <wpi/STLExtras.h>
#include <wpi/Twine.h>
namespace frc {
@@ -41,7 +41,7 @@ class SendableRegistry {
* @param sendable object to add
* @param name component name
*/
void Add(Sendable* sendable, const wpi::Twine& name);
void Add(Sendable* sendable, std::string_view name);
/**
* Adds an object to the registry.
@@ -51,7 +51,7 @@ class SendableRegistry {
* the value
* @param channel The channel number the device is plugged into
*/
void Add(Sendable* sendable, const wpi::Twine& moduleType, int channel);
void Add(Sendable* sendable, std::string_view moduleType, int channel);
/**
* Adds an object to the registry.
@@ -62,7 +62,7 @@ class SendableRegistry {
* @param moduleNumber The number of the particular module type
* @param channel The channel number the device is plugged into
*/
void Add(Sendable* sendable, const wpi::Twine& moduleType, int moduleNumber,
void Add(Sendable* sendable, std::string_view moduleType, int moduleNumber,
int channel);
/**
@@ -72,8 +72,8 @@ class SendableRegistry {
* @param subsystem subsystem name
* @param name component name
*/
void Add(Sendable* sendable, const wpi::Twine& subsystem,
const wpi::Twine& name);
void Add(Sendable* sendable, std::string_view subsystem,
std::string_view name);
/**
* Adds an object to the registry and LiveWindow.
@@ -81,7 +81,7 @@ class SendableRegistry {
* @param sendable object to add
* @param name component name
*/
void AddLW(Sendable* sendable, const wpi::Twine& name);
void AddLW(Sendable* sendable, std::string_view name);
/**
* Adds an object to the registry and LiveWindow.
@@ -91,7 +91,7 @@ class SendableRegistry {
* the value
* @param channel The channel number the device is plugged into
*/
void AddLW(Sendable* sendable, const wpi::Twine& moduleType, int channel);
void AddLW(Sendable* sendable, std::string_view moduleType, int channel);
/**
* Adds an object to the registry and LiveWindow.
@@ -102,7 +102,7 @@ class SendableRegistry {
* @param moduleNumber The number of the particular module type
* @param channel The channel number the device is plugged into
*/
void AddLW(Sendable* sendable, const wpi::Twine& moduleType, int moduleNumber,
void AddLW(Sendable* sendable, std::string_view moduleType, int moduleNumber,
int channel);
/**
@@ -112,8 +112,8 @@ class SendableRegistry {
* @param subsystem subsystem name
* @param name component name
*/
void AddLW(Sendable* sendable, const wpi::Twine& subsystem,
const wpi::Twine& name);
void AddLW(Sendable* sendable, std::string_view subsystem,
std::string_view name);
/**
* Adds a child object to an object. Adds the child object to the registry
@@ -171,7 +171,7 @@ class SendableRegistry {
* @param sendable object
* @param name name
*/
void SetName(Sendable* sendable, const wpi::Twine& name);
void SetName(Sendable* sendable, std::string_view name);
/**
* Sets the name of an object with a channel number.
@@ -181,7 +181,7 @@ class SendableRegistry {
* the value
* @param channel The channel number the device is plugged into
*/
void SetName(Sendable* sendable, const wpi::Twine& moduleType, int channel);
void SetName(Sendable* sendable, std::string_view moduleType, int channel);
/**
* Sets the name of an object with a module and channel number.
@@ -192,7 +192,7 @@ class SendableRegistry {
* @param moduleNumber The number of the particular module type
* @param channel The channel number the device is plugged into
*/
void SetName(Sendable* sendable, const wpi::Twine& moduleType,
void SetName(Sendable* sendable, std::string_view moduleType,
int moduleNumber, int channel);
/**
@@ -202,8 +202,8 @@ class SendableRegistry {
* @param subsystem subsystem name
* @param name device name
*/
void SetName(Sendable* sendable, const wpi::Twine& subsystem,
const wpi::Twine& name);
void SetName(Sendable* sendable, std::string_view subsystem,
std::string_view name);
/**
* Gets the subsystem name of an object.
@@ -219,7 +219,7 @@ class SendableRegistry {
* @param sendable object
* @param subsystem subsystem name
*/
void SetSubsystem(Sendable* sendable, const wpi::Twine& subsystem);
void SetSubsystem(Sendable* sendable, std::string_view subsystem);
/**
* Gets a unique handle for setting/getting data with SetData() and GetData().