Merge pull request #3 from dgriffen/edition-update

update the code to 2018 edition

dotenv/Cargo.toml

@@ -8,6 +8,7 @@ readme = "README.md"
 keywords = ["environment", "env", "dotenv", "settings", "config"]
 license = "MIT"
 repository = "https://github.com/dotenv-rs/dotenv"
+edition = "2018"
 
 [[bin]]
 name = "dotenv"

dotenv/examples/simple.rs

@@ -1,5 +1,3 @@
-extern crate dotenv;
-
 use dotenv::dotenv;
 use std::env;
 

dotenv/src/errors.rs

@@ -1,4 +1,5 @@
 use std::io;
+use failure::Fail;
 
 #[derive(Debug, Fail)]
 pub enum Error {

dotenv/src/find.rs

@@ -2,8 +2,8 @@ use std::fs::File;
 use std::path::{Path, PathBuf};
 use std::{env, fs, io};
 
-use errors::*;
-use iter::Iter;
+use crate::errors::*;
+use crate::iter::Iter;
 
 pub struct Finder<'a> {
   filename:  &'a Path,

dotenv/src/iter.rs

@@ -2,8 +2,8 @@ use std::io::prelude::*;
 use std::io::{BufReader, Lines};
 use std::env;
 
-use errors::*;
-use parse;
+use crate::errors::*;
+use crate::parse;
 
 pub struct Iter<R> {
     lines: Lines<BufReader<R>>,

dotenv/src/lib.rs

@@ -5,12 +5,6 @@
 //! file, if available, and mashes those with the actual environment variables
 //! provided by the operating system.
 
-#[macro_use]
-extern crate failure;
-#[macro_use]
-extern crate lazy_static;
-extern crate regex;
-
 mod parse;
 mod errors;
 mod iter;
@@ -22,9 +16,9 @@ use std::fs::File;
 use std::path::{Path, PathBuf};
 use std::sync::{Once, ONCE_INIT};
 
-pub use errors::*;
-use iter::Iter;
-use find::Finder;
+pub use crate::errors::*;
+use crate::iter::Iter;
+use crate::find::Finder;
 
 static START: Once = ONCE_INIT;
 

dotenv/src/parse.rs

@@ -1,5 +1,6 @@
 use regex::{Captures, Regex};
-use errors::*;
+use crate::errors::*;
+use lazy_static::lazy_static;
 
 // for readability's sake
 pub type ParsedLine = Result<Option<(String, String)>>;
@@ -31,7 +32,7 @@ pub fn parse_line(line: &str) -> ParsedLine {
 
             match (key, value) {
                 (Some(k), Some(v)) => {
-                    let parsed_value = try!(parse_value(&v));
+                    let parsed_value = parse_value(&v)?;
 
                     Ok(Some((k, parsed_value)))
                 }
@@ -48,7 +49,7 @@ pub fn parse_line(line: &str) -> ParsedLine {
         })
 }
 
-fn named_string(captures: &Captures, name: &str) -> Option<String> {
+fn named_string(captures: &Captures<'_>, name: &str) -> Option<String> {
     captures
         .name(name)
         .and_then(|v| Some(v.as_str().to_owned()))
@@ -140,7 +141,7 @@ fn parse_value(input: &str) -> Result<String> {
 mod test {
     use super::*;
 
-    use iter::Iter;
+    use crate::iter::Iter;
 
     #[test]
     fn test_parse_line_env() {

dotenv/tests/test-child-dir.rs

@@ -1,12 +1,9 @@
-extern crate dotenv;
-extern crate tempfile;
-
 mod common;
 
 use std::{env, fs};
 use dotenv::*;
 
-use common::*;
+use crate::common::*;
 
 #[test]
 fn test_child_dir() {

dotenv/tests/test-default-location.rs

@@ -1,12 +1,9 @@
-extern crate dotenv;
-extern crate tempfile;
-
 mod common;
 
 use std::env;
 use dotenv::*;
 
-use common::*;
+use crate::common::*;
 
 #[test]
 fn test_default_location() {

dotenv/tests/test-dotenv-iter.rs

@@ -1,12 +1,9 @@
-extern crate dotenv;
-extern crate tempfile;
-
 mod common;
 
 use std::env;
 use dotenv::*;
 
-use common::*;
+use crate::common::*;
 
 #[test]
 fn test_dotenv_iter() {

dotenv/tests/test-from-filename-iter.rs

@@ -1,12 +1,9 @@
-extern crate dotenv;
-extern crate tempfile;
-
 mod common;
 
 use std::env;
 use dotenv::*;
 
-use common::*;
+use crate::common::*;
 
 #[test]
 fn test_from_filename_iter() {

dotenv/tests/test-from-filename.rs

@@ -1,12 +1,9 @@
-extern crate dotenv;
-extern crate tempfile;
-
 mod common;
 
 use std::env;
 use dotenv::*;
 
-use common::*;
+use crate::common::*;
 
 #[test]
 fn test_from_filename() {

dotenv/tests/test-from-path-iter.rs

@@ -1,12 +1,9 @@
-extern crate dotenv;
-extern crate tempfile;
-
 mod common;
 
 use std::env;
 use dotenv::*;
 
-use common::*;
+use crate::common::*;
 
 #[test]
 fn test_from_path_iter() {

dotenv/tests/test-from-path.rs

@@ -1,12 +1,9 @@
-extern crate dotenv;
-extern crate tempfile;
-
 mod common;
 
 use std::env;
 use dotenv::*;
 
-use common::*;
+use crate::common::*;
 
 #[test]
 fn test_from_path() {

dotenv/tests/test-var.rs

@@ -1,13 +1,10 @@
-extern crate dotenv;
-extern crate tempfile;
-
 mod common;
 
 use std::env;
 
 use dotenv::*;
 
-use common::*;
+use crate::common::*;
 
 #[test]
 fn test_var() {

dotenv/tests/test-vars.rs

@@ -1,14 +1,11 @@
-extern crate dotenv;
-extern crate tempfile;
-
 mod common;
 
 use std::collections::HashMap;
 use std::env;
 
 use dotenv::*;
 
-use common::*;
+use crate::common::*;
 
 #[test]
 fn test_vars() {

dotenv_codegen/Cargo.toml

@@ -15,6 +15,7 @@ license = "MIT"
 homepage = "https://github.com/dotenv-rs/dotenv"
 repository = "https://github.com/dotenv-rs/dotenv"
 description = "A `dotenv` implementation for Rust"
+edition = "2018"
 
 [dependencies]
 dotenv_codegen_implementation = { version = "0.14", path = "../dotenv_codegen_implementation" }

dotenv_codegen/src/lib.rs

@@ -1,7 +1,4 @@
-#[macro_use]
-extern crate proc_macro_hack;
-
-extern crate dotenv_codegen_implementation;
+use proc_macro_hack::proc_macro_hack;
 
 #[proc_macro_hack]
 pub use dotenv_codegen_implementation::dotenv;

dotenv_codegen_implementation/Cargo.toml

@@ -18,7 +18,7 @@ license = "MIT"
 homepage = "https://github.com/dotenv-rs/dotenv"
 repository = "https://github.com/dotenv-rs/dotenv"
 description = "A `dotenv` implementation for Rust"
-
+edition = "2018"
 
 [dependencies]
 proc-macro2 = "0.4"

dotenv_codegen_implementation/src/lib.rs

@@ -1,20 +1,13 @@
-#[macro_use]
-extern crate proc_macro_hack;
-#[macro_use]
-extern crate quote;
-
-extern crate dotenv;
 extern crate proc_macro;
-extern crate proc_macro2;
-
-#[macro_use]
-extern crate syn;
 
 use std::env;
 
 use syn::punctuated::Punctuated;
 use syn::parse::Parser;
+use syn::Token;
 use proc_macro::TokenStream;
+use proc_macro_hack::proc_macro_hack;
+use quote::quote;
 
 #[proc_macro_hack]
 pub fn dotenv(input: TokenStream) -> TokenStream {