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

Apply suggestions from code review

Browse source 
Style fixes from @edolstra

Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
This commit is contained in:
tomberek 2022-05-20 01:28:20 -04:00 committed by GitHub
parent f21dec5bef
commit 7d7e00272a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/nix/repl.cc
View file

@ -97,7 +97,7 @@ std::string removeWhitespace(std::string s)
} }
NixRepl::NixRepl(const Strings & searchPath, nix::ref<Store> store,ref<EvalState> state, NixRepl::NixRepl(const Strings & searchPath, nix::ref<Store> store, ref<EvalState> state,
std::function<NixRepl::AnnotatedValues()> getValues) std::function<NixRepl::AnnotatedValues()> getValues)
: state(state) : state(state)
, getValues(getValues) , getValues(getValues)
@ -691,8 +691,8 @@ void NixRepl::reloadFiles()
loadFile(i); loadFile(i);
} }
for (auto & [i,what] : getValues()) { for (auto & [i, what] : getValues()) {
notice("Loading Installable '%1%'...", what); notice("Loading installable '%1%'...", what);
addAttrsToScope(*i); addAttrsToScope(*i);
} }
} }
@ -943,13 +943,13 @@ struct CmdRepl : InstallablesCommand
auto what = installable->what(); auto what = installable->what();
state->forceValue(*val, pos); state->forceValue(*val, pos);
auto autoArgs = getAutoArgs(*state); auto autoArgs = getAutoArgs(*state);
Value *valPost = state->allocValue(); auto valPost = state->allocValue();
state->autoCallFunction(*autoArgs, *val, *valPost); state->autoCallFunction(*autoArgs, *val, *valPost);
state->forceValue(*valPost, pos); state->forceValue(*valPost, pos);
values.push_back( {valPost, what }); values.push_back( {valPost, what });
} else { } else {
auto [val, pos] = installable->toValue(*state); auto [val, pos] = installable->toValue(*state);
values.push_back( {val,what} ); values.push_back( {val, what} );
} }
} }
return values; return values;