2018-12-08 00:43:31 +01:00
|
|
|
|
use lazy_static::lazy_static;
|
2017-07-26 17:48:18 +01:00
|
|
|
|
|
2020-10-10 19:49:46 +01:00
|
|
|
|
use crate::fs::feature::xattr;
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
use crate::options::{flags, OptionsError, Vars};
|
2018-12-08 00:43:31 +01:00
|
|
|
|
use crate::options::parser::MatchedFlags;
|
|
|
|
|
use crate::output::{View, Mode, grid, details, lines};
|
|
|
|
|
use crate::output::grid_details::{self, RowThreshold};
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
use crate::output::table::{TimeTypes, SizeFormat, Columns, Options as TableOptions};
|
2018-12-08 00:43:31 +01:00
|
|
|
|
use crate::output::time::TimeFormat;
|
2017-07-26 17:48:18 +01:00
|
|
|
|
|
2017-08-24 23:38:26 +01:00
|
|
|
|
|
2017-06-25 12:31:46 +01:00
|
|
|
|
impl View {
|
|
|
|
|
|
|
|
|
|
/// Determine which view to use and all of that view’s arguments.
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
pub fn deduce<V: Vars>(matches: &MatchedFlags, vars: &V) -> Result<Self, OptionsError> {
|
2018-12-08 00:43:31 +01:00
|
|
|
|
use crate::options::style::Styles;
|
2017-09-03 19:50:40 +01:00
|
|
|
|
|
2017-08-10 17:54:28 +01:00
|
|
|
|
let mode = Mode::deduce(matches, vars)?;
|
2017-09-13 08:44:59 +01:00
|
|
|
|
let Styles { colours, style } = Styles::deduce(matches, vars, || *TERM_WIDTH)?;
|
2020-10-10 13:55:26 +01:00
|
|
|
|
Ok(Self { mode, colours, style })
|
2017-06-25 12:31:46 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
impl Mode {
|
2016-04-17 20:38:37 +01:00
|
|
|
|
|
2017-06-25 14:59:38 +01:00
|
|
|
|
/// Determine the mode from the command-line arguments.
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
pub fn deduce<V: Vars>(matches: &MatchedFlags, vars: &V) -> Result<Self, OptionsError> {
|
2016-04-17 20:38:37 +01:00
|
|
|
|
let long = || {
|
2020-10-10 19:49:46 +01:00
|
|
|
|
if matches.has(&flags::ACROSS)? && ! matches.has(&flags::GRID)? {
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
Err(OptionsError::Useless(&flags::ACROSS, true, &flags::LONG))
|
2016-04-17 20:38:37 +01:00
|
|
|
|
}
|
Be stricter in strict mode
Now the code actually starts to use the Strictness flag that was added in the earlier commit! Well, the *code* doesn’t, but the tests do: the macros that create the test cases now have a parameter for which tests they should run. It’s usually ‘Both’ for both strict mode and default mode, but can be specified to only run in one, for when the results differ (usually when options override one another)
The downside to strict mode is that, now, *any* call to `matches.has` or `matches.get` could fail, because an option could have been specified twice, and this is the place where those are checked for. This makes the code a little less ergonomic in places, but that’s what the ? operator is for. The only place this has really had an effect is in `Classify::deduce`, which used to just return a boolean but can now fail.
In order to more thoroughly test the mode, some of the older parts of the code can now act more strict. For example, `TerminalColours::deduce` will now use the last-given option rather than searching for “colours” before “colors”.
Help and Version continue doing their own thing.
2017-08-09 09:21:29 +01:00
|
|
|
|
else if matches.has(&flags::ONE_LINE)? {
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
Err(OptionsError::Useless(&flags::ONE_LINE, true, &flags::LONG))
|
2016-04-17 20:38:37 +01:00
|
|
|
|
}
|
|
|
|
|
else {
|
2017-06-26 08:38:56 +01:00
|
|
|
|
Ok(details::Options {
|
2018-06-15 04:38:32 +09:00
|
|
|
|
table: Some(TableOptions::deduce(matches, vars)?),
|
Be stricter in strict mode
Now the code actually starts to use the Strictness flag that was added in the earlier commit! Well, the *code* doesn’t, but the tests do: the macros that create the test cases now have a parameter for which tests they should run. It’s usually ‘Both’ for both strict mode and default mode, but can be specified to only run in one, for when the results differ (usually when options override one another)
The downside to strict mode is that, now, *any* call to `matches.has` or `matches.get` could fail, because an option could have been specified twice, and this is the place where those are checked for. This makes the code a little less ergonomic in places, but that’s what the ? operator is for. The only place this has really had an effect is in `Classify::deduce`, which used to just return a boolean but can now fail.
In order to more thoroughly test the mode, some of the older parts of the code can now act more strict. For example, `TerminalColours::deduce` will now use the last-given option rather than searching for “colours” before “colors”.
Help and Version continue doing their own thing.
2017-08-09 09:21:29 +01:00
|
|
|
|
header: matches.has(&flags::HEADER)?,
|
|
|
|
|
xattr: xattr::ENABLED && matches.has(&flags::EXTENDED)?,
|
2018-04-01 18:28:31 -04:00
|
|
|
|
icons: matches.has(&flags::ICONS)?,
|
2017-06-26 08:38:56 +01:00
|
|
|
|
})
|
2016-04-17 20:38:37 +01:00
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let other_options_scan = || {
|
2017-08-10 17:54:28 +01:00
|
|
|
|
if let Some(width) = TerminalWidth::deduce(vars)?.width() {
|
Be stricter in strict mode
Now the code actually starts to use the Strictness flag that was added in the earlier commit! Well, the *code* doesn’t, but the tests do: the macros that create the test cases now have a parameter for which tests they should run. It’s usually ‘Both’ for both strict mode and default mode, but can be specified to only run in one, for when the results differ (usually when options override one another)
The downside to strict mode is that, now, *any* call to `matches.has` or `matches.get` could fail, because an option could have been specified twice, and this is the place where those are checked for. This makes the code a little less ergonomic in places, but that’s what the ? operator is for. The only place this has really had an effect is in `Classify::deduce`, which used to just return a boolean but can now fail.
In order to more thoroughly test the mode, some of the older parts of the code can now act more strict. For example, `TerminalColours::deduce` will now use the last-given option rather than searching for “colours” before “colors”.
Help and Version continue doing their own thing.
2017-08-09 09:21:29 +01:00
|
|
|
|
if matches.has(&flags::ONE_LINE)? {
|
|
|
|
|
if matches.has(&flags::ACROSS)? {
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
Err(OptionsError::Useless(&flags::ACROSS, true, &flags::ONE_LINE))
|
2016-04-17 20:38:37 +01:00
|
|
|
|
}
|
|
|
|
|
else {
|
2018-04-01 19:00:27 -04:00
|
|
|
|
let lines = lines::Options { icons: matches.has(&flags::ICONS)? };
|
2020-10-10 13:55:26 +01:00
|
|
|
|
Ok(Self::Lines(lines))
|
2016-04-17 20:38:37 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
Be stricter in strict mode
Now the code actually starts to use the Strictness flag that was added in the earlier commit! Well, the *code* doesn’t, but the tests do: the macros that create the test cases now have a parameter for which tests they should run. It’s usually ‘Both’ for both strict mode and default mode, but can be specified to only run in one, for when the results differ (usually when options override one another)
The downside to strict mode is that, now, *any* call to `matches.has` or `matches.get` could fail, because an option could have been specified twice, and this is the place where those are checked for. This makes the code a little less ergonomic in places, but that’s what the ? operator is for. The only place this has really had an effect is in `Classify::deduce`, which used to just return a boolean but can now fail.
In order to more thoroughly test the mode, some of the older parts of the code can now act more strict. For example, `TerminalColours::deduce` will now use the last-given option rather than searching for “colours” before “colors”.
Help and Version continue doing their own thing.
2017-08-09 09:21:29 +01:00
|
|
|
|
else if matches.has(&flags::TREE)? {
|
2017-06-26 00:53:48 +01:00
|
|
|
|
let details = details::Options {
|
2017-07-05 21:01:01 +01:00
|
|
|
|
table: None,
|
2016-04-17 20:38:37 +01:00
|
|
|
|
header: false,
|
Be stricter in strict mode
Now the code actually starts to use the Strictness flag that was added in the earlier commit! Well, the *code* doesn’t, but the tests do: the macros that create the test cases now have a parameter for which tests they should run. It’s usually ‘Both’ for both strict mode and default mode, but can be specified to only run in one, for when the results differ (usually when options override one another)
The downside to strict mode is that, now, *any* call to `matches.has` or `matches.get` could fail, because an option could have been specified twice, and this is the place where those are checked for. This makes the code a little less ergonomic in places, but that’s what the ? operator is for. The only place this has really had an effect is in `Classify::deduce`, which used to just return a boolean but can now fail.
In order to more thoroughly test the mode, some of the older parts of the code can now act more strict. For example, `TerminalColours::deduce` will now use the last-given option rather than searching for “colours” before “colors”.
Help and Version continue doing their own thing.
2017-08-09 09:21:29 +01:00
|
|
|
|
xattr: xattr::ENABLED && matches.has(&flags::EXTENDED)?,
|
2018-04-01 18:28:31 -04:00
|
|
|
|
icons: matches.has(&flags::ICONS)?,
|
2016-04-17 20:38:37 +01:00
|
|
|
|
};
|
|
|
|
|
|
2020-10-10 13:55:26 +01:00
|
|
|
|
Ok(Self::Details(details))
|
2016-04-17 20:38:37 +01:00
|
|
|
|
}
|
|
|
|
|
else {
|
2017-06-26 00:53:48 +01:00
|
|
|
|
let grid = grid::Options {
|
Be stricter in strict mode
Now the code actually starts to use the Strictness flag that was added in the earlier commit! Well, the *code* doesn’t, but the tests do: the macros that create the test cases now have a parameter for which tests they should run. It’s usually ‘Both’ for both strict mode and default mode, but can be specified to only run in one, for when the results differ (usually when options override one another)
The downside to strict mode is that, now, *any* call to `matches.has` or `matches.get` could fail, because an option could have been specified twice, and this is the place where those are checked for. This makes the code a little less ergonomic in places, but that’s what the ? operator is for. The only place this has really had an effect is in `Classify::deduce`, which used to just return a boolean but can now fail.
In order to more thoroughly test the mode, some of the older parts of the code can now act more strict. For example, `TerminalColours::deduce` will now use the last-given option rather than searching for “colours” before “colors”.
Help and Version continue doing their own thing.
2017-08-09 09:21:29 +01:00
|
|
|
|
across: matches.has(&flags::ACROSS)?,
|
2016-04-17 20:38:37 +01:00
|
|
|
|
console_width: width,
|
2018-03-26 16:01:53 -04:00
|
|
|
|
icons: matches.has(&flags::ICONS)?,
|
2016-04-17 20:38:37 +01:00
|
|
|
|
};
|
|
|
|
|
|
2020-10-10 13:55:26 +01:00
|
|
|
|
Ok(Self::Grid(grid))
|
2016-04-17 20:38:37 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-06-19 14:58:03 +02:00
|
|
|
|
// If the terminal width couldn’t be matched for some reason, such
|
|
|
|
|
// as the program’s stdout being connected to a file, then
|
2019-10-12 11:58:31 +02:00
|
|
|
|
// fallback to the lines or details view.
|
2018-06-19 14:58:03 +02:00
|
|
|
|
else if matches.has(&flags::TREE)? {
|
|
|
|
|
let details = details::Options {
|
|
|
|
|
table: None,
|
|
|
|
|
header: false,
|
|
|
|
|
xattr: xattr::ENABLED && matches.has(&flags::EXTENDED)?,
|
2019-07-15 03:54:31 +01:00
|
|
|
|
icons: matches.has(&flags::ICONS)?,
|
2018-06-19 14:58:03 +02:00
|
|
|
|
};
|
2016-04-17 20:38:37 +01:00
|
|
|
|
|
2020-10-10 13:55:26 +01:00
|
|
|
|
Ok(Self::Details(details))
|
2018-06-19 14:58:03 +02:00
|
|
|
|
}
|
2019-10-12 11:58:31 +02:00
|
|
|
|
else if matches.has(&flags::LONG)? {
|
|
|
|
|
let details = long()?;
|
2020-10-10 13:55:26 +01:00
|
|
|
|
Ok(Self::Details(details))
|
2019-10-12 11:58:31 +02:00
|
|
|
|
} else {
|
2019-07-15 03:54:31 +01:00
|
|
|
|
let lines = lines::Options { icons: matches.has(&flags::ICONS)?, };
|
2020-10-10 13:55:26 +01:00
|
|
|
|
Ok(Self::Lines(lines))
|
2016-04-17 20:38:37 +01:00
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
Be stricter in strict mode
Now the code actually starts to use the Strictness flag that was added in the earlier commit! Well, the *code* doesn’t, but the tests do: the macros that create the test cases now have a parameter for which tests they should run. It’s usually ‘Both’ for both strict mode and default mode, but can be specified to only run in one, for when the results differ (usually when options override one another)
The downside to strict mode is that, now, *any* call to `matches.has` or `matches.get` could fail, because an option could have been specified twice, and this is the place where those are checked for. This makes the code a little less ergonomic in places, but that’s what the ? operator is for. The only place this has really had an effect is in `Classify::deduce`, which used to just return a boolean but can now fail.
In order to more thoroughly test the mode, some of the older parts of the code can now act more strict. For example, `TerminalColours::deduce` will now use the last-given option rather than searching for “colours” before “colors”.
Help and Version continue doing their own thing.
2017-08-09 09:21:29 +01:00
|
|
|
|
if matches.has(&flags::LONG)? {
|
2017-06-26 08:38:56 +01:00
|
|
|
|
let details = long()?;
|
Be stricter in strict mode
Now the code actually starts to use the Strictness flag that was added in the earlier commit! Well, the *code* doesn’t, but the tests do: the macros that create the test cases now have a parameter for which tests they should run. It’s usually ‘Both’ for both strict mode and default mode, but can be specified to only run in one, for when the results differ (usually when options override one another)
The downside to strict mode is that, now, *any* call to `matches.has` or `matches.get` could fail, because an option could have been specified twice, and this is the place where those are checked for. This makes the code a little less ergonomic in places, but that’s what the ? operator is for. The only place this has really had an effect is in `Classify::deduce`, which used to just return a boolean but can now fail.
In order to more thoroughly test the mode, some of the older parts of the code can now act more strict. For example, `TerminalColours::deduce` will now use the last-given option rather than searching for “colours” before “colors”.
Help and Version continue doing their own thing.
2017-08-09 09:21:29 +01:00
|
|
|
|
if matches.has(&flags::GRID)? {
|
2017-08-12 22:51:45 +01:00
|
|
|
|
let other_options_mode = other_options_scan()?;
|
2020-10-10 13:55:26 +01:00
|
|
|
|
if let Self::Grid(grid) = other_options_mode {
|
2017-08-13 11:14:58 +01:00
|
|
|
|
let row_threshold = RowThreshold::deduce(vars)?;
|
2020-10-10 19:49:46 +01:00
|
|
|
|
let opts = grid_details::Options { grid, details, row_threshold };
|
|
|
|
|
return Ok(Self::GridDetails(opts));
|
2017-08-12 22:51:45 +01:00
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
return Ok(other_options_mode);
|
|
|
|
|
}
|
2016-04-17 20:38:37 +01:00
|
|
|
|
}
|
|
|
|
|
else {
|
2020-10-10 13:55:26 +01:00
|
|
|
|
return Ok(Self::Details(details));
|
2016-04-17 20:38:37 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-08-11 21:43:56 +01:00
|
|
|
|
// If --long hasn’t been passed, then check if we need to warn the
|
|
|
|
|
// user about flags that won’t have any effect.
|
|
|
|
|
if matches.is_strict() {
|
|
|
|
|
for option in &[ &flags::BINARY, &flags::BYTES, &flags::INODE, &flags::LINKS,
|
|
|
|
|
&flags::HEADER, &flags::BLOCKS, &flags::TIME, &flags::GROUP ] {
|
|
|
|
|
if matches.has(option)? {
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
return Err(OptionsError::Useless(*option, false, &flags::LONG));
|
2017-08-11 21:43:56 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-10-10 19:49:46 +01:00
|
|
|
|
if cfg!(feature = "git") && matches.has(&flags::GIT)? {
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
return Err(OptionsError::Useless(&flags::GIT, false, &flags::LONG));
|
2017-08-11 21:43:56 +01:00
|
|
|
|
}
|
2020-10-10 19:49:46 +01:00
|
|
|
|
else if matches.has(&flags::LEVEL)? && ! matches.has(&flags::RECURSE)? && ! matches.has(&flags::TREE)? {
|
|
|
|
|
// TODO: I’m not sure if the code even gets this far.
|
2017-08-11 21:43:56 +01:00
|
|
|
|
// There is an identical check in dir_action
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
return Err(OptionsError::Useless2(&flags::LEVEL, &flags::RECURSE, &flags::TREE));
|
2017-08-11 21:43:56 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
2016-04-17 20:38:37 +01:00
|
|
|
|
|
|
|
|
|
other_options_scan()
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// The width of the terminal requested by the user.
|
2020-10-10 15:30:19 +01:00
|
|
|
|
#[derive(PartialEq, Debug, Copy, Clone)]
|
2016-04-17 20:38:37 +01:00
|
|
|
|
enum TerminalWidth {
|
|
|
|
|
|
|
|
|
|
/// The user requested this specific number of columns.
|
|
|
|
|
Set(usize),
|
|
|
|
|
|
|
|
|
|
/// The terminal was found to have this number of columns.
|
|
|
|
|
Terminal(usize),
|
|
|
|
|
|
|
|
|
|
/// The user didn’t request any particular terminal width.
|
|
|
|
|
Unset,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl TerminalWidth {
|
|
|
|
|
|
|
|
|
|
/// Determine a requested terminal width from the command-line arguments.
|
|
|
|
|
///
|
|
|
|
|
/// Returns an error if a requested width doesn’t parse to an integer.
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
fn deduce<V: Vars>(vars: &V) -> Result<Self, OptionsError> {
|
2018-12-08 00:43:31 +01:00
|
|
|
|
use crate::options::vars;
|
2017-08-26 21:19:06 +01:00
|
|
|
|
|
|
|
|
|
if let Some(columns) = vars.get(vars::COLUMNS).and_then(|s| s.into_string().ok()) {
|
2016-04-17 20:38:37 +01:00
|
|
|
|
match columns.parse() {
|
2020-10-10 13:55:26 +01:00
|
|
|
|
Ok(width) => Ok(Self::Set(width)),
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
Err(e) => Err(OptionsError::FailedParse(e)),
|
2016-04-17 20:38:37 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
2017-06-25 14:51:44 +01:00
|
|
|
|
else if let Some(width) = *TERM_WIDTH {
|
2020-10-10 13:55:26 +01:00
|
|
|
|
Ok(Self::Terminal(width))
|
2016-04-17 20:38:37 +01:00
|
|
|
|
}
|
|
|
|
|
else {
|
2020-10-10 13:55:26 +01:00
|
|
|
|
Ok(Self::Unset)
|
2016-04-17 20:38:37 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-10-10 15:30:19 +01:00
|
|
|
|
fn width(self) -> Option<usize> {
|
|
|
|
|
match self {
|
2020-10-10 13:55:26 +01:00
|
|
|
|
Self::Set(width) |
|
|
|
|
|
Self::Terminal(width) => Some(width),
|
|
|
|
|
Self::Unset => None,
|
2016-04-17 20:38:37 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2017-08-13 11:15:40 +01:00
|
|
|
|
impl RowThreshold {
|
|
|
|
|
|
|
|
|
|
/// Determine whether to use a row threshold based on the given
|
|
|
|
|
/// environment variables.
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
fn deduce<V: Vars>(vars: &V) -> Result<Self, OptionsError> {
|
2018-12-08 00:43:31 +01:00
|
|
|
|
use crate::options::vars;
|
2017-08-26 21:19:06 +01:00
|
|
|
|
|
|
|
|
|
if let Some(columns) = vars.get(vars::EXA_GRID_ROWS).and_then(|s| s.into_string().ok()) {
|
2017-08-13 11:15:40 +01:00
|
|
|
|
match columns.parse() {
|
2020-10-10 13:55:26 +01:00
|
|
|
|
Ok(rows) => Ok(Self::MinimumRows(rows)),
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
Err(e) => Err(OptionsError::FailedParse(e)),
|
2017-08-13 11:15:40 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else {
|
2020-10-10 13:55:26 +01:00
|
|
|
|
Ok(Self::AlwaysGrid)
|
2017-08-13 11:15:40 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2017-07-05 20:16:04 +01:00
|
|
|
|
impl TableOptions {
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
fn deduce<V: Vars>(matches: &MatchedFlags, vars: &V) -> Result<Self, OptionsError> {
|
2018-06-15 04:38:32 +09:00
|
|
|
|
let time_format = TimeFormat::deduce(matches, vars)?;
|
2017-08-09 22:25:16 +01:00
|
|
|
|
let size_format = SizeFormat::deduce(matches)?;
|
2019-08-29 14:34:30 +02:00
|
|
|
|
let columns = Columns::deduce(matches)?;
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
Ok(Self { time_format, size_format, columns })
|
2017-08-09 22:25:16 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
impl Columns {
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
fn deduce(matches: &MatchedFlags) -> Result<Self, OptionsError> {
|
2017-08-09 22:25:16 +01:00
|
|
|
|
let time_types = TimeTypes::deduce(matches)?;
|
2020-10-10 19:49:46 +01:00
|
|
|
|
let git = cfg!(feature = "git") && matches.has(&flags::GIT)?;
|
2017-08-09 22:25:16 +01:00
|
|
|
|
|
|
|
|
|
let blocks = matches.has(&flags::BLOCKS)?;
|
|
|
|
|
let group = matches.has(&flags::GROUP)?;
|
|
|
|
|
let inode = matches.has(&flags::INODE)?;
|
|
|
|
|
let links = matches.has(&flags::LINKS)?;
|
2020-07-24 13:47:34 +02:00
|
|
|
|
let octal = matches.has(&flags::OCTAL)?;
|
2017-08-09 22:25:16 +01:00
|
|
|
|
|
2020-10-10 19:49:46 +01:00
|
|
|
|
let permissions = ! matches.has(&flags::NO_PERMISSIONS)?;
|
|
|
|
|
let filesize = ! matches.has(&flags::NO_FILESIZE)?;
|
|
|
|
|
let user = ! matches.has(&flags::NO_USER)?;
|
2019-08-29 14:34:30 +02:00
|
|
|
|
|
2020-10-10 13:55:26 +01:00
|
|
|
|
Ok(Self { time_types, git, octal, blocks, group, inode, links, permissions, filesize, user })
|
2016-04-17 20:38:37 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
impl SizeFormat {
|
|
|
|
|
|
|
|
|
|
/// Determine which file size to use in the file size column based on
|
|
|
|
|
/// the user’s options.
|
|
|
|
|
///
|
|
|
|
|
/// The default mode is to use the decimal prefixes, as they are the
|
|
|
|
|
/// most commonly-understood, and don’t involve trying to parse large
|
|
|
|
|
/// strings of digits in your head. Changing the format to anything else
|
|
|
|
|
/// involves the `--binary` or `--bytes` flags, and these conflict with
|
|
|
|
|
/// each other.
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
fn deduce(matches: &MatchedFlags) -> Result<Self, OptionsError> {
|
2017-08-09 19:18:31 +01:00
|
|
|
|
let flag = matches.has_where(|f| f.matches(&flags::BINARY) || f.matches(&flags::BYTES))?;
|
|
|
|
|
|
|
|
|
|
Ok(match flag {
|
2020-10-10 13:55:26 +01:00
|
|
|
|
Some(f) if f.matches(&flags::BINARY) => Self::BinaryBytes,
|
|
|
|
|
Some(f) if f.matches(&flags::BYTES) => Self::JustBytes,
|
|
|
|
|
_ => Self::DecimalBytes,
|
2017-08-09 19:18:31 +01:00
|
|
|
|
})
|
2016-04-17 20:38:37 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2017-07-05 23:27:48 +01:00
|
|
|
|
impl TimeFormat {
|
|
|
|
|
|
|
|
|
|
/// Determine how time should be formatted in timestamp columns.
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
fn deduce<V: Vars>(matches: &MatchedFlags, vars: &V) -> Result<Self, OptionsError> {
|
Be stricter in strict mode
Now the code actually starts to use the Strictness flag that was added in the earlier commit! Well, the *code* doesn’t, but the tests do: the macros that create the test cases now have a parameter for which tests they should run. It’s usually ‘Both’ for both strict mode and default mode, but can be specified to only run in one, for when the results differ (usually when options override one another)
The downside to strict mode is that, now, *any* call to `matches.has` or `matches.get` could fail, because an option could have been specified twice, and this is the place where those are checked for. This makes the code a little less ergonomic in places, but that’s what the ? operator is for. The only place this has really had an effect is in `Classify::deduce`, which used to just return a boolean but can now fail.
In order to more thoroughly test the mode, some of the older parts of the code can now act more strict. For example, `TerminalColours::deduce` will now use the last-given option rather than searching for “colours” before “colors”.
Help and Version continue doing their own thing.
2017-08-09 09:21:29 +01:00
|
|
|
|
let word = match matches.get(&flags::TIME_STYLE)? {
|
2020-10-10 19:49:46 +01:00
|
|
|
|
Some(w) => {
|
|
|
|
|
w.to_os_string()
|
|
|
|
|
}
|
|
|
|
|
None => {
|
2018-12-08 00:43:31 +01:00
|
|
|
|
use crate::options::vars;
|
2018-06-15 04:38:32 +09:00
|
|
|
|
match vars.get(vars::TIME_STYLE) {
|
2020-10-10 19:49:46 +01:00
|
|
|
|
Some(ref t) if ! t.is_empty() => t.clone(),
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
_ => return Ok(Self::DefaultFormat)
|
2018-06-15 04:38:32 +09:00
|
|
|
|
}
|
|
|
|
|
},
|
2017-07-26 17:48:18 +01:00
|
|
|
|
};
|
|
|
|
|
|
2018-06-15 04:38:32 +09:00
|
|
|
|
if &word == "default" {
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
Ok(Self::DefaultFormat)
|
2017-07-26 17:48:18 +01:00
|
|
|
|
}
|
2018-06-15 04:38:32 +09:00
|
|
|
|
else if &word == "iso" {
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
Ok(Self::ISOFormat)
|
2017-07-26 17:48:18 +01:00
|
|
|
|
}
|
2018-06-15 04:38:32 +09:00
|
|
|
|
else if &word == "long-iso" {
|
2020-10-10 13:55:26 +01:00
|
|
|
|
Ok(Self::LongISO)
|
2017-07-26 17:48:18 +01:00
|
|
|
|
}
|
2018-06-15 04:38:32 +09:00
|
|
|
|
else if &word == "full-iso" {
|
2020-10-10 13:55:26 +01:00
|
|
|
|
Ok(Self::FullISO)
|
2017-07-06 00:01:45 +01:00
|
|
|
|
}
|
|
|
|
|
else {
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
Err(OptionsError::BadArgument(&flags::TIME_STYLE, word))
|
2017-07-06 00:01:45 +01:00
|
|
|
|
}
|
2017-07-05 23:27:48 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2016-04-17 20:38:37 +01:00
|
|
|
|
impl TimeTypes {
|
|
|
|
|
|
|
|
|
|
/// Determine which of a file’s time fields should be displayed for it
|
|
|
|
|
/// based on the user’s options.
|
|
|
|
|
///
|
|
|
|
|
/// There are two separate ways to pick which fields to show: with a
|
|
|
|
|
/// flag (such as `--modified`) or with a parameter (such as
|
|
|
|
|
/// `--time=modified`). An error is signaled if both ways are used.
|
|
|
|
|
///
|
|
|
|
|
/// It’s valid to show more than one column by passing in more than one
|
|
|
|
|
/// option, but passing *no* options means that the user just wants to
|
|
|
|
|
/// see the default set.
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
fn deduce(matches: &MatchedFlags) -> Result<Self, OptionsError> {
|
Be stricter in strict mode
Now the code actually starts to use the Strictness flag that was added in the earlier commit! Well, the *code* doesn’t, but the tests do: the macros that create the test cases now have a parameter for which tests they should run. It’s usually ‘Both’ for both strict mode and default mode, but can be specified to only run in one, for when the results differ (usually when options override one another)
The downside to strict mode is that, now, *any* call to `matches.has` or `matches.get` could fail, because an option could have been specified twice, and this is the place where those are checked for. This makes the code a little less ergonomic in places, but that’s what the ? operator is for. The only place this has really had an effect is in `Classify::deduce`, which used to just return a boolean but can now fail.
In order to more thoroughly test the mode, some of the older parts of the code can now act more strict. For example, `TerminalColours::deduce` will now use the last-given option rather than searching for “colours” before “colors”.
Help and Version continue doing their own thing.
2017-08-09 09:21:29 +01:00
|
|
|
|
let possible_word = matches.get(&flags::TIME)?;
|
|
|
|
|
let modified = matches.has(&flags::MODIFIED)?;
|
2018-12-17 05:46:50 +01:00
|
|
|
|
let changed = matches.has(&flags::CHANGED)?;
|
Be stricter in strict mode
Now the code actually starts to use the Strictness flag that was added in the earlier commit! Well, the *code* doesn’t, but the tests do: the macros that create the test cases now have a parameter for which tests they should run. It’s usually ‘Both’ for both strict mode and default mode, but can be specified to only run in one, for when the results differ (usually when options override one another)
The downside to strict mode is that, now, *any* call to `matches.has` or `matches.get` could fail, because an option could have been specified twice, and this is the place where those are checked for. This makes the code a little less ergonomic in places, but that’s what the ? operator is for. The only place this has really had an effect is in `Classify::deduce`, which used to just return a boolean but can now fail.
In order to more thoroughly test the mode, some of the older parts of the code can now act more strict. For example, `TerminalColours::deduce` will now use the last-given option rather than searching for “colours” before “colors”.
Help and Version continue doing their own thing.
2017-08-09 09:21:29 +01:00
|
|
|
|
let accessed = matches.has(&flags::ACCESSED)?;
|
2018-12-17 05:46:50 +01:00
|
|
|
|
let created = matches.has(&flags::CREATED)?;
|
2016-04-17 20:38:37 +01:00
|
|
|
|
|
2019-08-29 14:34:30 +02:00
|
|
|
|
let no_time = matches.has(&flags::NO_TIME)?;
|
|
|
|
|
|
|
|
|
|
let time_types = if no_time {
|
2020-10-10 13:55:26 +01:00
|
|
|
|
Self { modified: false, changed: false, accessed: false, created: false }
|
2019-08-29 14:34:30 +02:00
|
|
|
|
} else if let Some(word) = possible_word {
|
2016-04-17 20:38:37 +01:00
|
|
|
|
if modified {
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
return Err(OptionsError::Useless(&flags::MODIFIED, true, &flags::TIME));
|
2016-04-17 20:38:37 +01:00
|
|
|
|
}
|
2018-12-17 05:46:50 +01:00
|
|
|
|
else if changed {
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
return Err(OptionsError::Useless(&flags::CHANGED, true, &flags::TIME));
|
2016-04-17 20:38:37 +01:00
|
|
|
|
}
|
|
|
|
|
else if accessed {
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
return Err(OptionsError::Useless(&flags::ACCESSED, true, &flags::TIME));
|
2016-04-17 20:38:37 +01:00
|
|
|
|
}
|
2018-12-17 05:46:50 +01:00
|
|
|
|
else if created {
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
return Err(OptionsError::Useless(&flags::CREATED, true, &flags::TIME));
|
2018-12-17 05:46:50 +01:00
|
|
|
|
}
|
2017-08-05 11:55:41 +01:00
|
|
|
|
else if word == "mod" || word == "modified" {
|
2020-10-10 13:55:26 +01:00
|
|
|
|
Self { modified: true, changed: false, accessed: false, created: false }
|
2018-12-17 05:46:50 +01:00
|
|
|
|
}
|
|
|
|
|
else if word == "ch" || word == "changed" {
|
2020-10-10 13:55:26 +01:00
|
|
|
|
Self { modified: false, changed: true, accessed: false, created: false }
|
2017-07-26 17:48:18 +01:00
|
|
|
|
}
|
|
|
|
|
else if word == "acc" || word == "accessed" {
|
2020-10-10 13:55:26 +01:00
|
|
|
|
Self { modified: false, changed: false, accessed: true, created: false }
|
2017-07-26 17:48:18 +01:00
|
|
|
|
}
|
|
|
|
|
else if word == "cr" || word == "created" {
|
2020-10-10 13:55:26 +01:00
|
|
|
|
Self { modified: false, changed: false, accessed: false, created: true }
|
2017-07-26 17:48:18 +01:00
|
|
|
|
}
|
|
|
|
|
else {
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
return Err(OptionsError::BadArgument(&flags::TIME, word.into()));
|
2016-04-17 20:38:37 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
2018-12-17 05:46:50 +01:00
|
|
|
|
else if modified || changed || accessed || created {
|
2020-10-10 13:55:26 +01:00
|
|
|
|
Self { modified, changed, accessed, created }
|
2016-04-17 20:38:37 +01:00
|
|
|
|
}
|
|
|
|
|
else {
|
2020-10-10 13:55:26 +01:00
|
|
|
|
Self::default()
|
2018-12-17 05:48:49 +01:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
Ok(time_types)
|
2016-04-17 20:38:37 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2017-06-25 14:51:44 +01:00
|
|
|
|
// Gets, then caches, the width of the terminal that exa is running in.
|
|
|
|
|
// This gets used multiple times above, with no real guarantee of order,
|
|
|
|
|
// so it’s easier to just cache it the first time it runs.
|
|
|
|
|
lazy_static! {
|
|
|
|
|
static ref TERM_WIDTH: Option<usize> = {
|
2017-08-05 20:26:13 +01:00
|
|
|
|
// All of stdin, stdout, and stderr could not be connected to a
|
|
|
|
|
// terminal, but we’re only interested in stdout because it’s
|
|
|
|
|
// where the output goes.
|
|
|
|
|
use term_size::dimensions_stdout;
|
|
|
|
|
dimensions_stdout().map(|t| t.0)
|
2017-06-25 14:51:44 +01:00
|
|
|
|
};
|
|
|
|
|
}
|
2017-07-26 23:05:45 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
|
mod test {
|
|
|
|
|
use super::*;
|
Be stricter in strict mode
Now the code actually starts to use the Strictness flag that was added in the earlier commit! Well, the *code* doesn’t, but the tests do: the macros that create the test cases now have a parameter for which tests they should run. It’s usually ‘Both’ for both strict mode and default mode, but can be specified to only run in one, for when the results differ (usually when options override one another)
The downside to strict mode is that, now, *any* call to `matches.has` or `matches.get` could fail, because an option could have been specified twice, and this is the place where those are checked for. This makes the code a little less ergonomic in places, but that’s what the ? operator is for. The only place this has really had an effect is in `Classify::deduce`, which used to just return a boolean but can now fail.
In order to more thoroughly test the mode, some of the older parts of the code can now act more strict. For example, `TerminalColours::deduce` will now use the last-given option rather than searching for “colours” before “colors”.
Help and Version continue doing their own thing.
2017-08-09 09:21:29 +01:00
|
|
|
|
use std::ffi::OsString;
|
2018-12-08 00:43:31 +01:00
|
|
|
|
use crate::options::flags;
|
|
|
|
|
use crate::options::parser::{Flag, Arg};
|
2017-08-09 17:14:16 +01:00
|
|
|
|
|
2018-12-08 00:43:31 +01:00
|
|
|
|
use crate::options::test::parse_for_test;
|
|
|
|
|
use crate::options::test::Strictnesses::*;
|
Be stricter in strict mode
Now the code actually starts to use the Strictness flag that was added in the earlier commit! Well, the *code* doesn’t, but the tests do: the macros that create the test cases now have a parameter for which tests they should run. It’s usually ‘Both’ for both strict mode and default mode, but can be specified to only run in one, for when the results differ (usually when options override one another)
The downside to strict mode is that, now, *any* call to `matches.has` or `matches.get` could fail, because an option could have been specified twice, and this is the place where those are checked for. This makes the code a little less ergonomic in places, but that’s what the ? operator is for. The only place this has really had an effect is in `Classify::deduce`, which used to just return a boolean but can now fail.
In order to more thoroughly test the mode, some of the older parts of the code can now act more strict. For example, `TerminalColours::deduce` will now use the last-given option rather than searching for “colours” before “colors”.
Help and Version continue doing their own thing.
2017-08-09 09:21:29 +01:00
|
|
|
|
|
2017-08-09 17:14:16 +01:00
|
|
|
|
static TEST_ARGS: &[&Arg] = &[ &flags::BINARY, &flags::BYTES, &flags::TIME_STYLE,
|
2018-12-17 11:05:25 +01:00
|
|
|
|
&flags::TIME, &flags::MODIFIED, &flags::CHANGED,
|
2019-07-15 03:54:31 +01:00
|
|
|
|
&flags::CREATED, &flags::ACCESSED, &flags::ICONS,
|
2017-08-11 21:43:56 +01:00
|
|
|
|
&flags::HEADER, &flags::GROUP, &flags::INODE, &flags::GIT,
|
|
|
|
|
&flags::LINKS, &flags::BLOCKS, &flags::LONG, &flags::LEVEL,
|
2017-08-10 17:54:28 +01:00
|
|
|
|
&flags::GRID, &flags::ACROSS, &flags::ONE_LINE ];
|
2017-08-09 17:14:16 +01:00
|
|
|
|
|
2017-07-26 23:05:45 +01:00
|
|
|
|
macro_rules! test {
|
2017-08-10 13:52:49 +01:00
|
|
|
|
|
Be stricter in strict mode
Now the code actually starts to use the Strictness flag that was added in the earlier commit! Well, the *code* doesn’t, but the tests do: the macros that create the test cases now have a parameter for which tests they should run. It’s usually ‘Both’ for both strict mode and default mode, but can be specified to only run in one, for when the results differ (usually when options override one another)
The downside to strict mode is that, now, *any* call to `matches.has` or `matches.get` could fail, because an option could have been specified twice, and this is the place where those are checked for. This makes the code a little less ergonomic in places, but that’s what the ? operator is for. The only place this has really had an effect is in `Classify::deduce`, which used to just return a boolean but can now fail.
In order to more thoroughly test the mode, some of the older parts of the code can now act more strict. For example, `TerminalColours::deduce` will now use the last-given option rather than searching for “colours” before “colors”.
Help and Version continue doing their own thing.
2017-08-09 09:21:29 +01:00
|
|
|
|
($name:ident: $type:ident <- $inputs:expr; $stricts:expr => $result:expr) => {
|
2017-08-10 13:52:49 +01:00
|
|
|
|
/// Macro that writes a test.
|
|
|
|
|
/// If testing both strictnesses, they’ll both be done in the same function.
|
2017-07-26 23:05:45 +01:00
|
|
|
|
#[test]
|
|
|
|
|
fn $name() {
|
2017-08-09 13:36:06 +01:00
|
|
|
|
for result in parse_for_test($inputs.as_ref(), TEST_ARGS, $stricts, |mf| $type::deduce(mf)) {
|
|
|
|
|
assert_eq!(result, $result);
|
|
|
|
|
}
|
2017-07-26 23:05:45 +01:00
|
|
|
|
}
|
|
|
|
|
};
|
2017-08-09 17:14:16 +01:00
|
|
|
|
|
2017-08-10 13:52:49 +01:00
|
|
|
|
($name:ident: $type:ident <- $inputs:expr; $stricts:expr => err $result:expr) => {
|
|
|
|
|
/// Special macro for testing Err results.
|
|
|
|
|
/// This is needed because sometimes the Ok type doesn’t implement PartialEq.
|
|
|
|
|
#[test]
|
|
|
|
|
fn $name() {
|
|
|
|
|
for result in parse_for_test($inputs.as_ref(), TEST_ARGS, $stricts, |mf| $type::deduce(mf)) {
|
|
|
|
|
assert_eq!(result.unwrap_err(), $result);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
2017-08-09 17:14:16 +01:00
|
|
|
|
($name:ident: $type:ident <- $inputs:expr; $stricts:expr => like $pat:pat) => {
|
2017-08-10 13:52:49 +01:00
|
|
|
|
/// More general macro for testing against a pattern.
|
|
|
|
|
/// Instead of using PartialEq, this just tests if it matches a pat.
|
2017-08-09 17:14:16 +01:00
|
|
|
|
#[test]
|
|
|
|
|
fn $name() {
|
|
|
|
|
for result in parse_for_test($inputs.as_ref(), TEST_ARGS, $stricts, |mf| $type::deduce(mf)) {
|
|
|
|
|
println!("Testing {:?}", result);
|
|
|
|
|
match result {
|
|
|
|
|
$pat => assert!(true),
|
|
|
|
|
_ => assert!(false),
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
};
|
2017-08-10 17:54:28 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
($name:ident: $type:ident <- $inputs:expr, $vars:expr; $stricts:expr => err $result:expr) => {
|
|
|
|
|
/// Like above, but with $vars.
|
|
|
|
|
#[test]
|
|
|
|
|
fn $name() {
|
2017-08-13 11:14:58 +01:00
|
|
|
|
for result in parse_for_test($inputs.as_ref(), TEST_ARGS, $stricts, |mf| $type::deduce(mf, &$vars)) {
|
2017-08-10 17:54:28 +01:00
|
|
|
|
assert_eq!(result.unwrap_err(), $result);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
($name:ident: $type:ident <- $inputs:expr, $vars:expr; $stricts:expr => like $pat:pat) => {
|
|
|
|
|
/// Like further above, but with $vars.
|
|
|
|
|
#[test]
|
|
|
|
|
fn $name() {
|
2017-08-13 11:14:58 +01:00
|
|
|
|
for result in parse_for_test($inputs.as_ref(), TEST_ARGS, $stricts, |mf| $type::deduce(mf, &$vars)) {
|
2017-08-10 17:54:28 +01:00
|
|
|
|
println!("Testing {:?}", result);
|
|
|
|
|
match result {
|
|
|
|
|
$pat => assert!(true),
|
|
|
|
|
_ => assert!(false),
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
};
|
2017-07-26 23:05:45 +01:00
|
|
|
|
}
|
|
|
|
|
|
2017-07-26 23:37:58 +01:00
|
|
|
|
|
2017-07-26 23:05:45 +01:00
|
|
|
|
mod size_formats {
|
|
|
|
|
use super::*;
|
|
|
|
|
|
2017-08-09 17:14:16 +01:00
|
|
|
|
// Default behaviour
|
Be stricter in strict mode
Now the code actually starts to use the Strictness flag that was added in the earlier commit! Well, the *code* doesn’t, but the tests do: the macros that create the test cases now have a parameter for which tests they should run. It’s usually ‘Both’ for both strict mode and default mode, but can be specified to only run in one, for when the results differ (usually when options override one another)
The downside to strict mode is that, now, *any* call to `matches.has` or `matches.get` could fail, because an option could have been specified twice, and this is the place where those are checked for. This makes the code a little less ergonomic in places, but that’s what the ? operator is for. The only place this has really had an effect is in `Classify::deduce`, which used to just return a boolean but can now fail.
In order to more thoroughly test the mode, some of the older parts of the code can now act more strict. For example, `TerminalColours::deduce` will now use the last-given option rather than searching for “colours” before “colors”.
Help and Version continue doing their own thing.
2017-08-09 09:21:29 +01:00
|
|
|
|
test!(empty: SizeFormat <- []; Both => Ok(SizeFormat::DecimalBytes));
|
2017-08-09 17:14:16 +01:00
|
|
|
|
|
|
|
|
|
// Individual flags
|
Be stricter in strict mode
Now the code actually starts to use the Strictness flag that was added in the earlier commit! Well, the *code* doesn’t, but the tests do: the macros that create the test cases now have a parameter for which tests they should run. It’s usually ‘Both’ for both strict mode and default mode, but can be specified to only run in one, for when the results differ (usually when options override one another)
The downside to strict mode is that, now, *any* call to `matches.has` or `matches.get` could fail, because an option could have been specified twice, and this is the place where those are checked for. This makes the code a little less ergonomic in places, but that’s what the ? operator is for. The only place this has really had an effect is in `Classify::deduce`, which used to just return a boolean but can now fail.
In order to more thoroughly test the mode, some of the older parts of the code can now act more strict. For example, `TerminalColours::deduce` will now use the last-given option rather than searching for “colours” before “colors”.
Help and Version continue doing their own thing.
2017-08-09 09:21:29 +01:00
|
|
|
|
test!(binary: SizeFormat <- ["--binary"]; Both => Ok(SizeFormat::BinaryBytes));
|
|
|
|
|
test!(bytes: SizeFormat <- ["--bytes"]; Both => Ok(SizeFormat::JustBytes));
|
2017-08-09 17:14:16 +01:00
|
|
|
|
|
2017-08-09 19:18:31 +01:00
|
|
|
|
// Overriding
|
|
|
|
|
test!(both_1: SizeFormat <- ["--binary", "--binary"]; Last => Ok(SizeFormat::BinaryBytes));
|
|
|
|
|
test!(both_2: SizeFormat <- ["--bytes", "--binary"]; Last => Ok(SizeFormat::BinaryBytes));
|
|
|
|
|
test!(both_3: SizeFormat <- ["--binary", "--bytes"]; Last => Ok(SizeFormat::JustBytes));
|
|
|
|
|
test!(both_4: SizeFormat <- ["--bytes", "--bytes"]; Last => Ok(SizeFormat::JustBytes));
|
|
|
|
|
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
test!(both_5: SizeFormat <- ["--binary", "--binary"]; Complain => err OptionsError::Duplicate(Flag::Long("binary"), Flag::Long("binary")));
|
|
|
|
|
test!(both_6: SizeFormat <- ["--bytes", "--binary"]; Complain => err OptionsError::Duplicate(Flag::Long("bytes"), Flag::Long("binary")));
|
|
|
|
|
test!(both_7: SizeFormat <- ["--binary", "--bytes"]; Complain => err OptionsError::Duplicate(Flag::Long("binary"), Flag::Long("bytes")));
|
|
|
|
|
test!(both_8: SizeFormat <- ["--bytes", "--bytes"]; Complain => err OptionsError::Duplicate(Flag::Long("bytes"), Flag::Long("bytes")));
|
2017-07-26 23:05:45 +01:00
|
|
|
|
}
|
2017-07-26 23:37:58 +01:00
|
|
|
|
|
|
|
|
|
|
2017-08-09 17:14:16 +01:00
|
|
|
|
mod time_formats {
|
|
|
|
|
use super::*;
|
|
|
|
|
|
|
|
|
|
// These tests use pattern matching because TimeFormat doesn’t
|
|
|
|
|
// implement PartialEq.
|
|
|
|
|
|
|
|
|
|
// Default behaviour
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
test!(empty: TimeFormat <- [], None; Both => like Ok(TimeFormat::DefaultFormat));
|
2017-08-09 17:14:16 +01:00
|
|
|
|
|
|
|
|
|
// Individual settings
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
test!(default: TimeFormat <- ["--time-style=default"], None; Both => like Ok(TimeFormat::DefaultFormat));
|
|
|
|
|
test!(iso: TimeFormat <- ["--time-style", "iso"], None; Both => like Ok(TimeFormat::ISOFormat));
|
2018-06-15 04:38:32 +09:00
|
|
|
|
test!(long_iso: TimeFormat <- ["--time-style=long-iso"], None; Both => like Ok(TimeFormat::LongISO));
|
|
|
|
|
test!(full_iso: TimeFormat <- ["--time-style", "full-iso"], None; Both => like Ok(TimeFormat::FullISO));
|
2017-08-09 17:14:16 +01:00
|
|
|
|
|
|
|
|
|
// Overriding
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
test!(actually: TimeFormat <- ["--time-style=default", "--time-style", "iso"], None; Last => like Ok(TimeFormat::ISOFormat));
|
|
|
|
|
test!(actual_2: TimeFormat <- ["--time-style=default", "--time-style", "iso"], None; Complain => err OptionsError::Duplicate(Flag::Long("time-style"), Flag::Long("time-style")));
|
2017-08-09 17:14:16 +01:00
|
|
|
|
|
2018-06-15 04:38:32 +09:00
|
|
|
|
test!(nevermind: TimeFormat <- ["--time-style", "long-iso", "--time-style=full-iso"], None; Last => like Ok(TimeFormat::FullISO));
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
test!(nevermore: TimeFormat <- ["--time-style", "long-iso", "--time-style=full-iso"], None; Complain => err OptionsError::Duplicate(Flag::Long("time-style"), Flag::Long("time-style")));
|
2017-08-09 17:14:16 +01:00
|
|
|
|
|
|
|
|
|
// Errors
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
test!(daily: TimeFormat <- ["--time-style=24-hour"], None; Both => err OptionsError::BadArgument(&flags::TIME_STYLE, OsString::from("24-hour")));
|
2018-06-15 04:38:32 +09:00
|
|
|
|
|
|
|
|
|
// `TIME_STYLE` environment variable is defined.
|
|
|
|
|
// If the time-style argument is not given, `TIME_STYLE` is used.
|
|
|
|
|
test!(use_env: TimeFormat <- [], Some("long-iso".into()); Both => like Ok(TimeFormat::LongISO));
|
|
|
|
|
|
|
|
|
|
// If the time-style argument is given, `TIME_STYLE` is overriding.
|
|
|
|
|
test!(override_env: TimeFormat <- ["--time-style=full-iso"], Some("long-iso".into()); Both => like Ok(TimeFormat::FullISO));
|
2017-08-09 17:14:16 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2017-07-26 23:37:58 +01:00
|
|
|
|
mod time_types {
|
|
|
|
|
use super::*;
|
|
|
|
|
|
|
|
|
|
// Default behaviour
|
Be stricter in strict mode
Now the code actually starts to use the Strictness flag that was added in the earlier commit! Well, the *code* doesn’t, but the tests do: the macros that create the test cases now have a parameter for which tests they should run. It’s usually ‘Both’ for both strict mode and default mode, but can be specified to only run in one, for when the results differ (usually when options override one another)
The downside to strict mode is that, now, *any* call to `matches.has` or `matches.get` could fail, because an option could have been specified twice, and this is the place where those are checked for. This makes the code a little less ergonomic in places, but that’s what the ? operator is for. The only place this has really had an effect is in `Classify::deduce`, which used to just return a boolean but can now fail.
In order to more thoroughly test the mode, some of the older parts of the code can now act more strict. For example, `TerminalColours::deduce` will now use the last-given option rather than searching for “colours” before “colors”.
Help and Version continue doing their own thing.
2017-08-09 09:21:29 +01:00
|
|
|
|
test!(empty: TimeTypes <- []; Both => Ok(TimeTypes::default()));
|
2017-08-09 13:36:06 +01:00
|
|
|
|
|
|
|
|
|
// Modified
|
2018-12-17 11:05:25 +01:00
|
|
|
|
test!(modified: TimeTypes <- ["--modified"]; Both => Ok(TimeTypes { modified: true, changed: false, accessed: false, created: false }));
|
|
|
|
|
test!(m: TimeTypes <- ["-m"]; Both => Ok(TimeTypes { modified: true, changed: false, accessed: false, created: false }));
|
|
|
|
|
test!(time_mod: TimeTypes <- ["--time=modified"]; Both => Ok(TimeTypes { modified: true, changed: false, accessed: false, created: false }));
|
2019-07-15 03:37:05 +01:00
|
|
|
|
test!(t_m: TimeTypes <- ["-tmod"]; Both => Ok(TimeTypes { modified: true, changed: false, accessed: false, created: false }));
|
2018-12-17 11:05:25 +01:00
|
|
|
|
|
|
|
|
|
// Changed
|
|
|
|
|
#[cfg(target_family = "unix")]
|
|
|
|
|
test!(changed: TimeTypes <- ["--changed"]; Both => Ok(TimeTypes { modified: false, changed: true, accessed: false, created: false }));
|
|
|
|
|
#[cfg(target_family = "unix")]
|
|
|
|
|
test!(time_ch: TimeTypes <- ["--time=changed"]; Both => Ok(TimeTypes { modified: false, changed: true, accessed: false, created: false }));
|
|
|
|
|
#[cfg(target_family = "unix")]
|
2019-07-15 03:37:05 +01:00
|
|
|
|
test!(t_ch: TimeTypes <- ["-t", "ch"]; Both => Ok(TimeTypes { modified: false, changed: true, accessed: false, created: false }));
|
Be stricter in strict mode
Now the code actually starts to use the Strictness flag that was added in the earlier commit! Well, the *code* doesn’t, but the tests do: the macros that create the test cases now have a parameter for which tests they should run. It’s usually ‘Both’ for both strict mode and default mode, but can be specified to only run in one, for when the results differ (usually when options override one another)
The downside to strict mode is that, now, *any* call to `matches.has` or `matches.get` could fail, because an option could have been specified twice, and this is the place where those are checked for. This makes the code a little less ergonomic in places, but that’s what the ? operator is for. The only place this has really had an effect is in `Classify::deduce`, which used to just return a boolean but can now fail.
In order to more thoroughly test the mode, some of the older parts of the code can now act more strict. For example, `TerminalColours::deduce` will now use the last-given option rather than searching for “colours” before “colors”.
Help and Version continue doing their own thing.
2017-08-09 09:21:29 +01:00
|
|
|
|
|
2017-08-09 13:36:06 +01:00
|
|
|
|
// Accessed
|
2018-12-17 11:05:25 +01:00
|
|
|
|
test!(acc: TimeTypes <- ["--accessed"]; Both => Ok(TimeTypes { modified: false, changed: false, accessed: true, created: false }));
|
|
|
|
|
test!(a: TimeTypes <- ["-u"]; Both => Ok(TimeTypes { modified: false, changed: false, accessed: true, created: false }));
|
|
|
|
|
test!(time_acc: TimeTypes <- ["--time", "accessed"]; Both => Ok(TimeTypes { modified: false, changed: false, accessed: true, created: false }));
|
|
|
|
|
test!(time_a: TimeTypes <- ["-t", "acc"]; Both => Ok(TimeTypes { modified: false, changed: false, accessed: true, created: false }));
|
Be stricter in strict mode
Now the code actually starts to use the Strictness flag that was added in the earlier commit! Well, the *code* doesn’t, but the tests do: the macros that create the test cases now have a parameter for which tests they should run. It’s usually ‘Both’ for both strict mode and default mode, but can be specified to only run in one, for when the results differ (usually when options override one another)
The downside to strict mode is that, now, *any* call to `matches.has` or `matches.get` could fail, because an option could have been specified twice, and this is the place where those are checked for. This makes the code a little less ergonomic in places, but that’s what the ? operator is for. The only place this has really had an effect is in `Classify::deduce`, which used to just return a boolean but can now fail.
In order to more thoroughly test the mode, some of the older parts of the code can now act more strict. For example, `TerminalColours::deduce` will now use the last-given option rather than searching for “colours” before “colors”.
Help and Version continue doing their own thing.
2017-08-09 09:21:29 +01:00
|
|
|
|
|
2017-08-09 13:36:06 +01:00
|
|
|
|
// Created
|
2018-12-17 11:05:25 +01:00
|
|
|
|
test!(cr: TimeTypes <- ["--created"]; Both => Ok(TimeTypes { modified: false, changed: false, accessed: false, created: true }));
|
|
|
|
|
test!(c: TimeTypes <- ["-U"]; Both => Ok(TimeTypes { modified: false, changed: false, accessed: false, created: true }));
|
|
|
|
|
test!(time_cr: TimeTypes <- ["--time=created"]; Both => Ok(TimeTypes { modified: false, changed: false, accessed: false, created: true }));
|
2019-07-15 03:37:05 +01:00
|
|
|
|
test!(t_cr: TimeTypes <- ["-tcr"]; Both => Ok(TimeTypes { modified: false, changed: false, accessed: false, created: true }));
|
2017-07-26 23:37:58 +01:00
|
|
|
|
|
|
|
|
|
// Multiples
|
2018-12-17 11:05:25 +01:00
|
|
|
|
test!(time_uu: TimeTypes <- ["-u", "--modified"]; Both => Ok(TimeTypes { modified: true, changed: false, accessed: true, created: false }));
|
|
|
|
|
|
Be stricter in strict mode
Now the code actually starts to use the Strictness flag that was added in the earlier commit! Well, the *code* doesn’t, but the tests do: the macros that create the test cases now have a parameter for which tests they should run. It’s usually ‘Both’ for both strict mode and default mode, but can be specified to only run in one, for when the results differ (usually when options override one another)
The downside to strict mode is that, now, *any* call to `matches.has` or `matches.get` could fail, because an option could have been specified twice, and this is the place where those are checked for. This makes the code a little less ergonomic in places, but that’s what the ? operator is for. The only place this has really had an effect is in `Classify::deduce`, which used to just return a boolean but can now fail.
In order to more thoroughly test the mode, some of the older parts of the code can now act more strict. For example, `TerminalColours::deduce` will now use the last-given option rather than searching for “colours” before “colors”.
Help and Version continue doing their own thing.
2017-08-09 09:21:29 +01:00
|
|
|
|
|
|
|
|
|
// Errors
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
test!(time_tea: TimeTypes <- ["--time=tea"]; Both => err OptionsError::BadArgument(&flags::TIME, OsString::from("tea")));
|
|
|
|
|
test!(t_ea: TimeTypes <- ["-tea"]; Both => err OptionsError::BadArgument(&flags::TIME, OsString::from("ea")));
|
2017-07-26 23:37:58 +01:00
|
|
|
|
|
|
|
|
|
// Overriding
|
2018-12-17 11:05:25 +01:00
|
|
|
|
test!(overridden: TimeTypes <- ["-tcr", "-tmod"]; Last => Ok(TimeTypes { modified: true, changed: false, accessed: false, created: false }));
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
test!(overridden_2: TimeTypes <- ["-tcr", "-tmod"]; Complain => err OptionsError::Duplicate(Flag::Short(b't'), Flag::Short(b't')));
|
Be stricter in strict mode
Now the code actually starts to use the Strictness flag that was added in the earlier commit! Well, the *code* doesn’t, but the tests do: the macros that create the test cases now have a parameter for which tests they should run. It’s usually ‘Both’ for both strict mode and default mode, but can be specified to only run in one, for when the results differ (usually when options override one another)
The downside to strict mode is that, now, *any* call to `matches.has` or `matches.get` could fail, because an option could have been specified twice, and this is the place where those are checked for. This makes the code a little less ergonomic in places, but that’s what the ? operator is for. The only place this has really had an effect is in `Classify::deduce`, which used to just return a boolean but can now fail.
In order to more thoroughly test the mode, some of the older parts of the code can now act more strict. For example, `TerminalColours::deduce` will now use the last-given option rather than searching for “colours” before “colors”.
Help and Version continue doing their own thing.
2017-08-09 09:21:29 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2017-08-10 13:59:39 +01:00
|
|
|
|
mod views {
|
|
|
|
|
use super::*;
|
2018-12-08 00:43:31 +01:00
|
|
|
|
|
|
|
|
|
use crate::output::grid::Options as GridOptions;
|
|
|
|
|
use crate::output::lines::Options as LineOptions;
|
|
|
|
|
|
2017-08-10 13:59:39 +01:00
|
|
|
|
|
2017-08-10 17:54:28 +01:00
|
|
|
|
// Default
|
|
|
|
|
test!(empty: Mode <- [], None; Both => like Ok(Mode::Grid(_)));
|
|
|
|
|
|
|
|
|
|
// Grid views
|
2018-03-26 16:01:53 -04:00
|
|
|
|
test!(original_g: Mode <- ["-G"], None; Both => like Ok(Mode::Grid(GridOptions { across: false, console_width: _, icons: _ })));
|
|
|
|
|
test!(grid: Mode <- ["--grid"], None; Both => like Ok(Mode::Grid(GridOptions { across: false, console_width: _, icons: _ })));
|
|
|
|
|
test!(across: Mode <- ["--across"], None; Both => like Ok(Mode::Grid(GridOptions { across: true, console_width: _, icons: _ })));
|
|
|
|
|
test!(gracross: Mode <- ["-xG"], None; Both => like Ok(Mode::Grid(GridOptions { across: true, console_width: _, icons: _ })));
|
|
|
|
|
test!(icons: Mode <- ["--icons"], None; Both => like Ok(Mode::Grid(GridOptions { across: _, console_width: _, icons: true})));
|
2017-08-10 17:54:28 +01:00
|
|
|
|
|
|
|
|
|
// Lines views
|
2018-04-01 19:00:27 -04:00
|
|
|
|
test!(lines: Mode <- ["--oneline"], None; Both => like Ok(Mode::Lines(LineOptions{ icons: _ })));
|
|
|
|
|
test!(prima: Mode <- ["-1"], None; Both => like Ok(Mode::Lines(LineOptions{ icons: _ })));
|
|
|
|
|
test!(line_icon: Mode <- ["-1", "--icons"], None; Both => like Ok(Mode::Lines(LineOptions { icons: true })));
|
2017-08-10 17:54:28 +01:00
|
|
|
|
|
|
|
|
|
// Details views
|
|
|
|
|
test!(long: Mode <- ["--long"], None; Both => like Ok(Mode::Details(_)));
|
|
|
|
|
test!(ell: Mode <- ["-l"], None; Both => like Ok(Mode::Details(_)));
|
|
|
|
|
|
|
|
|
|
// Grid-details views
|
2017-08-12 22:49:16 +01:00
|
|
|
|
test!(lid: Mode <- ["--long", "--grid"], None; Both => like Ok(Mode::GridDetails(_)));
|
|
|
|
|
test!(leg: Mode <- ["-lG"], None; Both => like Ok(Mode::GridDetails(_)));
|
2017-08-10 17:54:28 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Options that do nothing without --long
|
|
|
|
|
test!(just_header: Mode <- ["--header"], None; Last => like Ok(Mode::Grid(_)));
|
|
|
|
|
test!(just_group: Mode <- ["--group"], None; Last => like Ok(Mode::Grid(_)));
|
|
|
|
|
test!(just_inode: Mode <- ["--inode"], None; Last => like Ok(Mode::Grid(_)));
|
|
|
|
|
test!(just_links: Mode <- ["--links"], None; Last => like Ok(Mode::Grid(_)));
|
|
|
|
|
test!(just_blocks: Mode <- ["--blocks"], None; Last => like Ok(Mode::Grid(_)));
|
|
|
|
|
test!(just_binary: Mode <- ["--binary"], None; Last => like Ok(Mode::Grid(_)));
|
|
|
|
|
test!(just_bytes: Mode <- ["--bytes"], None; Last => like Ok(Mode::Grid(_)));
|
|
|
|
|
|
2020-10-10 19:49:46 +01:00
|
|
|
|
#[cfg(feature = "git")]
|
2017-08-11 21:43:56 +01:00
|
|
|
|
test!(just_git: Mode <- ["--git"], None; Last => like Ok(Mode::Grid(_)));
|
|
|
|
|
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
test!(just_header_2: Mode <- ["--header"], None; Complain => err OptionsError::Useless(&flags::HEADER, false, &flags::LONG));
|
|
|
|
|
test!(just_group_2: Mode <- ["--group"], None; Complain => err OptionsError::Useless(&flags::GROUP, false, &flags::LONG));
|
|
|
|
|
test!(just_inode_2: Mode <- ["--inode"], None; Complain => err OptionsError::Useless(&flags::INODE, false, &flags::LONG));
|
|
|
|
|
test!(just_links_2: Mode <- ["--links"], None; Complain => err OptionsError::Useless(&flags::LINKS, false, &flags::LONG));
|
|
|
|
|
test!(just_blocks_2: Mode <- ["--blocks"], None; Complain => err OptionsError::Useless(&flags::BLOCKS, false, &flags::LONG));
|
|
|
|
|
test!(just_binary_2: Mode <- ["--binary"], None; Complain => err OptionsError::Useless(&flags::BINARY, false, &flags::LONG));
|
|
|
|
|
test!(just_bytes_2: Mode <- ["--bytes"], None; Complain => err OptionsError::Useless(&flags::BYTES, false, &flags::LONG));
|
2017-08-11 21:43:56 +01:00
|
|
|
|
|
2020-10-10 19:49:46 +01:00
|
|
|
|
#[cfg(feature = "git")]
|
Replace Misfire with a testable OptionsResult
This was meant to be a small change, but it spiralled into a big one.
The original intention was to separate OptionsResult and OptionsError. With these types separated, the Help and Version variants can only be returned from the Options::parse function, and the later option-parsing functions can only return success or errors.
Also, Misfire was a silly name.
As a side-effect of Options::parse returning OptionsResult instead of Result<Options, Misfire>, we could no longer use unwrap() or unwrap_err() to get the contents out. This commit makes OptionsResult into a value type, and Options::parse a pure function. It feels like it should be one, having its return value entirely dependent on its arguments, but it also loaded locales and time zones. These parts have been moved into lazy_static references, and the code still passes tests without much change.
OptionsResult isn't PartialEq yet, because the file colouring uses a Box internally.
2020-10-12 23:47:36 +01:00
|
|
|
|
test!(just_git_2: Mode <- ["--git"], None; Complain => err OptionsError::Useless(&flags::GIT, false, &flags::LONG));
|
2017-08-10 13:59:39 +01:00
|
|
|
|
}
|
2017-07-26 23:05:45 +01:00
|
|
|
|
}
|