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

Use std::string_view and fmtlib across all libraries (#3402)

Browse Source 
- 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:
Peter Johnson
2021-06-06 16:13:58 -07:00
committed by GitHub
parent 4f1cecb8e7
commit b2c3b2dd8e
441 changed files with 5061 additions and 9749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
wpiutil/examples/webserver/webserver.cpp
View File

@@ -4,10 +4,10 @@
#include <cstdio>
#include "fmt/format.h"
#include "wpi/EventLoopRunner.h"
#include "wpi/HttpServerConnection.h"
#include "wpi/UrlParser.h"
#include "wpi/raw_ostream.h"
#include "wpi/uv/Loop.h"
#include "wpi/uv/Tcp.h"
@@ -23,7 +23,7 @@ class MyHttpServerConnection : public wpi::HttpServerConnection {
};
void MyHttpServerConnection::ProcessRequest() {
wpi::errs() << "HTTP request: '" << m_request.GetUrl() << "'\n";
fmt::print(stderr, "HTTP request: '{}'\n", m_request.GetUrl());
wpi::UrlParser url{m_request.GetUrl(),
m_request.GetMethod() == wpi::HTTP_CONNECT};
if (!url.IsValid()) {
@@ -32,27 +32,25 @@ void MyHttpServerConnection::ProcessRequest() {
return;
}
wpi::StringRef path;
std::string_view path;
if (url.HasPath()) {
path = url.GetPath();
}
wpi::errs() << "path: \"" << path << "\"\n";
fmt::print(stderr, "path: \"{}\"\n", path);
wpi::StringRef query;
std::string_view query;
if (url.HasQuery()) {
query = url.GetQuery();
}
wpi::errs() << "query: \"" << query << "\"\n";
fmt::print(stderr, "query: \"{}\"\n", query);
const bool isGET = m_request.GetMethod() == wpi::HTTP_GET;
if (isGET && path.equals("/")) {
if (isGET && path == "/") {
// build HTML root page
wpi::SmallString<256> buf;
wpi::raw_svector_ostream os{buf};
os << "<html><head><title>WebServer Example</title></head>";
os << "<body><p>This is an example root page from the webserver.";
os << "</body></html>";
SendResponse(200, "OK", "text/html", os.str());
SendResponse(200, "OK", "text/html",
"<html><head><title>WebServer Example</title></head>"
"<body><p>This is an example root page from the webserver."
"</body></html>");
} else {
SendError(404, "Resource not found");
}
@@ -73,7 +71,7 @@ int main() {
if (!tcp) {
return;
}
wpi::errs() << "Got a connection\n";
std::fputs("Got a connection\n", stderr);
auto conn = std::make_shared<MyHttpServerConnection>(tcp);
tcp->SetData(conn);
});
@@ -81,7 +79,7 @@ int main() {
// start listening for incoming connections
tcp->Listen();
wpi::errs() << "Listening on port 8080\n";
std::fputs("Listening on port 8080\n", stderr);
});
// wait for a keypress to terminate