wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 10:41:16 +02:00
Code Activity

nix-expr: remove EvalSettings::addPrimOp, add const

Browse source 
Not required for a struct and potentially confusing.
This commit is contained in:
Robert Hensing 2025-03-26 19:22:40 +00:00
parent d48101109d
commit 6fc9651d57
4 changed files with 5 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/libexpr/eval-settings.cc
View file

@ -103,13 +103,4 @@ Path getNixDefExpr()
: getHome() + "/.nix-defexpr"; : getHome() + "/.nix-defexpr";
} }
void EvalSettings::addPrimOp(PrimOp && primOp)
{
extraPrimOps.emplace_back(std::move(primOp));
}
void EvalSettings::addPrimOp(const PrimOp & primOp)
{
extraPrimOps.emplace_back(PrimOp(primOp));
}
} // namespace nix } // namespace nix

9
src/libexpr/eval-settings.hh
View file

@ -53,15 +53,6 @@ struct EvalSettings : Config
std::vector<PrimOp> extraPrimOps; std::vector<PrimOp> extraPrimOps;
/**
* Register a primop to be added when an EvalState is created from these settings.
*/
void addPrimOp(PrimOp && primOp);
/**
* Register a primop to be added when an EvalState is created from these settings.
*/
void addPrimOp(const PrimOp & primOp);
Setting<bool> enableNativeCode{this, false, "allow-unsafe-native-code-during-evaluation", R"( Setting<bool> enableNativeCode{this, false, "allow-unsafe-native-code-during-evaluation", R"(
Enable built-in functions that allow executing native code. Enable built-in functions that allow executing native code.

8
src/libflake/flake/settings.cc
View file

@ -5,11 +5,11 @@ namespace nix::flake {
Settings::Settings() {} Settings::Settings() {}
void Settings::configureEvalSettings(nix::EvalSettings & evalSettings) void Settings::configureEvalSettings(nix::EvalSettings & evalSettings) const
{ {
evalSettings.addPrimOp(primops::getFlake(*this)); evalSettings.extraPrimOps.emplace_back(primops::getFlake(*this));
evalSettings.addPrimOp(primops::parseFlakeRef); evalSettings.extraPrimOps.emplace_back(primops::parseFlakeRef);
evalSettings.addPrimOp(primops::flakeRefToString); evalSettings.extraPrimOps.emplace_back(primops::flakeRefToString);
} }
} // namespace nix } // namespace nix

2
src/libflake/flake/settings.hh
View file

@ -17,7 +17,7 @@ struct Settings : public Config
{ {
Settings(); Settings();
void configureEvalSettings(nix::EvalSettings & evalSettings); void configureEvalSettings(nix::EvalSettings & evalSettings) const;
Setting<bool> useRegistries{ Setting<bool> useRegistries{
this, this,