From 5d0b75e5b6a1c70203257fecc25743e5a1e009cb Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sun, 12 Jul 2020 15:02:36 +0000
Subject: [PATCH] std::string_view for new derivation name parameters

---
 src/libstore/derivations.cc | 8 ++++----
 src/libstore/derivations.hh | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc
index bde147502..97fd21885 100644
--- a/src/libstore/derivations.cc
+++ b/src/libstore/derivations.cc
@@ -12,7 +12,7 @@ namespace nix {
 template<class... Ts> struct overloaded : Ts... { using Ts::operator()...; };
 template<class... Ts> overloaded(Ts...) -> overloaded<Ts...>;
 
-StorePath DerivationOutput::path(const Store & store, string drvName) const
+StorePath DerivationOutput::path(const Store & store, std::string_view drvName) const
 {
     return std::visit(overloaded {
         [](DerivationOutputExtensional doi) {
@@ -149,7 +149,7 @@ static DerivationOutput parseDerivationOutput(const Store & store, istringstream
 }
 
 
-static Derivation parseDerivation(const Store & store, const string & s, string name)
+static Derivation parseDerivation(const Store & store, const string & s, std::string_view name)
 {
     Derivation drv;
     drv.name = name;
@@ -197,7 +197,7 @@ static Derivation parseDerivation(const Store & store, const string & s, string
 }
 
 
-Derivation readDerivation(const Store & store, const Path & drvPath, std::string name)
+Derivation readDerivation(const Store & store, const Path & drvPath, std::string_view name)
 {
     try {
         return parseDerivation(store, readFile(drvPath), name);
@@ -465,7 +465,7 @@ StringSet BasicDerivation::outputNames() const
 }
 
 
-Source & readDerivation(Source & in, const Store & store, BasicDerivation & drv, string name)
+Source & readDerivation(Source & in, const Store & store, BasicDerivation & drv, std::string_view name)
 {
     drv.name = name;
 
diff --git a/src/libstore/derivations.hh b/src/libstore/derivations.hh
index 4694ec0dd..81c196ff7 100644
--- a/src/libstore/derivations.hh
+++ b/src/libstore/derivations.hh
@@ -26,7 +26,7 @@ struct DerivationOutputFixed
 struct DerivationOutput
 {
     std::variant<DerivationOutputExtensional, DerivationOutputFixed> output;
-    StorePath path(const Store & store, string drvName) const;
+    StorePath path(const Store & store, std::string_view drvName) const;
 };
 
 typedef std::map<string, DerivationOutput> DerivationOutputs;
@@ -45,7 +45,7 @@ struct BasicDerivation
     Path builder;
     Strings args;
     StringPairs env;
-    string name;
+    std::string name;
 
     BasicDerivation() { }
     virtual ~BasicDerivation() { };
@@ -87,7 +87,7 @@ StorePath writeDerivation(ref<Store> store,
     const Derivation & drv, std::string_view name, RepairFlag repair = NoRepair);
 
 /* Read a derivation from a file. */
-Derivation readDerivation(const Store & store, const Path & drvPath, string name);
+Derivation readDerivation(const Store & store, const Path & drvPath, std::string_view name);
 
 // FIXME: remove
 bool isDerivation(const string & fileName);
@@ -104,7 +104,7 @@ bool wantOutput(const string & output, const std::set<string> & wanted);
 struct Source;
 struct Sink;
 
-Source & readDerivation(Source & in, const Store & store, BasicDerivation & drv, string name);
+Source & readDerivation(Source & in, const Store & store, BasicDerivation & drv, std::string_view name);
 void writeDerivation(Sink & out, const Store & store, const BasicDerivation & drv);
 
 std::string hashPlaceholder(const std::string & outputName);