remove external private modules (#605)

Co-authored-by: Austin Abell <austinabell8@gmail.com>

near-sdk-macros/Cargo.toml

@@ -16,6 +16,6 @@ proc-macro = true
 
 [dependencies]
 proc-macro2 = "1.0"
-syn = {version = "=1.0.57", features = ["full", "fold", "extra-traits", "visit"] }
+syn = {version = "1", features = ["full", "fold", "extra-traits", "visit"] }
 quote = "1.0"
 Inflector = { version = "0.11.4", default-features = false, features = [] }

near-sdk-macros/src/core_impl/code_generator/attr_sig_info.rs

@@ -1,4 +1,4 @@
-use syn::export::TokenStream2;
+use proc_macro2::TokenStream as TokenStream2;
 
 use crate::core_impl::info_extractor::{
     ArgInfo, AttrSigInfo, BindgenArgType, InputStructType, SerializerType,

near-sdk-macros/src/core_impl/code_generator/impl_item_method_info.rs

@@ -1,8 +1,8 @@
 use crate::core_impl::info_extractor::{
     AttrSigInfo, ImplItemMethodInfo, InputStructType, MethodType, SerializerType,
 };
+use proc_macro2::TokenStream as TokenStream2;
 use quote::quote;
-use syn::export::TokenStream2;
 use syn::{ReturnType, Signature};
 
 impl ImplItemMethodInfo {

near-sdk-macros/src/core_impl/code_generator/item_impl_info.rs

@@ -1,5 +1,5 @@
 use crate::ItemImplInfo;
-use syn::export::TokenStream2;
+use proc_macro2::TokenStream as TokenStream2;
 use syn::Ident;
 
 impl ItemImplInfo {

near-sdk-macros/src/core_impl/code_generator/item_trait_info.rs

@@ -1,6 +1,6 @@
 use crate::core_impl::info_extractor::ItemTraitInfo;
+use proc_macro2::TokenStream as TokenStream2;
 use quote::quote;
-use syn::export::TokenStream2;
 
 impl ItemTraitInfo {
     /// Generate code that wrapps external calls.

near-sdk-macros/src/core_impl/code_generator/trait_item_method_info.rs

@@ -2,8 +2,8 @@ use crate::core_impl::{
     info_extractor::{InputStructType, SerializerType, TraitItemMethodInfo},
     AttrSigInfo,
 };
+use proc_macro2::TokenStream as TokenStream2;
 use quote::quote;
-use syn::export::TokenStream2;
 
 impl TraitItemMethodInfo {
     /// Generate code that wraps the method.

near-sdk-macros/src/core_impl/info_extractor/arg_info.rs

@@ -1,7 +1,7 @@
 use crate::core_impl::info_extractor::serializer_attr::SerializerAttr;
 use crate::core_impl::info_extractor::SerializerType;
+use proc_macro2::Span;
 use quote::ToTokens;
-use syn::export::Span;
 use syn::{Attribute, Error, Ident, Pat, PatType, Token, Type};
 
 pub enum BindgenArgType {

near-sdk-macros/src/core_impl/info_extractor/attr_sig_info.rs

@@ -1,6 +1,6 @@
 use super::{ArgInfo, BindgenArgType, InitAttr, MethodType, SerializerAttr, SerializerType};
+use proc_macro2::Span;
 use quote::ToTokens;
-use syn::export::Span;
 use syn::spanned::Spanned;
 use syn::{Attribute, Error, FnArg, Ident, Receiver, ReturnType, Signature};
 

near-sdk-macros/src/core_impl/info_extractor/item_trait_info.rs

@@ -1,6 +1,6 @@
 use super::TraitItemMethodInfo;
 use inflector::Inflector;
-use syn::export::Span;
+use proc_macro2::Span;
 use syn::spanned::Spanned;
 use syn::{Error, Ident, ItemTrait, TraitItem};
 

near-sdk-macros/src/core_impl/info_extractor/trait_item_method_info.rs

@@ -1,5 +1,5 @@
 use super::AttrSigInfo;
-use syn::export::Span;
+use proc_macro2::Span;
 use syn::spanned::Spanned;
 use syn::{Error, LitStr, TraitItemMethod};
 

near-sdk-macros/src/core_impl/metadata/metadata_generator.rs

@@ -1,7 +1,7 @@
 use crate::{BindgenArgType, ImplItemMethodInfo, InputStructType, MethodType, SerializerType};
 
+use proc_macro2::TokenStream as TokenStream2;
 use quote::quote;
-use syn::export::TokenStream2;
 use syn::ReturnType;
 
 impl ImplItemMethodInfo {

near-sdk-macros/src/core_impl/metadata/metadata_visitor.rs

@@ -4,8 +4,8 @@
 //! For this we implement the visitor.
 use crate::ItemImplInfo;
 
-use quote::quote;
-use syn::export::{ToTokens, TokenStream2};
+use proc_macro2::TokenStream as TokenStream2;
+use quote::{quote, ToTokens};
 use syn::visit::Visit;
 use syn::{Error, ItemImpl};
 

near-sdk-sim/src/outcome.rs

@@ -7,12 +7,12 @@ use near_primitives::transaction::ExecutionStatus::{SuccessReceiptId, SuccessVal
 use near_primitives::types::AccountId;
 use near_sdk::borsh::BorshDeserialize;
 use near_sdk::serde::de::DeserializeOwned;
-use near_sdk::serde::export::Formatter;
 use near_sdk::serde_json::Value;
 use near_sdk::Gas;
 use std::borrow::Borrow;
 use std::cell::RefCell;
 use std::fmt::Debug;
+use std::fmt::Formatter;
 use std::rc::Rc;
 
 pub type TxResult = Result<ExecutionOutcome, ExecutionOutcome>;

near-sdk/src/collections/legacy_tree_map.rs

@@ -684,9 +684,9 @@ mod tests {
     extern crate rand;
     use self::rand::RngCore;
     use quickcheck::QuickCheck;
-    use serde::export::Formatter;
     use std::collections::BTreeMap;
     use std::collections::HashSet;
+    use std::fmt::Formatter;
     use std::fmt::{Debug, Result};
 
     /// Return height of the tree - number of nodes on the longest path starting from the root node.

near-sdk/src/collections/tree_map.rs

@@ -731,9 +731,9 @@ mod tests {
     extern crate rand;
     use self::rand::RngCore;
     use quickcheck::QuickCheck;
-    use serde::export::Formatter;
     use std::collections::BTreeMap;
     use std::collections::HashSet;
+    use std::fmt::Formatter;
     use std::fmt::{Debug, Result};
 
     /// Return height of the tree - number of nodes on the longest path starting from the root node.