From e44dcd63c4d96807536cdcf2afb688a537cce9be Mon Sep 17 00:00:00 2001 From: Qyriad Date: Mon, 17 Jun 2024 14:45:10 -0600 Subject: [PATCH] remove InstallableValueCommand class Change-Id: Id12383f4741cba07159712700ebcfbe37e61560c --- src/libcmd/command-installable-value.cc | 11 ----------- src/libcmd/command-installable-value.hh | 23 ----------------------- src/libcmd/meson.build | 2 -- src/nix/develop.cc | 2 +- 4 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 src/libcmd/command-installable-value.cc delete mode 100644 src/libcmd/command-installable-value.hh diff --git a/src/libcmd/command-installable-value.cc b/src/libcmd/command-installable-value.cc deleted file mode 100644 index 7e0c15eb8..000000000 --- a/src/libcmd/command-installable-value.cc +++ /dev/null @@ -1,11 +0,0 @@ -#include "command-installable-value.hh" - -namespace nix { - -void InstallableValueCommand::run(ref store, ref installable) -{ - auto installableValue = InstallableValue::require(installable); - run(store, installableValue); -} - -} diff --git a/src/libcmd/command-installable-value.hh b/src/libcmd/command-installable-value.hh deleted file mode 100644 index 7880d4119..000000000 --- a/src/libcmd/command-installable-value.hh +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once -///@file - -#include "installable-value.hh" -#include "command.hh" - -namespace nix { - -/** - * An InstallableCommand where the single positional argument must be an - * InstallableValue in particular. - */ -struct InstallableValueCommand : InstallableCommand -{ - /** - * Entry point to this command - */ - virtual void run(ref store, ref installable) = 0; - - void run(ref store, ref installable) override; -}; - -} diff --git a/src/libcmd/meson.build b/src/libcmd/meson.build index 3d92f36a4..73deb035c 100644 --- a/src/libcmd/meson.build +++ b/src/libcmd/meson.build @@ -1,6 +1,5 @@ libcmd_sources = files( 'built-path.cc', - 'command-installable-value.cc', 'cmd-profiles.cc', 'command.cc', 'common-eval-args.cc', @@ -18,7 +17,6 @@ libcmd_sources = files( libcmd_headers = files( 'built-path.hh', - 'command-installable-value.hh', 'cmd-profiles.hh', 'command.hh', 'common-eval-args.hh', diff --git a/src/nix/develop.cc b/src/nix/develop.cc index 90bdf3bed..353bf0110 100644 --- a/src/nix/develop.cc +++ b/src/nix/develop.cc @@ -1,6 +1,6 @@ #include "eval.hh" #include "installable-flake.hh" -#include "command-installable-value.hh" +#include "command.hh" #include "common-args.hh" #include "shared.hh" #include "store-api.hh"