Migrate postgres-derive to 2018

Author: sfackler

postgres-derive/Cargo.toml

@@ -3,8 +3,9 @@ name = "postgres-derive"
 version = "0.3.3"
 authors = ["Steven Fackler <[email protected]>"]
 license = "MIT/Apache-2.0"
+edition = "2018"
 description = "Deriving plugin support for Postgres enum, domain, and composite types"
-repository = "https://github.com/sfackler/rust-postgres-derive"
+repository = "https://github.com/sfackler/rust-postgres"
 readme = "README.md"
 keywords = ["database", "postgres", "postgresql", "sql"]
 

postgres-derive/src/accepts.rs

@@ -1,9 +1,10 @@
 use proc_macro2::{Span, TokenStream};
+use quote::quote;
 use std::iter;
 use syn::Ident;
 
-use composites::Field;
-use enums::Variant;
+use crate::composites::Field;
+use crate::enums::Variant;
 
 pub fn domain_body(name: &str, field: &syn::Field) -> TokenStream {
     let ty = &field.ty;

postgres-derive/src/composites.rs

@@ -1,6 +1,6 @@
-use syn::{self, Error, Ident, Type};
+use syn::{Error, Ident, Type};
 
-use overrides::Overrides;
+use crate::overrides::Overrides;
 
 pub struct Field {
     pub name: String,

postgres-derive/src/enums.rs

@@ -1,6 +1,6 @@
-use syn::{self, Error, Fields, Ident};
+use syn::{Error, Fields, Ident};
 
-use overrides::Overrides;
+use crate::overrides::Overrides;
 
 pub struct Variant {
     pub ident: Ident,

postgres-derive/src/fromsql.rs

@@ -1,11 +1,12 @@
 use proc_macro2::{Span, TokenStream};
+use quote::quote;
 use std::iter;
-use syn::{self, Data, DataStruct, DeriveInput, Error, Fields, Ident};
+use syn::{Data, DataStruct, DeriveInput, Error, Fields, Ident};
 
-use accepts;
-use composites::Field;
-use enums::Variant;
-use overrides::Overrides;
+use crate::accepts;
+use crate::composites::Field;
+use crate::enums::Variant;
+use crate::overrides::Overrides;
 
 pub fn expand_derive_fromsql(input: DeriveInput) -> Result<TokenStream, Error> {
     let overrides = Overrides::extract(&input.attrs)?;

postgres-derive/src/lib.rs

@@ -1,10 +1,5 @@
 #![recursion_limit = "256"]
-
 extern crate proc_macro;
-extern crate syn;
-#[macro_use]
-extern crate quote;
-extern crate proc_macro2;
 
 use proc_macro::TokenStream;
 

postgres-derive/src/tosql.rs

@@ -1,11 +1,12 @@
+use proc_macro2::TokenStream;
+use quote::quote;
 use std::iter;
 use syn::{Data, DataStruct, DeriveInput, Error, Fields, Ident};
 
-use accepts;
-use composites::Field;
-use enums::Variant;
-use overrides::Overrides;
-use proc_macro2::TokenStream;
+use crate::accepts;
+use crate::composites::Field;
+use crate::enums::Variant;
+use crate::overrides::Overrides;
 
 pub fn expand_derive_tosql(input: DeriveInput) -> Result<TokenStream, Error> {
     let overrides = Overrides::extract(&input.attrs)?;