@@ -4,7 +4,7 @@ use std::str::FromStr;
44use crate::errors::*;
55
66#[derive(Debug, Eq, PartialEq, Copy, Clone, Hash)]
7−pub enum OutputComponent {
7+pub enum StyleComponent {
88 Auto,
99 Changes,
1010 Grid,
@@ -15,92 +15,80 @@ pub enum OutputComponent {
1515 Plain,
1616}
1717
18−#[derive(Debug, Eq, PartialEq, Copy, Clone, Hash)]
19−pub enum OutputWrap {
20− Character,
21− None,
22−}
23−
24−impl Default for OutputWrap {
25− fn default() -> Self {
26− OutputWrap::None
27− }
28−}
29−
30−impl OutputComponent {
31− pub fn components(self, interactive_terminal: bool) -> &'static [OutputComponent] {
18+impl StyleComponent {
19+ pub fn components(self, interactive_terminal: bool) -> &'static [StyleComponent] {
3220 match self {
33− OutputComponent::Auto => {
21+ StyleComponent::Auto => {
3422 if interactive_terminal {
35− OutputComponent::Full.components(interactive_terminal)
23+ StyleComponent::Full.components(interactive_terminal)
3624 } else {
37− OutputComponent::Plain.components(interactive_terminal)
25+ StyleComponent::Plain.components(interactive_terminal)
3826 }
3927 }
40− OutputComponent::Changes => &[OutputComponent::Changes],
41− OutputComponent::Grid => &[OutputComponent::Grid],
42− OutputComponent::Header => &[OutputComponent::Header],
43− OutputComponent::Numbers => &[OutputComponent::Numbers],
44− OutputComponent::Snip => &[OutputComponent::Snip],
45− OutputComponent::Full => &[
46− OutputComponent::Changes,
47− OutputComponent::Grid,
48− OutputComponent::Header,
49− OutputComponent::Numbers,
50− OutputComponent::Snip,
28+ StyleComponent::Changes => &[StyleComponent::Changes],
29+ StyleComponent::Grid => &[StyleComponent::Grid],
30+ StyleComponent::Header => &[StyleComponent::Header],
31+ StyleComponent::Numbers => &[StyleComponent::Numbers],
32+ StyleComponent::Snip => &[StyleComponent::Snip],
33+ StyleComponent::Full => &[
34+ StyleComponent::Changes,
35+ StyleComponent::Grid,
36+ StyleComponent::Header,
37+ StyleComponent::Numbers,
38+ StyleComponent::Snip,
5139 ],
52− OutputComponent::Plain => &[],
40+ StyleComponent::Plain => &[],
5341 }
5442 }
5543}
5644
57−impl FromStr for OutputComponent {
45+impl FromStr for StyleComponent {
5846 type Err = Error;
5947
6048 fn from_str(s: &str) -> Result<Self> {
6149 match s {
62− "auto" => Ok(OutputComponent::Auto),
63− "changes" => Ok(OutputComponent::Changes),
64− "grid" => Ok(OutputComponent::Grid),
65− "header" => Ok(OutputComponent::Header),
66− "numbers" => Ok(OutputComponent::Numbers),
67− "snip" => Ok(OutputComponent::Snip),
68− "full" => Ok(OutputComponent::Full),
69− "plain" => Ok(OutputComponent::Plain),
50+ "auto" => Ok(StyleComponent::Auto),
51+ "changes" => Ok(StyleComponent::Changes),
52+ "grid" => Ok(StyleComponent::Grid),
53+ "header" => Ok(StyleComponent::Header),
54+ "numbers" => Ok(StyleComponent::Numbers),
55+ "snip" => Ok(StyleComponent::Snip),
56+ "full" => Ok(StyleComponent::Full),
57+ "plain" => Ok(StyleComponent::Plain),
7058 _ => Err(format!("Unknown style '{}'", s).into()),
7159 }
7260 }
7361}
7462
7563#[derive(Debug, Clone, Default)]
76−pub struct OutputComponents(pub HashSet<OutputComponent>);
64+pub struct StyleComponents(pub HashSet<StyleComponent>);
7765
78−impl OutputComponents {
79− pub fn new(components: &[OutputComponent]) -> OutputComponents {
80− OutputComponents(components.iter().cloned().collect())
66+impl StyleComponents {
67+ pub fn new(components: &[StyleComponent]) -> StyleComponents {
68+ StyleComponents(components.iter().cloned().collect())
8169 }
8270
8371 pub fn changes(&self) -> bool {
84− self.0.contains(&OutputComponent::Changes)
72+ self.0.contains(&StyleComponent::Changes)
8573 }
8674
8775 pub fn grid(&self) -> bool {
88− self.0.contains(&OutputComponent::Grid)
76+ self.0.contains(&StyleComponent::Grid)
8977 }
9078
9179 pub fn header(&self) -> bool {
92− self.0.contains(&OutputComponent::Header)
80+ self.0.contains(&StyleComponent::Header)
9381 }
9482
9583 pub fn numbers(&self) -> bool {
96− self.0.contains(&OutputComponent::Numbers)
84+ self.0.contains(&StyleComponent::Numbers)
9785 }
9886
9987 pub fn snip(&self) -> bool {
100− self.0.contains(&OutputComponent::Snip)
88+ self.0.contains(&StyleComponent::Snip)
10189 }
10290
10391 pub fn plain(&self) -> bool {
104− self.0.iter().all(|c| c == &OutputComponent::Plain)
92+ self.0.iter().all(|c| c == &StyleComponent::Plain)
10593 }
10694}