Upgrade to 2018 edition

Author: killercup

Cargo.toml

@@ -6,6 +6,7 @@ description = "A Rust create for outputting information and log messages for hum
 license = "Apache-2.0 OR MIT"
 readme = "README.md"
 repository = "https://github.com/killercup/convey"
+edition = "2018"
 
 [workspace]
 members = [

examples/cli.rs

@@ -1,5 +1,5 @@
-extern crate failure;
-extern crate structopt;
+use failure;
+use structopt;
 #[macro_use]
 extern crate serde_derive;
 #[macro_use]

examples/concurrent.rs

@@ -1,6 +1,5 @@
-extern crate convey;
-extern crate failure;
-extern crate rand;
+use convey;
+use failure;
 
 use convey::{human, json};
 use rand::{thread_rng, Rng};
@@ -14,7 +13,7 @@ fn main() -> Result<(), failure::Error> {
 
     let mut threads = vec![];
     for i in 0..100 {
-        let mut out = out.clone();
+        let out = out.clone();
         let t = thread::spawn(move || {
             let dur = Duration::from_millis(thread_rng().gen_range(0u64, 1));
             thread::sleep(dur);

examples/custom.rs

@@ -1,4 +1,4 @@
-extern crate failure;
+use failure;
 #[macro_use]
 extern crate convey;
 #[macro_use]

examples/derive.rs

@@ -1,5 +1,5 @@
-extern crate convey;
-extern crate failure;
+use convey;
+use failure;
 #[macro_use]
 extern crate convey_derive;
 #[macro_use]

src/components/span.rs

@@ -1,5 +1,5 @@
+use crate::{human, json, Error, Render};
 use termcolor::ColorSpec;
-use {human, json, Error, Render};
 
 /// Construct a new, empty span
 pub fn span() -> Span {
@@ -54,7 +54,7 @@ macro_rules! span {
 
 #[derive(Default)]
 pub struct Span {
-    items: Vec<Box<Render>>,
+    items: Vec<Box<dyn Render>>,
     fg: Option<::termcolor::Color>,
     bg: Option<::termcolor::Color>,
     bold: bool,
@@ -126,8 +126,8 @@ impl Render for Span {
 #[cfg(test)]
 mod test {
     use super::span;
-    use components::text;
-    use {human, json, Error, Render};
+    use crate::components::text;
+    use crate::{human, json, Error, Render};
 
     #[test]
     fn renders_span_children() -> Result<(), Error> {
@@ -149,7 +149,7 @@ mod test {
     #[test]
     fn test_colored_output() -> Result<(), Error> {
         let test_target = human::test_with_color();
-        let out = ::new().add_target(test_target.target())?;
+        let out = crate::new().add_target(test_target.target())?;
 
         out.print(span().add_item("hello").fg("green")?.bg("blue")?)?;
         out.flush()?;
@@ -164,7 +164,7 @@ mod test {
     #[test]
     fn test_bold_output() -> Result<(), Error> {
         let test_target = human::test_with_color();
-        let out = ::new().add_target(test_target.target())?;
+        let out = crate::new().add_target(test_target.target())?;
 
         out.print(span().add_item("hello").bold(true)?)?;
         out.flush()?;
@@ -179,7 +179,7 @@ mod test {
     #[test]
     fn test_intense_output() -> Result<(), Error> {
         let test_target = human::test_with_color();
-        let out = ::new().add_target(test_target.target())?;
+        let out = crate::new().add_target(test_target.target())?;
 
         out.print(span().add_item("hello").fg("green")?.intense(true)?)?;
         out.flush()?;
@@ -194,7 +194,7 @@ mod test {
     #[test]
     fn test_underline_output() -> Result<(), Error> {
         let test_target = human::test_with_color();
-        let out = ::new().add_target(test_target.target())?;
+        let out = crate::new().add_target(test_target.target())?;
 
         out.print(span().add_item("hello").underline(true)?)?;
         out.flush()?;

src/components/text.rs

@@ -1,4 +1,4 @@
-use {human, json, Error, Render};
+use crate::{human, json, Error, Render};
 
 /// Render some text
 pub fn text<T: AsRef<str>>(input: T) -> Text {
@@ -12,7 +12,7 @@ pub fn newline() -> Text {
     text("\n")
 }
 
-#[derive(Clone, Serialize)]
+#[derive(Clone, serde_derive::Serialize)]
 pub struct Text(String);
 
 impl Render for Text {
@@ -30,7 +30,8 @@ impl Render for Text {
 #[cfg(test)]
 mod test {
     use super::text;
-    use {human, json, Render};
+    use crate::{human, json, Render};
+    use proptest::{prop_assert, prop_assert_eq, proptest, proptest_helper};
 
     proptest! {
         #[test]
@@ -43,7 +44,7 @@ mod test {
 
             let json = json::test();
             item.render_json(&mut json.formatter()).unwrap();
-            prop_assert_eq!(json.to_string(), json!(s).to_string());
+            prop_assert_eq!(json.to_string(), serde_json::json!(s).to_string());
         }
     }
 }

src/error.rs

@@ -12,7 +12,7 @@ pub struct Error {
 }
 
 impl Fail for Error {
-    fn cause(&self) -> Option<&Fail> {
+    fn cause(&self) -> Option<&dyn Fail> {
         self.inner.cause()
     }
 
@@ -22,7 +22,7 @@ impl Fail for Error {
 }
 
 impl Display for Error {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         Display::fmt(&self.inner, f)
     }
 }

src/human.rs

@@ -1,8 +1,8 @@
 //! Human output
 
+use crate::{Error, Target};
 use std::sync::Arc;
 use termcolor::{ColorChoice, ColorSpec, StandardStream, WriteColor};
-use {Error, Target};
 
 /// Construct a new human output target that writes to stdout
 pub fn stdout() -> Result<Target, Error> {
@@ -215,8 +215,8 @@ macro_rules! render_for_humans {
 
 mod test_helper {
     use super::Formatter;
+    use crate::{test_buffer::TestBuffer, Target};
     use termcolor::Buffer;
-    use {test_buffer::TestBuffer, Target};
 
     /// Create a test output target
     ///

src/json.rs

@@ -1,11 +1,11 @@
 //! JSON output
 
+use crate::{Error, Target};
 use serde::Serialize;
 use serde_json::to_vec as write_json;
 use std::io::Write;
 use std::path::Path;
 use std::sync::Arc;
-use {Error, Target};
 
 /// Construct a new JSON output target that writes to stdout
 pub fn stdout() -> Result<Target, Error> {
@@ -216,9 +216,9 @@ macro_rules! render_json {
 
 mod test_helper {
     use super::Formatter;
+    use crate::test_buffer::TestBuffer;
+    use crate::Target;
     use termcolor::Buffer;
-    use test_buffer::TestBuffer;
-    use Target;
 
     /// Create a test output target
     ///
@@ -285,9 +285,9 @@ mod test_helper {
 
 #[cfg(test)]
 mod tests {
+    use crate::json;
     use assert_fs::prelude::*;
     use assert_fs::TempDir;
-    use json;
     use predicates::prelude::*;
 
     type Res = Result<(), ::failure::Error>;
@@ -341,7 +341,7 @@ mod tests {
         log_file.assert(predicate::path::exists());
 
         let target = json::file(log_file.path())?;
-        let output = ::new().add_target(target)?;
+        let output = crate::new().add_target(target)?;
         output.print("wtf")?;
         output.flush()?;