Rebase

clap-rs · Aug 12, 2020 · 39fadbf · 39fadbf
1 parent 6169bb8
commit 39fadbf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/build/app/debug_asserts.rs b/src/build/app/debug_asserts.rs
@@ -1,4 +1,4 @@
-use crate::{App, AppSettings, ArgSettings};
+use crate::{App, AppSettings, ArgSettings, ValueHint};
 use std::cmp::Ordering;
 
 #[derive(Eq)]
@@ -197,7 +197,7 @@ pub(crate) fn assert_app(app: &App) {
             );
 
             assert!(
-                self.is_set(AppSettings::TrailingVarArg),
+                app.is_set(AppSettings::TrailingVarArg),
                 "Positional argument '{}' has hint CommandWithArguments, so App must have TrailingVarArg set.",
                 arg.name
             );

diff --git a/src/build/app/mod.rs b/src/build/app/mod.rs
@@ -28,7 +28,7 @@ use crate::{
     output::{fmt::Colorizer, Help, HelpWriter, Usage},
     parse::{ArgMatcher, ArgMatches, Input, Parser},
     util::{safe_exit, termcolor::ColorChoice, ArgStr, Id, Key},
-    Result as ClapResult, ValueHint, INTERNAL_ERROR_MSG,
+    Result as ClapResult, INTERNAL_ERROR_MSG,
 };
 
 // FIXME (@CreepySkeleton): some of these variants are never constructed