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

Merge pull request #13199 from NixOS/mergify/bp/2.29-maintenance/pr-13196

Browse source 
rename StoreDirConfigItself to StoreDirConfigBase (backport #13196)
This commit is contained in:
Eelco Dolstra 2025-05-15 12:44:09 +02:00 • committed by GitHub
commit 27932ae6da
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libstore/include/nix/store/store-dir-config.hh
View file

@ -104,7 +104,7 @@ struct MixStoreDirMethods
* Need to make this a separate class so I can get the right * Need to make this a separate class so I can get the right
* initialization order in the constructor for `StoreDirConfig`. * initialization order in the constructor for `StoreDirConfig`.
*/ */
struct StoreDirConfigItself : Config struct StoreDirConfigBase : Config
{ {
using Config::Config; using Config::Config;
@ -118,12 +118,12 @@ struct StoreDirConfigItself : Config
}; };
/** /**
* The order of `StoreDirConfigItself` and then `MixStoreDirMethods` is * The order of `StoreDirConfigBase` and then `MixStoreDirMethods` is
* very important. This ensures that `StoreDirConfigItself::storeDir_` * very important. This ensures that `StoreDirConfigBase::storeDir_`
* is initialized before we have our one chance (because references are * is initialized before we have our one chance (because references are
* immutable) to initialize `MixStoreDirMethods::storeDir`. * immutable) to initialize `MixStoreDirMethods::storeDir`.
*/ */
struct StoreDirConfig : StoreDirConfigItself, MixStoreDirMethods struct StoreDirConfig : StoreDirConfigBase, MixStoreDirMethods
{ {
using Params = std::map<std::string, std::string>; using Params = std::map<std::string, std::string>;

2
src/libstore/store-dir-config.cc
View file

@ -5,7 +5,7 @@
namespace nix { namespace nix {
StoreDirConfig::StoreDirConfig(const Params & params) StoreDirConfig::StoreDirConfig(const Params & params)
: StoreDirConfigItself(params) : StoreDirConfigBase(params)
, MixStoreDirMethods{storeDir_} , MixStoreDirMethods{storeDir_}
{ {
} }