NixOS/nix
NixOS/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2024-09-19 10:50:24 -04:00
Code Activity

serialise.hh: Use std::string_view

Browse source
This commit is contained in:
Eelco Dolstra 2022-01-17 19:28:42 +01:00
parent 008ddef4b0
commit 776eb97a43
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/build/derivation-goal.cc
View file

@ -278,7 +278,7 @@ void DerivationGoal::outputsSubstitutionTried()
if (nrFailed > 0 && nrFailed > nrNoSubstituters + nrIncompleteClosure && !settings.tryFallback) { if (nrFailed > 0 && nrFailed > nrNoSubstituters + nrIncompleteClosure && !settings.tryFallback) {
done(BuildResult::TransientFailure, done(BuildResult::TransientFailure,
fmt("some substitutes for the outputs of derivation '%s' failed (usually happens due to networking issues); try '--fallback' to build derivation from source ", Error("some substitutes for the outputs of derivation '%s' failed (usually happens due to networking issues); try '--fallback' to build derivation from source ",
worker.store.printStorePath(drvPath))); worker.store.printStorePath(drvPath)));
return; return;
} }

2
src/libutil/error.hh
View file

@ -137,7 +137,7 @@ public:
{ } { }
template<typename... Args> template<typename... Args>
BaseError(const std::string & fs, const Args & ... args) explicit BaseError(const std::string & fs, const Args & ... args)
: err { .level = lvlError, .msg = hintfmt(fs, args...) } : err { .level = lvlError, .msg = hintfmt(fs, args...) }
{ } { }

2
src/libutil/serialise.cc
View file

@ -325,7 +325,7 @@ void writeString(std::string_view data, Sink & sink)
} }
Sink & operator << (Sink & sink, const string & s) Sink & operator << (Sink & sink, std::string_view s)
{ {
writeString(s, sink); writeString(s, sink);
return sink; return sink;

4
src/libutil/serialise.hh
View file

@ -317,10 +317,10 @@ inline Sink & operator << (Sink & sink, uint64_t n)
return sink; return sink;
} }
Sink & operator << (Sink & sink, const string & s); Sink & operator << (Sink & in, const Error & ex);
Sink & operator << (Sink & sink, std::string_view s);
Sink & operator << (Sink & sink, const Strings & s); Sink & operator << (Sink & sink, const Strings & s);
Sink & operator << (Sink & sink, const StringSet & s); Sink & operator << (Sink & sink, const StringSet & s);
Sink & operator << (Sink & in, const Error & ex);
MakeError(SerialisationError, Error); MakeError(SerialisationError, Error);