diff --git a/serde_derive/src/bound.rs b/serde_derive/src/bound.rs index a38e7c2b..ef64d61f 100644 --- a/serde_derive/src/bound.rs +++ b/serde_derive/src/bound.rs @@ -1,10 +1,9 @@ use std::collections::HashSet; -use syn; use syn::punctuated::{Pair, Punctuated}; -use internals::ast::{Container, Data}; -use internals::{attr, ungroup}; +use crate::internals::ast::{Container, Data}; +use crate::internals::{attr, ungroup}; use proc_macro2::Span; diff --git a/serde_derive/src/de.rs b/serde_derive/src/de.rs index f3226f1c..b8af1339 100644 --- a/serde_derive/src/de.rs +++ b/serde_derive/src/de.rs @@ -6,13 +6,10 @@ use syn::punctuated::Punctuated; use syn::spanned::Spanned; use syn::{self, Ident, Index, Member}; -use bound; -use dummy; -use fragment::{Expr, Fragment, Match, Stmts}; -use internals::ast::{Container, Data, Field, Style, Variant}; -use internals::{attr, replace_receiver, ungroup, Ctxt, Derive}; -use pretend; -use this; +use crate::fragment::{Expr, Fragment, Match, Stmts}; +use crate::internals::ast::{Container, Data, Field, Style, Variant}; +use crate::internals::{attr, replace_receiver, ungroup, Ctxt, Derive}; +use crate::{bound, dummy, pretend, this}; use std::collections::BTreeSet; use std::ptr; diff --git a/serde_derive/src/dummy.rs b/serde_derive/src/dummy.rs index 57e8eabf..a30fb5eb 100644 --- a/serde_derive/src/dummy.rs +++ b/serde_derive/src/dummy.rs @@ -1,7 +1,6 @@ use proc_macro2::TokenStream; -use syn; -use try; +use crate::try; pub fn wrap_in_const(serde_path: Option<&syn::Path>, code: TokenStream) -> TokenStream { let try_replacement = try::replacement(); diff --git a/serde_derive/src/internals/ast.rs b/serde_derive/src/internals/ast.rs index 8bcb0ecd..b9f14bc5 100644 --- a/serde_derive/src/internals/ast.rs +++ b/serde_derive/src/internals/ast.rs @@ -1,9 +1,6 @@ //! A Serde ast, parsed from the Syn ast and ready to generate Rust code. -use internals::attr; -use internals::check; -use internals::{Ctxt, Derive}; -use syn; +use crate::internals::{attr, check, Ctxt, Derive}; use syn::punctuated::Punctuated; /// A source data structure annotated with `#[derive(Serialize)]` and/or `#[derive(Deserialize)]`, diff --git a/serde_derive/src/internals/attr.rs b/serde_derive/src/internals/attr.rs index 42212a64..7adba5fb 100644 --- a/serde_derive/src/internals/attr.rs +++ b/serde_derive/src/internals/attr.rs @@ -1,11 +1,10 @@ -use internals::symbol::*; -use internals::{ungroup, Ctxt}; +use crate::internals::symbol::*; +use crate::internals::{ungroup, Ctxt}; use proc_macro2::{Spacing, Span, TokenStream, TokenTree}; use quote::ToTokens; use std::borrow::Cow; use std::collections::BTreeSet; use std::iter::FromIterator; -use syn; use syn::meta::ParseNestedMeta; use syn::parse::ParseStream; use syn::punctuated::Punctuated; @@ -19,7 +18,7 @@ use syn::{token, Ident, Lifetime}; // user will see errors simultaneously for all bad attributes in the crate // rather than just the first. -pub use internals::case::RenameRule; +pub use crate::internals::case::RenameRule; struct Attr<'c, T> { cx: &'c Ctxt, diff --git a/serde_derive/src/internals/check.rs b/serde_derive/src/internals/check.rs index 4a7f52c6..7cda57e9 100644 --- a/serde_derive/src/internals/check.rs +++ b/serde_derive/src/internals/check.rs @@ -1,6 +1,6 @@ -use internals::ast::{Container, Data, Field, Style}; -use internals::attr::{Identifier, TagType}; -use internals::{ungroup, Ctxt, Derive}; +use crate::internals::ast::{Container, Data, Field, Style}; +use crate::internals::attr::{Identifier, TagType}; +use crate::internals::{ungroup, Ctxt, Derive}; use syn::{Member, Type}; // Cross-cutting checks that require looking at more than a single attrs object. diff --git a/serde_derive/src/internals/ctxt.rs b/serde_derive/src/internals/ctxt.rs index 707bed90..a47bfa41 100644 --- a/serde_derive/src/internals/ctxt.rs +++ b/serde_derive/src/internals/ctxt.rs @@ -2,7 +2,6 @@ use quote::ToTokens; use std::cell::RefCell; use std::fmt::Display; use std::thread; -use syn; /// A type to collect errors together and format them. /// diff --git a/serde_derive/src/internals/receiver.rs b/serde_derive/src/internals/receiver.rs index 5dc01db2..7fb8b388 100644 --- a/serde_derive/src/internals/receiver.rs +++ b/serde_derive/src/internals/receiver.rs @@ -1,4 +1,4 @@ -use internals::respan::respan; +use crate::internals::respan::respan; use proc_macro2::Span; use quote::ToTokens; use std::mem; diff --git a/serde_derive/src/pretend.rs b/serde_derive/src/pretend.rs index 7decbaa5..694ad096 100644 --- a/serde_derive/src/pretend.rs +++ b/serde_derive/src/pretend.rs @@ -1,7 +1,7 @@ use proc_macro2::TokenStream; use quote::format_ident; -use internals::ast::{Container, Data, Field, Style, Variant}; +use crate::internals::ast::{Container, Data, Field, Style, Variant}; // Suppress dead_code warnings that would otherwise appear when using a remote // derive. Other than this pretend code, a struct annotated with remote derive diff --git a/serde_derive/src/ser.rs b/serde_derive/src/ser.rs index b9a9dce2..4096f0e6 100644 --- a/serde_derive/src/ser.rs +++ b/serde_derive/src/ser.rs @@ -2,13 +2,10 @@ use proc_macro2::{Span, TokenStream}; use syn::spanned::Spanned; use syn::{self, Ident, Index, Member}; -use bound; -use dummy; -use fragment::{Fragment, Match, Stmts}; -use internals::ast::{Container, Data, Field, Style, Variant}; -use internals::{attr, replace_receiver, Ctxt, Derive}; -use pretend; -use this; +use crate::fragment::{Fragment, Match, Stmts}; +use crate::internals::ast::{Container, Data, Field, Style, Variant}; +use crate::internals::{attr, replace_receiver, Ctxt, Derive}; +use crate::{bound, dummy, pretend, this}; pub fn expand_derive_serialize(input: &mut syn::DeriveInput) -> syn::Result { replace_receiver(input); diff --git a/serde_derive/src/this.rs b/serde_derive/src/this.rs index 32731d08..941cea40 100644 --- a/serde_derive/src/this.rs +++ b/serde_derive/src/this.rs @@ -1,4 +1,4 @@ -use internals::ast::Container; +use crate::internals::ast::Container; use syn::{Path, PathArguments, Token}; pub fn this_type(cont: &Container) -> Path {