arcuru/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Use auto with some FileIngestionMethod local variables

Browse source
This commit is contained in:
John Ericson 2020-03-30 18:15:55 -04:00
parent 225e62a56a
commit bbbb7c1bc7
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/primops.cc
View file

@ -563,7 +563,7 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
std::optional<std::string> outputHash; std::optional<std::string> outputHash;
std::string outputHashAlgo; std::string outputHashAlgo;
FileIngestionMethod outputHashRecursive = FileIngestionMethod::Flat; auto outputHashRecursive = FileIngestionMethod::Flat;
StringSet outputs; StringSet outputs;
outputs.insert("out"); outputs.insert("out");

4
src/nix-store/nix-store.cc
View file

@ -174,7 +174,7 @@ static void opAdd(Strings opFlags, Strings opArgs)
store. */ store. */
static void opAddFixed(Strings opFlags, Strings opArgs) static void opAddFixed(Strings opFlags, Strings opArgs)
{ {
FileIngestionMethod recursive = FileIngestionMethod::Flat; auto recursive = FileIngestionMethod::Flat;
for (auto & i : opFlags) for (auto & i : opFlags)
if (i == "--recursive") recursive = FileIngestionMethod::Recursive; if (i == "--recursive") recursive = FileIngestionMethod::Recursive;
@ -194,7 +194,7 @@ static void opAddFixed(Strings opFlags, Strings opArgs)
/* Hack to support caching in `nix-prefetch-url'. */ /* Hack to support caching in `nix-prefetch-url'. */
static void opPrintFixedPath(Strings opFlags, Strings opArgs) static void opPrintFixedPath(Strings opFlags, Strings opArgs)
{ {
FileIngestionMethod recursive = FileIngestionMethod::Flat; auto recursive = FileIngestionMethod::Flat;
for (auto i : opFlags) for (auto i : opFlags)
if (i == "--recursive") recursive = FileIngestionMethod::Recursive; if (i == "--recursive") recursive = FileIngestionMethod::Recursive;