Shorten cli example and some tests

Author: killercup

examples/cli.rs

@@ -1,8 +1,9 @@
 extern crate failure;
+#[macro_use]
 extern crate output;
 
 use output::{
-    components::{span, text},
+    components::{newline, text},
     human, json,
 };
 
@@ -13,35 +14,16 @@ fn main() -> Result<(), failure::Error> {
 
     let x = 42;
 
-    out.print(&text(x.to_string()))?;
-
-    out.print(
-        &span()
-            .fg("blue")?
-            .bg("yellow")?
-            .underline(true)
-            .bold(true)
-            .intense(true)
-            .add_item(text("mixed style")),
-    )?;
-
-    out.print(
-        &span()
-            .intense(true)
-            .fg("green")?
-            .add_item(text("color with intense")),
-    )?;
-
-    out.print(
-        &span()
-            .intense(false)
-            .fg("green")?
-            .add_item(text("color without intense")),
-    )?;
-
-    out.print(&span().bold(true).add_item(text("bold")))?;
-
-    out.print(&span().underline(true).add_item(text("underline")))?;
+    out.print(text(x.to_string()))?;
+    out.print(span!([
+        span!(fg = "blue", bg = "yellow", ["colorful text",]),
+        newline(),
+        span!(bold = true, ["bold text",]),
+        newline(),
+        span!(underline = true, ["underlined text",]),
+        newline(),
+        span!(intense = true, ["intense text",]),
+    ]))?;
 
     Ok(())
 }

src/components/span.rs

@@ -123,75 +123,71 @@ impl Render for Span {
 mod test {
     use super::span;
     use components::text;
-    use {human, json, Render};
+    use {human, json, Error, Render};
 
     #[test]
-    fn renders_span_children() {
+    fn renders_span_children() -> Result<(), Error> {
         let item = span()
             .add_item(text("one"))
             .add_item(text("two"))
             .add_item(span().add_item(text("three")));
 
         let human_output = human::test();
-        item.render_for_humans(&mut human_output.formatter())
-            .unwrap();
+        item.render_for_humans(&mut human_output.formatter())?;
         assert_eq!(&human_output.to_string(), "onetwothree");
 
         let json = json::test();
-        item.render_json(&mut json.formatter()).unwrap();
+        item.render_json(&mut json.formatter())?;
         assert_eq!(json.to_string(), "\"one\"\n\"two\"\n\"three\"\n");
+        Ok(())
     }
 
     #[test]
-    fn test_colored_output() {
+    fn test_colored_output() -> Result<(), Error> {
         let test_target = human::test_with_color();
         let mut out = ::new().add_target(test_target.target());
-        out.print(
-            span()
-                .add_item("hello")
-                .fg("green")
-                .unwrap()
-                .bg("blue")
-                .unwrap(),
-        ).unwrap();
+        out.print(span().add_item("hello").fg("green")?.bg("blue")?)?;
         assert_eq!(
             test_target.to_string(),
             "\u{1b}[0m\u{1b}[32m\u{1b}[44mhello\u{1b}[0m\n"
-        )
+        );
+        Ok(())
     }
 
     #[test]
-    fn test_bold_output() {
+    fn test_bold_output() -> Result<(), Error> {
         let test_target = human::test_with_color();
         let mut out = ::new().add_target(test_target.target());
-        out.print(span().add_item("hello").bold(true)).unwrap();
+        out.print(span().add_item("hello").bold(true)?)?;
         assert_eq!(
             test_target.to_string(),
             "\u{1b}[0m\u{1b}[1mhello\u{1b}[0m\n"
-        )
+        );
+        Ok(())
     }
 
     #[test]
-    fn test_intense_output() {
+    fn test_intense_output() -> Result<(), Error> {
         let test_target = human::test_with_color();
         let mut out = ::new().add_target(test_target.target());
-        out.print(span().add_item("hello").fg("green").unwrap().intense(true))
-            .unwrap();
+        out.print(span().add_item("hello").fg("green")?.intense(true)?)?;
         assert_eq!(
             test_target.to_string(),
             "\u{1b}[0m\u{1b}[38;5;10mhello\u{1b}[0m\n"
-        )
+        );
+        Ok(())
     }
 
     #[test]
-    fn test_underline_output() {
+    fn test_underline_output() -> Result<(), Error> {
         let test_target = human::test_with_color();
         let mut out = ::new().add_target(test_target.target());
-        out.print(span().add_item("hello").underline(true)).unwrap();
+        out.print(span().add_item("hello").underline(true)?)?;
         assert_eq!(
             test_target.to_string(),
             "\u{1b}[0m\u{1b}[4mhello\u{1b}[0m\n"
-        )
+        );
+        Ok(())
     }
 
     // TODO: Add proptest tests