aboutsummaryrefslogtreecommitdiff
path: root/src/libstore/content-address.cc
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2020-09-22 11:40:19 +0200
committerEelco Dolstra <edolstra@gmail.com>2020-09-22 11:40:19 +0200
commit35a0ac183858ecb03e313e088562c84fe211e20d (patch)
tree35cf8728a8c10e385801d4148053def1a82da1fd /src/libstore/content-address.cc
parent92ac8df0ec0b81d3655229f488201634e99088f8 (diff)
Style fixes
Diffstat (limited to 'src/libstore/content-address.cc')
-rw-r--r--src/libstore/content-address.cc26
1 files changed, 17 insertions, 9 deletions
diff --git a/src/libstore/content-address.cc b/src/libstore/content-address.cc
index 74215c545..90a3ad1f5 100644
--- a/src/libstore/content-address.cc
+++ b/src/libstore/content-address.cc
@@ -4,11 +4,13 @@
namespace nix {
-std::string FixedOutputHash::printMethodAlgo() const {
+std::string FixedOutputHash::printMethodAlgo() const
+{
return makeFileIngestionPrefix(method) + printHashType(hash.type);
}
-std::string makeFileIngestionPrefix(const FileIngestionMethod m) {
+std::string makeFileIngestionPrefix(const FileIngestionMethod m)
+{
switch (m) {
case FileIngestionMethod::Flat:
return "";
@@ -26,7 +28,8 @@ std::string makeFixedOutputCA(FileIngestionMethod method, const Hash & hash)
+ hash.to_string(Base32, true);
}
-std::string renderContentAddress(ContentAddress ca) {
+std::string renderContentAddress(ContentAddress ca)
+{
return std::visit(overloaded {
[](TextHash th) {
return "text:" + th.hash.to_string(Base32, true);
@@ -37,7 +40,8 @@ std::string renderContentAddress(ContentAddress ca) {
}, ca);
}
-std::string renderContentAddressMethod(ContentAddressMethod cam) {
+std::string renderContentAddressMethod(ContentAddressMethod cam)
+{
return std::visit(overloaded {
[](TextHashMethod &th) {
return std::string{"text:"} + printHashType(htSHA256);
@@ -51,7 +55,8 @@ std::string renderContentAddressMethod(ContentAddressMethod cam) {
/*
Parses content address strings up to the hash.
*/
-static ContentAddressMethod parseContentAddressMethodPrefix(std::string_view & rest) {
+static ContentAddressMethod parseContentAddressMethodPrefix(std::string_view & rest)
+{
std::string_view wholeInput { rest };
std::string_view prefix;
@@ -113,16 +118,19 @@ ContentAddress parseContentAddress(std::string_view rawCa) {
}, caMethod);
}
-ContentAddressMethod parseContentAddressMethod(std::string_view caMethod) {
+ContentAddressMethod parseContentAddressMethod(std::string_view caMethod)
+{
std::string_view asPrefix {std::string{caMethod} + ":"};
return parseContentAddressMethodPrefix(asPrefix);
}
-std::optional<ContentAddress> parseContentAddressOpt(std::string_view rawCaOpt) {
- return rawCaOpt == "" ? std::optional<ContentAddress> {} : parseContentAddress(rawCaOpt);
+std::optional<ContentAddress> parseContentAddressOpt(std::string_view rawCaOpt)
+{
+ return rawCaOpt == "" ? std::optional<ContentAddress>() : parseContentAddress(rawCaOpt);
};
-std::string renderContentAddress(std::optional<ContentAddress> ca) {
+std::string renderContentAddress(std::optional<ContentAddress> ca)
+{
return ca ? renderContentAddress(*ca) : "";
}