nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-12-15 05:21:03 +01:00
Code Activity

No more Path in libnixcmd

Browse source 
Co-authored-by: Vinayak Goyal <vinayakankugoyal@gmail.com>
This commit is contained in:
John Ericson 2024-09-18 12:07:15 -04:00 • committed by Ubuntu
parent 88c9c6d89d
commit 84079e10cf
14 changed files with 52 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libutil/args.cc
View file

@ -371,13 +371,13 @@ void RootArgs::parseCmdline(const Strings & _cmdline, bool allowShebang)
d.completer(*completions, d.n, d.prefix);
}
Path Args::getCommandBaseDir() const
std::filesystem::path Args::getCommandBaseDir() const
{
assert(parent);
return parent->getCommandBaseDir();
}
Path RootArgs::getCommandBaseDir() const
std::filesystem::path RootArgs::getCommandBaseDir() const
{
return commandBaseDir;
}

2
src/libutil/include/nix/util/args.hh
View file

@ -59,7 +59,7 @@ public:
*
* This only returns the correct value after parseCmdline() has run.
*/
virtual Path getCommandBaseDir() const;
virtual std::filesystem::path getCommandBaseDir() const;
protected:

4
src/libutil/include/nix/util/args/root.hh
View file

@ -38,7 +38,7 @@ protected:
*
* @see getCommandBaseDir()
*/
Path commandBaseDir = ".";
std::filesystem::path commandBaseDir = ".";
public:
/** Parse the command line, throwing a UsageError if something goes
@ -48,7 +48,7 @@ public:
std::shared_ptr<Completions> completions;
Path getCommandBaseDir() const override;
std::filesystem::path getCommandBaseDir() const override;
protected: