max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-26 07:46:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move flakeIdRegex{,S} from libutil to flakeref.{cc,hh

Browse source 
It isn't used, and doesn't belong in `libutil`.
This commit is contained in:
John Ericson 2023-09-28 20:55:41 -04:00
parent cede94dbf7
commit b912f3a937
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/flake/flakeref.cc
View file

@ -289,4 +289,6 @@ std::tuple<FlakeRef, std::string, ExtendedOutputsSpec> parseFlakeRefWithFragment
return {std::move(flakeRef), fragment, std::move(extendedOutputsSpec)}; return {std::move(flakeRef), fragment, std::move(extendedOutputsSpec)};
} }
std::regex flakeIdRegex(flakeIdRegexS, std::regex::ECMAScript);
} }

3
src/libexpr/flake/flakeref.hh
View file

@ -6,6 +6,7 @@
#include "fetchers.hh" #include "fetchers.hh"
#include "outputs-spec.hh" #include "outputs-spec.hh"
#include <regex>
#include <variant> #include <variant>
namespace nix { namespace nix {
@ -91,5 +92,7 @@ std::tuple<FlakeRef, std::string, ExtendedOutputsSpec> parseFlakeRefWithFragment
bool allowMissing = false, bool allowMissing = false,
bool isFlake = true); bool isFlake = true);
const static std::string flakeIdRegexS = "[a-zA-Z][a-zA-Z0-9_-]*";
extern std::regex flakeIdRegex;
} }

3
src/libutil/url-parts.hh
View file

@ -41,7 +41,4 @@ extern std::regex revRegex;
/// A ref or revision, or a ref followed by a revision. /// A ref or revision, or a ref followed by a revision.
const static std::string refAndOrRevRegex = "(?:(" + revRegexS + ")|(?:(" + refRegexS + ")(?:/(" + revRegexS + "))?))"; const static std::string refAndOrRevRegex = "(?:(" + revRegexS + ")|(?:(" + refRegexS + ")(?:/(" + revRegexS + "))?))";
const static std::string flakeIdRegexS = "[a-zA-Z][a-zA-Z0-9_-]*";
extern std::regex flakeIdRegex;
} }

1
src/libutil/url.cc
View file

@ -8,7 +8,6 @@ namespace nix {
std::regex refRegex(refRegexS, std::regex::ECMAScript); std::regex refRegex(refRegexS, std::regex::ECMAScript);
std::regex badGitRefRegex(badGitRefRegexS, std::regex::ECMAScript); std::regex badGitRefRegex(badGitRefRegexS, std::regex::ECMAScript);
std::regex revRegex(revRegexS, std::regex::ECMAScript); std::regex revRegex(revRegexS, std::regex::ECMAScript);
std::regex flakeIdRegex(flakeIdRegexS, std::regex::ECMAScript);
ParsedURL parseURL(const std::string & url) ParsedURL parseURL(const std::string & url)
{ {