nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-10 20:46:01 +01:00
Code Activity

Apply clang-format universally.

Browse source 
* It is tough to contribute to a project that doesn't use a formatter,
* It is extra hard to contribute to a project which has configured the formatter, but ignores it for some files
* Code formatting makes it harder to hide obscure / weird bugs by accident or on purpose,

Let's rip the bandaid off?

Note that PRs currently in flight should be able to be merged relatively easily by applying `clang-format` to their tip prior to merge.
This commit is contained in:
Graham Christensen 2025-07-18 12:47:27 -04:00
parent 41bf87ec70
commit e4f62e4608
587 changed files with 23258 additions and 23135 deletions
Download patch file Download diff file Expand all files Collapse all files

60
src/libutil/url.cc
View file

@ -13,18 +13,15 @@ std::regex revRegex(revRegexS, std::regex::ECMAScript);
ParsedURL parseURL(const std::string & url)
{
static std::regex uriRegex(
"((" + schemeNameRegex + "):"
+ "(?:(?://(" + authorityRegex + ")(" + absPathRegex + "))|(/?" + pathRegex + ")))"
+ "(?:\\?(" + queryRegex + "))?"
+ "(?:#(" + fragmentRegex + "))?",
"((" + schemeNameRegex + "):" + "(?:(?://(" + authorityRegex + ")(" + absPathRegex + "))|(/?" + pathRegex
+ ")))" + "(?:\\?(" + queryRegex + "))?" + "(?:#(" + fragmentRegex + "))?",
std::regex::ECMAScript);
std::smatch match;
if (std::regex_match(url, match, uriRegex)) {
std::string scheme = match[2];
auto authority = match[3].matched
? std::optional<std::string>(match[3]) : std::nullopt;
auto authority = match[3].matched ? std::optional<std::string>(match[3]) : std::nullopt;
std::string path = match[4].matched ? match[4] : match[5];
auto & query = match[6];
auto & fragment = match[7];
@ -32,8 +29,7 @@ ParsedURL parseURL(const std::string & url)
auto transportIsFile = parseUrlScheme(scheme).transport == "file";
if (authority && *authority != "" && transportIsFile)
throw BadURL("file:// URL '%s' has unexpected authority '%s'",
url, *authority);
throw BadURL("file:// URL '%s' has unexpected authority '%s'", url, *authority);
if (transportIsFile && path.empty())
path = "/";
@ -43,8 +39,7 @@ ParsedURL parseURL(const std::string & url)
.authority = authority,
.path = percentDecode(path),
.query = decodeQuery(query),
.fragment = percentDecode(std::string(fragment))
};
.fragment = percentDecode(std::string(fragment))};
}
else
@ -54,7 +49,7 @@ ParsedURL parseURL(const std::string & url)
std::string percentDecode(std::string_view in)
{
std::string decoded;
for (size_t i = 0; i < in.size(); ) {
for (size_t i = 0; i < in.size();) {
if (in[i] == '%') {
if (i + 2 >= in.size())
throw BadURL("invalid URI parameter '%s'", in);
@ -81,9 +76,7 @@ StringMap decodeQuery(const std::string & query)
continue;
}
result.emplace(
s.substr(0, e),
percentDecode(std::string_view(s).substr(e + 1)));
result.emplace(s.substr(0, e), percentDecode(std::string_view(s).substr(e + 1)));
}
return result;
@ -97,10 +90,7 @@ std::string percentEncode(std::string_view s, std::string_view keep)
std::string res;
for (auto & c : s)
// unreserved + keep
if ((c >= 'a' && c <= 'z')
|| (c >= 'A' && c <= 'Z')
|| (c >= '0' && c <= '9')
|| strchr("-._~", c)
if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || strchr("-._~", c)
|| keep.find(c) != std::string::npos)
res += c;
else
@ -113,7 +103,8 @@ std::string encodeQuery(const StringMap & ss)
std::string res;
bool first = true;
for (auto & [name, value] : ss) {
if (!first) res += '&';
if (!first)
res += '&';
first = false;
res += percentEncode(name, allowedInQuery);
res += '=';
@ -124,29 +115,20 @@ std::string encodeQuery(const StringMap & ss)
std::string ParsedURL::to_string() const
{
return
scheme
+ ":"
+ (authority ? "//" + *authority : "")
+ percentEncode(path, allowedInPath)
+ (query.empty() ? "" : "?" + encodeQuery(query))
+ (fragment.empty() ? "" : "#" + percentEncode(fragment));
return scheme + ":" + (authority ? "//" + *authority : "") + percentEncode(path, allowedInPath)
+ (query.empty() ? "" : "?" + encodeQuery(query)) + (fragment.empty() ? "" : "#" + percentEncode(fragment));
}
std::ostream & operator << (std::ostream & os, const ParsedURL & url)
std::ostream & operator<<(std::ostream & os, const ParsedURL & url)
{
os << url.to_string();
return os;
}
bool ParsedURL::operator ==(const ParsedURL & other) const noexcept
bool ParsedURL::operator==(const ParsedURL & other) const noexcept
{
return
scheme == other.scheme
&& authority == other.authority
&& path == other.path
&& query == other.query
&& fragment == other.fragment;
return scheme == other.scheme && authority == other.authority && path == other.path && query == other.query
&& fragment == other.fragment;
}
ParsedURL ParsedURL::canonicalise()
@ -167,7 +149,7 @@ ParsedUrlScheme parseUrlScheme(std::string_view scheme)
{
auto application = splitPrefixTo(scheme, '+');
auto transport = scheme;
return ParsedUrlScheme {
return ParsedUrlScheme{
.application = application,
.transport = transport,
};
@ -181,11 +163,7 @@ std::string fixGitURL(const std::string & url)
if (hasPrefix(url, "file:"))
return url;
if (url.find("://") == std::string::npos) {
return (ParsedURL {
.scheme = "file",
.authority = "",
.path = url
}).to_string();
return (ParsedURL{.scheme = "file", .authority = "", .path = url}).to_string();
}
return url;
}
@ -198,4 +176,4 @@ bool isValidSchemeName(std::string_view s)
return std::regex_match(s.begin(), s.end(), regex, std::regex_constants::match_default);
}
}
} // namespace nix