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

[wpiutil] Upgrade to fmt 10.2.1, add wpi::print (#6161)

Browse Source 
We now use a wrapper (wpi::print) to catch exceptions since we can't patch
std::print() to not throw when we ultimately migrate to it.

fmtlib and std format/print throw the same exceptions and always have. We previously patched fmt::print() to not throw a write failure exception, but we can't do that for std::print(); wpi::print() is the migration plan.
This commit is contained in:
Tyler Veness
2024-05-12 06:25:42 -07:00
committed by GitHub
parent 6c9dcc157e
commit d88c71ffdc
99 changed files with 1374 additions and 1130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ntcore/src/main/native/cpp/LoggerImpl.cpp
View File

@@ -4,10 +4,10 @@
#include "LoggerImpl.h"
#include <fmt/format.h>
#include <wpi/Logger.h>
#include <wpi/SmallVector.h>
#include <wpi/fs.h>
#include <wpi/print.h>
#include "IListenerStorage.h"
@@ -16,7 +16,7 @@ using namespace nt;
static void DefaultLogger(unsigned int level, const char* file,
unsigned int line, const char* msg) {
if (level == wpi::WPI_LOG_INFO) {
fmt::print(stderr, "NT: {}\n", msg);
wpi::print(stderr, "NT: {}\n", msg);
return;
}
@@ -30,7 +30,7 @@ static void DefaultLogger(unsigned int level, const char* file,
} else {
return;
}
fmt::print(stderr, "NT: {}: {} ({}:{})\n", levelmsg, msg, file, line);
wpi::print(stderr, "NT: {}: {} ({}:{})\n", levelmsg, msg, file, line);
}
static constexpr unsigned int kFlagCritical = 1u << 16;

10
ntcore/src/main/native/cpp/networktables/NetworkTableInstance.cpp
View File

@@ -4,8 +4,8 @@
#include "networktables/NetworkTableInstance.h"
#include <fmt/format.h>
#include <wpi/SmallVector.h>
#include <wpi/print.h>
#include "networktables/BooleanArrayTopic.h"
#include "networktables/BooleanTopic.h"
@@ -105,7 +105,7 @@ NT_Listener NetworkTableInstance::AddListener(Topic topic,
unsigned int eventMask,
ListenerCallback listener) {
if (::nt::GetInstanceFromHandle(topic.GetHandle()) != m_handle) {
fmt::print(stderr, "AddListener: topic is not from this instance\n");
wpi::print(stderr, "AddListener: topic is not from this instance\n");
return 0;
}
return ::nt::AddListener(topic.GetHandle(), eventMask, std::move(listener));
@@ -115,7 +115,7 @@ NT_Listener NetworkTableInstance::AddListener(Subscriber& subscriber,
unsigned int eventMask,
ListenerCallback listener) {
if (::nt::GetInstanceFromHandle(subscriber.GetHandle()) != m_handle) {
fmt::print(stderr, "AddListener: subscriber is not from this instance\n");
wpi::print(stderr, "AddListener: subscriber is not from this instance\n");
return 0;
}
return ::nt::AddListener(subscriber.GetHandle(), eventMask,
@@ -126,7 +126,7 @@ NT_Listener NetworkTableInstance::AddListener(const NetworkTableEntry& entry,
int eventMask,
ListenerCallback listener) {
if (::nt::GetInstanceFromHandle(entry.GetHandle()) != m_handle) {
fmt::print(stderr, "AddListener: entry is not from this instance\n");
wpi::print(stderr, "AddListener: entry is not from this instance\n");
return 0;
}
return ::nt::AddListener(entry.GetHandle(), eventMask, std::move(listener));
@@ -136,7 +136,7 @@ NT_Listener NetworkTableInstance::AddListener(MultiSubscriber& subscriber,
int eventMask,
ListenerCallback listener) {
if (::nt::GetInstanceFromHandle(subscriber.GetHandle()) != m_handle) {
fmt::print(stderr, "AddListener: subscriber is not from this instance\n");
wpi::print(stderr, "AddListener: subscriber is not from this instance\n");
return 0;
}
return ::nt::AddListener(subscriber.GetHandle(), eventMask,