Merge pull request #3395 from epage/box

refactor: Prepare for replacing `info`

src/build/app/mod.rs

@@ -23,14 +23,14 @@ use os_str_bytes::RawOsStr;
 use yaml_rust::Yaml;
 
 // Internal
-use crate::{
-    build::{arg::ArgProvider, Arg, ArgGroup, ArgPredicate, ArgSettings},
-    mkeymap::MKeyMap,
-    output::{fmt::Colorizer, Help, HelpWriter, Usage},
-    parse::{ArgMatcher, ArgMatches, Input, Parser},
-    util::{color::ColorChoice, Id, Key},
-    Error, ErrorKind, Result as ClapResult, INTERNAL_ERROR_MSG,
-};
+use crate::build::{arg::ArgProvider, Arg, ArgGroup, ArgPredicate, ArgSettings};
+use crate::error::ErrorKind;
+use crate::error::Result as ClapResult;
+use crate::mkeymap::MKeyMap;
+use crate::output::{fmt::Colorizer, Help, HelpWriter, Usage};
+use crate::parse::{ArgMatcher, ArgMatches, Input, Parser};
+use crate::util::{color::ColorChoice, Id, Key};
+use crate::{Error, INTERNAL_ERROR_MSG};
 
 /// Build a command-line interface.
 ///

src/build/usage_parser.rs

@@ -1260,7 +1260,7 @@ mod test {
 
     #[test]
     fn issue_665() {
-        use crate::{App, ErrorKind};
+        use crate::{error::ErrorKind, App};
         // Verify fix for "arg_from_usage(): required values not being enforced when followed by another option"
         let res = App::new("tester")
         .arg(Arg::from_usage("-v, --reroll-count=[N] 'Mark the patch series as PATCH vN'"))

src/lib.rs

@@ -26,13 +26,15 @@
 #[cfg(not(feature = "std"))]
 compile_error!("`std` feature is currently required to build `clap`");
 
+pub use crate::parse::error;
+pub use crate::parse::error::{ErrorKind, Result};
 #[cfg(feature = "color")]
 pub use crate::util::color::ColorChoice;
 pub use crate::{
     build::{
         App, AppFlags, AppSettings, Arg, ArgFlags, ArgGroup, ArgSettings, PossibleValue, ValueHint,
     },
-    parse::errors::{Error, ErrorKind, Result},
+    parse::error::Error,
     parse::{ArgMatches, Indices, OsValues, Values},
 };
 

src/parse/errors.rs → src/parse/error.rs

@@ -1,3 +1,5 @@
+//! Error reporting
+
 // Std
 use std::{
     borrow::Cow,
@@ -20,7 +22,7 @@ use crate::{
 /// Short hand for [`Result`] type
 ///
 /// [`Result`]: std::result::Result
-pub type Result<T> = StdResult<T, Error>;
+pub type Result<T, E = Error> = StdResult<T, E>;
 
 /// Command line argument parser kind of error
 #[derive(Debug, Copy, Clone, PartialEq)]
@@ -431,13 +433,20 @@ pub enum ErrorKind {
 /// [`App::error`]: crate::App::error
 #[derive(Debug)]
 pub struct Error {
-    /// Formatted error message, enhancing the cause message with extra information
-    message: Message,
+    inner: Box<ErrorInner>,
     /// The type of error
     pub kind: ErrorKind,
     /// Additional information depending on the error kind, like values and argument names.
     /// Useful when you want to render an error of your own.
     pub info: Vec<String>,
+}
+
+#[derive(Debug)]
+struct ErrorInner {
+    /// The type of error
+    kind: ErrorKind,
+    /// Formatted error message, enhancing the cause message with extra information
+    message: Message,
     source: Option<Box<dyn error::Error + Send + Sync>>,
     wait_on_exit: bool,
     backtrace: Option<Backtrace>,
@@ -461,14 +470,14 @@ impl Error {
     pub fn format(mut self, app: &mut App) -> Self {
         app._build();
         let usage = app.render_usage();
-        self.message.format(app, usage);
-        self.wait_on_exit = app.settings.is_set(AppSettings::WaitOnError);
+        self.inner.message.format(app, usage);
+        self.inner.wait_on_exit = app.settings.is_set(AppSettings::WaitOnError);
         self
     }
 
     /// Type of error for programmatic processing
     pub fn kind(&self) -> ErrorKind {
-        self.kind
+        self.inner.kind
     }
 
     /// Should the message be written to `stdout` or not?
@@ -489,7 +498,7 @@ impl Error {
             // Swallow broken pipe errors
             let _ = self.print();
 
-            if self.wait_on_exit {
+            if self.inner.wait_on_exit {
                 wlnerr!("\nPress [ENTER] / [RETURN] to continue...");
                 let mut s = String::new();
                 let i = io::stdin();
@@ -521,7 +530,7 @@ impl Error {
     /// };
     /// ```
     pub fn print(&self) -> io::Result<()> {
-        self.message.formatted().print()
+        self.inner.message.formatted().print()
     }
 
     /// Deprecated, replaced with [`App::error`]
@@ -534,12 +543,15 @@ impl Error {
 
     pub(crate) fn new(message: impl Into<Message>, kind: ErrorKind, wait_on_exit: bool) -> Self {
         Self {
-            message: message.into(),
+            inner: Box::new(ErrorInner {
+                kind,
+                message: message.into(),
+                source: None,
+                wait_on_exit,
+                backtrace: Backtrace::new(),
+            }),
             kind,
             info: vec![],
-            source: None,
-            wait_on_exit,
-            backtrace: Backtrace::new(),
         }
     }
 
@@ -564,7 +576,7 @@ impl Error {
     }
 
     pub(crate) fn set_source(mut self, source: Box<dyn error::Error + Send + Sync>) -> Self {
-        self.source = Some(source);
+        self.inner.source = Some(source);
         self
     }
 
@@ -885,7 +897,7 @@ impl Error {
             app.get_color(),
             app.settings.is_set(AppSettings::WaitOnError),
         );
-        match &mut err.message {
+        match &mut err.inner.message {
             Message::Raw(_) => {
                 unreachable!("`value_validation_with_color` only deals in formatted errors")
             }
@@ -900,7 +912,7 @@ impl Error {
         err: Box<dyn error::Error + Send + Sync>,
     ) -> Self {
         let mut err = Self::value_validation_with_color(arg, val, err, ColorChoice::Never, false);
-        match &mut err.message {
+        match &mut err.inner.message {
             Message::Raw(_) => {
                 unreachable!("`value_validation_with_color` only deals in formatted errors")
             }
@@ -1073,15 +1085,15 @@ impl From<fmt::Error> for Error {
 impl error::Error for Error {
     #[allow(trivial_casts)]
     fn source(&self) -> Option<&(dyn error::Error + 'static)> {
-        self.source.as_ref().map(|e| e.as_ref() as _)
+        self.inner.source.as_ref().map(|e| e.as_ref() as _)
     }
 }
 
 impl Display for Error {
     fn fmt(&self, f: &mut Formatter) -> fmt::Result {
         // Assuming `self.message` already has a trailing newline, from `try_help` or similar
-        write!(f, "{}", self.message.formatted())?;
-        if let Some(backtrace) = self.backtrace.as_ref() {
+        write!(f, "{}", self.inner.message.formatted())?;
+        if let Some(backtrace) = self.inner.backtrace.as_ref() {
             writeln!(f)?;
             writeln!(f, "Backtrace:")?;
             writeln!(f, "{}", backtrace)?;

src/parse/mod.rs

@@ -1,4 +1,4 @@
-pub mod errors;
+pub mod error;
 pub mod features;
 
 mod arg_matcher;

src/parse/parser.rs

@@ -14,9 +14,9 @@ use crate::{
     build::{App, Arg, ArgSettings},
     mkeymap::KeyType,
     output::{fmt::Colorizer, Help, HelpWriter, Usage},
-    parse::errors::Error as ClapError,
-    parse::errors::ErrorKind,
-    parse::errors::Result as ClapResult,
+    parse::error::Error as ClapError,
+    parse::error::ErrorKind,
+    parse::error::Result as ClapResult,
     parse::features::suggestions,
     parse::{ArgMatcher, SubCommand},
     parse::{Validator, ValueType},

src/parse/validator.rs

@@ -3,7 +3,7 @@ use crate::{
     build::{arg::PossibleValue, App, AppSettings as AS, Arg, ArgSettings},
     output::Usage,
     parse::{
-        errors::{Error, ErrorKind, Result as ClapResult},
+        error::{Error, ErrorKind, Result as ClapResult},
         ArgMatcher, MatchedArg, ParseState, Parser,
     },
     util::Id,

tests/builder/app_from_crate.rs

@@ -1,6 +1,6 @@
 #![cfg(feature = "cargo")]
 
-use clap::{app_from_crate, ErrorKind};
+use clap::{app_from_crate, error::ErrorKind};
 
 static EVERYTHING: &str = "clap {{version}}
 A simple to use, efficient, and full-featured Command Line Argument Parser

tests/builder/app_settings.rs

@@ -1,6 +1,6 @@
 use crate::utils;
 
-use clap::{arg, App, AppSettings, Arg, ErrorKind};
+use clap::{arg, error::ErrorKind, App, AppSettings, Arg};
 
 static ALLOW_EXT_SC: &str = "clap-test v1.4.8
 

tests/builder/cargo.rs

@@ -1,6 +1,6 @@
 #![cfg(feature = "cargo")]
 
-use clap::{crate_authors, crate_description, crate_name, crate_version, App, ErrorKind};
+use clap::{crate_authors, crate_description, crate_name, crate_version, error::ErrorKind, App};
 
 static DESCRIPTION_ONLY: &str = "prog 1
 A simple to use, efficient, and full-featured Command Line Argument Parser

tests/builder/conflicts.rs

@@ -1,6 +1,6 @@
 use crate::utils;
 
-use clap::{arg, App, Arg, ArgGroup, ErrorKind};
+use clap::{arg, error::ErrorKind, App, Arg, ArgGroup};
 
 static CONFLICT_ERR: &str = "error: The argument '--flag' cannot be used with '-F'
 

tests/builder/default_vals.rs

@@ -1,5 +1,5 @@
 use crate::utils;
-use clap::{arg, App, Arg, ErrorKind};
+use clap::{arg, error::ErrorKind, App, Arg};
 
 #[test]
 fn opts() {

tests/builder/double_require.rs

@@ -1,4 +1,4 @@
-use clap::{App, Arg, ErrorKind};
+use clap::{error::ErrorKind, App, Arg};
 
 static HELP: &str = "prog 
 

tests/builder/empty_values.rs

@@ -1,6 +1,6 @@
 use crate::utils;
 
-use clap::{App, Arg, ErrorKind};
+use clap::{error::ErrorKind, App, Arg};
 
 #[test]
 fn empty_values() {

tests/builder/error.rs

@@ -1,6 +1,6 @@
 use crate::utils;
 
-use clap::{arg, App, Arg, Error, ErrorKind};
+use clap::{arg, error::ErrorKind, App, Arg, Error};
 
 fn compare_error(
     err: Error,

tests/builder/flag_subcommands.rs

@@ -1,6 +1,6 @@
 use crate::utils;
 
-use clap::{arg, App, AppSettings, Arg, ErrorKind};
+use clap::{arg, error::ErrorKind, App, AppSettings, Arg};
 
 #[test]
 fn flag_subcommand_normal() {

tests/builder/flags.rs

@@ -89,7 +89,7 @@ fn flag_using_long() {
 
 #[test]
 fn flag_using_long_with_literals() {
-    use clap::ErrorKind;
+    use clap::error::ErrorKind;
 
     let m = App::new("flag")
         .arg(Arg::new("rainbow").long("rainbow"))

tests/builder/groups.rs

@@ -1,6 +1,6 @@
 use crate::utils;
 
-use clap::{arg, App, Arg, ArgGroup, ErrorKind};
+use clap::{arg, error::ErrorKind, App, Arg, ArgGroup};
 
 static REQ_GROUP_USAGE: &str = "error: The following required arguments were not provided:
     <base|--delete>

tests/builder/help.rs

@@ -1,6 +1,6 @@
 use crate::utils;
 
-use clap::{arg, App, AppSettings, Arg, ArgGroup, ErrorKind, PossibleValue};
+use clap::{arg, error::ErrorKind, App, AppSettings, Arg, ArgGroup, PossibleValue};
 
 static REQUIRE_DELIM_HELP: &str = "test 1.3
 Kevin K.

tests/builder/multiple_occurrences.rs

@@ -1,4 +1,4 @@
-use clap::{arg, App, Arg, ErrorKind};
+use clap::{arg, error::ErrorKind, App, Arg};
 
 #[test]
 fn multiple_occurrences_of_flags_long() {

tests/builder/multiple_values.rs

@@ -1,4 +1,4 @@
-use clap::{App, Arg, ErrorKind};
+use clap::{error::ErrorKind, App, Arg};
 
 #[test]
 fn option_long() {

tests/builder/opts.rs

@@ -1,6 +1,6 @@
 use crate::utils;
 
-use clap::{arg, App, AppSettings, Arg, ArgMatches, ErrorKind};
+use clap::{arg, error::ErrorKind, App, AppSettings, Arg, ArgMatches};
 
 #[cfg(feature = "suggestions")]
 static DYM: &str =

tests/builder/positionals.rs

@@ -1,4 +1,4 @@
-use clap::{arg, App, Arg, ErrorKind};
+use clap::{arg, error::ErrorKind, App, Arg};
 
 #[test]
 fn only_pos_follow() {

tests/builder/posix_compatible.rs

@@ -1,4 +1,4 @@
-use clap::{arg, App, Arg, ErrorKind};
+use clap::{arg, error::ErrorKind, App, Arg};
 
 #[test]
 fn flag_overrides_itself() {

tests/builder/possible_values.rs

@@ -1,6 +1,6 @@
 use crate::utils;
 
-use clap::{App, Arg, ErrorKind, PossibleValue};
+use clap::{error::ErrorKind, App, Arg, PossibleValue};
 
 #[cfg(feature = "suggestions")]
 static PV_ERROR: &str = "error: \"slo\" isn't a valid value for '-O <option>'

tests/builder/regex.rs

@@ -1,6 +1,6 @@
 #![cfg(feature = "regex")]
 
-use clap::{App, Arg, ErrorKind};
+use clap::{error::ErrorKind, App, Arg};
 use regex::{Regex, RegexSet};
 
 #[test]

tests/builder/require.rs

@@ -1,6 +1,6 @@
 use crate::utils;
 
-use clap::{arg, App, Arg, ArgGroup, ErrorKind};
+use clap::{arg, error::ErrorKind, App, Arg, ArgGroup};
 
 static REQUIRE_EQUALS: &str = "error: The following required arguments were not provided:
     --opt=<FILE>

tests/builder/subcommands.rs

@@ -1,6 +1,6 @@
 use crate::utils;
 
-use clap::{arg, App, AppSettings, Arg, ErrorKind};
+use clap::{arg, error::ErrorKind, App, AppSettings, Arg};
 
 static VISIBLE_ALIAS_HELP: &str = "clap-test 2.6
 

tests/builder/utf8.rs

@@ -1,6 +1,6 @@
 #![cfg(not(windows))]
 
-use clap::{arg, App, AppSettings, Arg, ErrorKind};
+use clap::{arg, error::ErrorKind, App, AppSettings, Arg};
 use std::ffi::OsString;
 use std::os::unix::ffi::OsStringExt;