Touch up PR 689 imports
diff --git a/syntax/check.rs b/syntax/check.rs
index d2c260d..0009eb1 100644
--- a/syntax/check.rs
+++ b/syntax/check.rs
@@ -1,15 +1,13 @@
use crate::syntax::atom::Atom::{self, *};
use crate::syntax::report::Errors;
use crate::syntax::{
- error, ident, trivial, Api, Array, Enum, ExternFn, ExternType, Impl, Lang, NamedType, Receiver,
- Ref, Signature, SliceRef, Struct, Trait, Ty1, Type, TypeAlias, Types,
+ error, ident, trivial, Api, Array, Enum, ExternFn, ExternType, Impl, Lang, NamedType, Ptr,
+ Receiver, Ref, Signature, SliceRef, Struct, Trait, Ty1, Type, TypeAlias, Types,
};
use proc_macro2::{Delimiter, Group, Ident, TokenStream};
use quote::{quote, ToTokens};
use std::fmt::Display;
-use super::Ptr;
-
pub(crate) struct Check<'a> {
apis: &'a [Api],
types: &'a Types<'a>,
diff --git a/syntax/impls.rs b/syntax/impls.rs
index 0cb20ff..8b0743b 100644
--- a/syntax/impls.rs
+++ b/syntax/impls.rs
@@ -1,12 +1,10 @@
use crate::syntax::{
- Array, ExternFn, Include, Lifetimes, Receiver, Ref, Signature, SliceRef, Ty1, Type, Var,
+ Array, ExternFn, Include, Lifetimes, Ptr, Receiver, Ref, Signature, SliceRef, Ty1, Type, Var,
};
use std::hash::{Hash, Hasher};
use std::mem;
use std::ops::{Deref, DerefMut};
-use super::Ptr;
-
impl PartialEq for Include {
fn eq(&self, other: &Self) -> bool {
let Include {
diff --git a/syntax/parse.rs b/syntax/parse.rs
index 2605218..0050de9 100644
--- a/syntax/parse.rs
+++ b/syntax/parse.rs
@@ -5,27 +5,22 @@
use crate::syntax::Atom::*;
use crate::syntax::{
attrs, error, Api, Array, Derive, Doc, Enum, ExternFn, ExternType, ForeignName, Impl, Include,
- IncludeKind, Lang, Lifetimes, NamedType, Namespace, Pair, Receiver, Ref, Signature, SliceRef,
- Struct, Ty1, Type, TypeAlias, Var, Variant,
+ IncludeKind, Lang, Lifetimes, NamedType, Namespace, Pair, Ptr, Receiver, Ref, Signature,
+ SliceRef, Struct, Ty1, Type, TypeAlias, Var, Variant,
};
use proc_macro2::{Delimiter, Group, Span, TokenStream, TokenTree};
use quote::{format_ident, quote, quote_spanned};
use std::mem;
+use syn::parse::{ParseStream, Parser};
use syn::punctuated::Punctuated;
use syn::{
- parse::{ParseStream, Parser},
- TypePtr,
-};
-use syn::{
Abi, Attribute, Error, Expr, Fields, FnArg, ForeignItem, ForeignItemFn, ForeignItemType,
GenericArgument, GenericParam, Generics, Ident, ItemEnum, ItemImpl, ItemStruct, Lit, LitStr,
Pat, PathArguments, Result, ReturnType, Signature as RustSignature, Token, TraitBound,
- TraitBoundModifier, Type as RustType, TypeArray, TypeBareFn, TypeParamBound, TypePath,
+ TraitBoundModifier, Type as RustType, TypeArray, TypeBareFn, TypeParamBound, TypePath, TypePtr,
TypeReference, Variant as RustVariant, Visibility,
};
-use super::Ptr;
-
pub mod kw {
syn::custom_keyword!(Pin);
syn::custom_keyword!(Result);
diff --git a/syntax/tokens.rs b/syntax/tokens.rs
index d728ac0..13b5cd3 100644
--- a/syntax/tokens.rs
+++ b/syntax/tokens.rs
@@ -1,14 +1,12 @@
use crate::syntax::atom::Atom::*;
use crate::syntax::{
- Array, Atom, Derive, Enum, ExternFn, ExternType, Impl, Lifetimes, NamedType, Receiver, Ref,
- Signature, SliceRef, Struct, Ty1, Type, TypeAlias, Var,
+ Array, Atom, Derive, Enum, ExternFn, ExternType, Impl, Lifetimes, NamedType, Ptr, Receiver,
+ Ref, Signature, SliceRef, Struct, Ty1, Type, TypeAlias, Var,
};
use proc_macro2::{Ident, Span, TokenStream};
use quote::{quote_spanned, ToTokens};
use syn::{token, Token};
-use super::Ptr;
-
impl ToTokens for Type {
fn to_tokens(&self, tokens: &mut TokenStream) {
match self {