mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-29 02:21:44 +00:00
Use std::string_view and fmtlib across all libraries (#3402)
- Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
This commit is contained in:
@@ -12,14 +12,12 @@
|
||||
|
||||
namespace wpi {
|
||||
|
||||
std::string Demangle(const Twine& mangledSymbol) {
|
||||
SmallString<128> buf;
|
||||
std::string Demangle(std::string_view mangledSymbol) {
|
||||
SmallString<128> buf{mangledSymbol};
|
||||
size_t length;
|
||||
int32_t status;
|
||||
|
||||
char* symbol =
|
||||
abi::__cxa_demangle(mangledSymbol.toNullTerminatedStringRef(buf).data(),
|
||||
nullptr, &length, &status);
|
||||
char* symbol = abi::__cxa_demangle(buf.c_str(), nullptr, &length, &status);
|
||||
if (status == 0) {
|
||||
std::string rv{symbol};
|
||||
std::free(symbol);
|
||||
@@ -27,7 +25,7 @@ std::string Demangle(const Twine& mangledSymbol) {
|
||||
}
|
||||
|
||||
// If everything else failed, just return the mangled symbol
|
||||
return mangledSymbol.str();
|
||||
return std::string{mangledSymbol};
|
||||
}
|
||||
|
||||
} // namespace wpi
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
#include "wpi/Demangle.h"
|
||||
#include "wpi/SmallString.h"
|
||||
#include "wpi/StringRef.h"
|
||||
#include "wpi/StringExtras.h"
|
||||
#include "wpi/raw_ostream.h"
|
||||
|
||||
namespace wpi {
|
||||
@@ -24,19 +24,18 @@ std::string GetStackTrace(int offset) {
|
||||
// Only print recursive functions once in a row.
|
||||
if (i == 0 || stackTrace[i] != stackTrace[i - 1]) {
|
||||
// extract just function name from "pathToExe(functionName+offset)"
|
||||
StringRef sym{mangledSymbols[i]};
|
||||
sym = sym.split('(').second;
|
||||
StringRef offset;
|
||||
std::tie(sym, offset) = sym.split('+');
|
||||
StringRef addr;
|
||||
std::tie(offset, addr) = offset.split(')');
|
||||
std::string_view sym = split(mangledSymbols[i], '(').second;
|
||||
std::string_view offset;
|
||||
std::tie(sym, offset) = split(sym, '+');
|
||||
std::string_view addr;
|
||||
std::tie(offset, addr) = split(offset, ')');
|
||||
trace << "\tat " << Demangle(sym) << " + " << offset << addr << "\n";
|
||||
}
|
||||
}
|
||||
|
||||
std::free(mangledSymbols);
|
||||
|
||||
return trace.str();
|
||||
return std::string{trace.str()};
|
||||
}
|
||||
|
||||
} // namespace wpi
|
||||
|
||||
Reference in New Issue
Block a user