cleanup: use name importing

test/action_test.cpp

@@ -33,32 +33,32 @@ int typed_main(Args const &, Action const &) {
 }
 
 struct Checkout : program::Arguments<Checkout> {
-  using program::Arguments<Checkout>::Arguments;
+  using Arguments::Arguments;
   std::string commitish = argument(0, "commit-ish");
 };
 
 struct Commit : program::Arguments<Commit> {
-  using program::Arguments<Commit>::Arguments;
+  using Arguments::Arguments;
   std::string message = option("message", 'm');
 };
 
 struct Bad1 : program::Arguments<Bad1> {
-  using program::Arguments<Bad1>::Arguments;
-  
+  using Arguments::Arguments;
+
   Commit commit = action("commit");
   std::string arg0 = argument(0, "arg0");
 };
 
 struct Bad2 : program::Arguments<Bad2> {
-  using program::Arguments<Bad2>::Arguments;
-  
+  using Arguments::Arguments;
+
   std::string arg0 = argument(0, "arg0");
   Commit commit = action("commit");
 };
 
 struct Git : program::Arguments<Git> {
-  using program::Arguments<Git>::Arguments;
-  
+  using Arguments::Arguments;
+
   bool verbose = flag("verbose", 'v');
   
   Commit commit = action("commit");

test/argument_test.cpp

@@ -18,7 +18,7 @@ template <typename T, size_t N> static T parse(char const * const (&argv)[N]) {
 }
 
 struct ArgumentTest : program::Arguments<ArgumentTest> {
-  using program::Arguments<ArgumentTest>::Arguments;
+  using Arguments::Arguments;
 
   std::string arg0 = argument(0, "arg0");
 };
@@ -39,7 +39,7 @@ TEST(ArgumentTest, HasNoIssueWithOverflowArg) {
 }
 
 struct OptionalArgumentTest : program::Arguments<OptionalArgumentTest> {
-  using program::Arguments<OptionalArgumentTest>::Arguments;
+  using Arguments::Arguments;
 
   std::string arg0 = argument(0, "arg0");
   std::string arg1 = argument(1, "arg1") = "second";
@@ -62,7 +62,7 @@ TEST(OptionalArgumentTest, DoesNotOverflowSecondArg) {
 }
 
 struct DuplicateArgumentTest : program::Arguments<DuplicateArgumentTest> {
-  using program::Arguments<DuplicateArgumentTest>::Arguments;
+  using Arguments::Arguments;
 
   std::string arg0 = argument(0, "arg0");
   std::string arg1 = argument(0, "arg1");
@@ -73,7 +73,7 @@ TEST(DuplicateArgumentTest, ThrowsOnConstruction) {
 }
 
 struct SkippedArgumentTest : program::Arguments<SkippedArgumentTest> {
-  using program::Arguments<SkippedArgumentTest>::Arguments;
+  using Arguments::Arguments;
 
   std::string arg0 = argument(1, "arg0");
 };
@@ -85,7 +85,7 @@ TEST(SkippedArgumentTest, ThrowsOnParsing) {
 }
 
 struct OOOArgumentTest : program::Arguments<OOOArgumentTest> {
-  using program::Arguments<OOOArgumentTest>::Arguments;
+  using Arguments::Arguments;
 
   std::string arg0 = argument(0, "arg0") = "";
   std::string arg1 = argument(1, "arg1");

test/flag_test.cpp

@@ -16,7 +16,7 @@ template <typename T, size_t N> static T parse(char const * const (&argv)[N]) {
 }
 
 struct FlagTest : program::Arguments<FlagTest> {
-  using program::Arguments<FlagTest>::Arguments;
+  using Arguments::Arguments;
 
   bool dry_run = flag("dry-run");
   int verbosity = flag("verbose");
@@ -57,7 +57,7 @@ TEST(FlagTest, IntegerFlagCanBeRepeated) {
 }
 
 struct FlagWithDefaultTest : program::Arguments<FlagWithDefaultTest> {
-  using program::Arguments<FlagWithDefaultTest>::Arguments;
+  using Arguments::Arguments;
 
   bool dry_run = flag("dry-run") = true;
 };
@@ -73,7 +73,7 @@ TEST(FlagWithDefaultTest, BooleanFlagCanBeInverted) {
 }
 
 struct FlagWithAbbrevTest : program::Arguments<FlagWithAbbrevTest> {
-  using program::Arguments<FlagWithAbbrevTest>::Arguments;
+  using Arguments::Arguments;
 
   bool dry_run = flag("dry-run", 'k');
   int verbosity = flag("verbose", 'v');

test/options_test.cpp

@@ -20,7 +20,7 @@ template <typename T, size_t N> static T parse(char const * const (&argv)[N]) {
 }
 
 struct LongOptionTest : program::Arguments<LongOptionTest> {
-  using program::Arguments<LongOptionTest>::Arguments;
+  using Arguments::Arguments;
 
   std::string endpoint = option("endpoint");
   int port = option("port");
@@ -64,7 +64,7 @@ TEST(LongOptionTest, DoesNotImplicitlyShortenArgs) {
 
 struct LongOptionWithDefaultTest
     : program::Arguments<LongOptionWithDefaultTest> {
-  using program::Arguments<LongOptionWithDefaultTest>::Arguments;
+  using Arguments::Arguments;
 
   std::string endpoint = option("endpoint") = "/default";
   int port = option("port") = 8080;
@@ -88,7 +88,7 @@ TEST(LongOptionWithDefaultTest, CanProvideNumericArgument) {
 }
 
 struct LongOptionWithAbbrevTest : program::Arguments<LongOptionWithAbbrevTest> {
-  using program::Arguments<LongOptionWithAbbrevTest>::Arguments;
+  using Arguments::Arguments;
 
   std::string endpoint = option("endpoint", 'e');
   int port = option("port", 'p');
@@ -128,7 +128,7 @@ TEST(LongOptionWithAbbrevTest, CanPutAbbrevArgAndValueInSameToken) {
 }
 
 struct LongOptionRepeatTest : program::Arguments<LongOptionRepeatTest> {
-  using program::Arguments<LongOptionRepeatTest>::Arguments;
+  using Arguments::Arguments;
 
   std::vector<int> port = option("port");
 };
@@ -151,7 +151,7 @@ TEST(LongOptionRepeatTest, RepeatingArgumentsAppends) {
 
 struct LongOptionRepeatWithDefaultTest
     : program::Arguments<LongOptionRepeatWithDefaultTest> {
-  using program::Arguments<LongOptionRepeatWithDefaultTest>::Arguments;
+  using Arguments::Arguments;
 
   std::vector<int> port = option("port") = std::vector{8080};
 };

test/usage_test.cpp

@@ -25,7 +25,7 @@ template <typename T> auto usage() {
 }
 
 struct ArgNamesTest : program::Arguments<ArgNamesTest> {
-  using program::Arguments<ArgNamesTest>::Arguments;
+  using Arguments::Arguments;
   bool dry_run = flag("dry-run");
   int level = option("level");
   int port = option("port", 'p');
@@ -47,7 +47,7 @@ TEST(ArgNamesTest, PrintsOutBothSingleNameWithoutAbbrev) {
 }
 
 struct ArgDescTest : program::Arguments<ArgDescTest> {
-  using program::Arguments<ArgDescTest>::Arguments;
+  using Arguments::Arguments;
   int port = option("port", "The host port to listen on for web traffic");
 };
 
@@ -57,7 +57,7 @@ TEST(ArgDescTest, PrintsOutBothArgsWhenRelevant) {
 }
 
 struct ArgDefValTest : program::Arguments<ArgDefValTest> {
-  using program::Arguments<ArgDefValTest>::Arguments;
+  using Arguments::Arguments;
   int level = option("level") = 5;
   int port = option("port", "The host port to listen on for web traffic") =
       8080;