Rename ResolvableName -> RustName
diff --git a/syntax/mod.rs b/syntax/mod.rs
index da1dbf8..3b5b4d7 100644
--- a/syntax/mod.rs
+++ b/syntax/mod.rs
@@ -150,7 +150,7 @@
pub lifetime: Option<Lifetime>,
pub mutable: bool,
pub var: Token![self],
- pub ty: ResolvableName,
+ pub ty: RustName,
pub shorthand: bool,
pub pin_tokens: Option<(kw::Pin, Token![<], Token![>])>,
pub mutability: Option<Token![mut]>,
@@ -163,7 +163,7 @@
}
pub enum Type {
- Ident(ResolvableName),
+ Ident(RustName),
RustBox(Box<Ty1>),
RustVec(Box<Ty1>),
UniquePtr(Box<Ty1>),
@@ -230,6 +230,6 @@
// C++.
#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
#[repr(transparent)]
-pub struct ResolvableName {
+pub struct RustName {
pub rust: Ident,
}
diff --git a/syntax/names.rs b/syntax/names.rs
index b4d8ef1..2cc91f9 100644
--- a/syntax/names.rs
+++ b/syntax/names.rs
@@ -1,4 +1,4 @@
-use crate::syntax::{Namespace, Pair, ResolvableName, Symbol, Types};
+use crate::syntax::{Namespace, Pair, RustName, Symbol, Types};
use proc_macro2::{Ident, Span};
use std::iter;
use syn::Token;
@@ -48,7 +48,7 @@
}
}
-impl ResolvableName {
+impl RustName {
pub fn new(ident: Ident) -> Self {
Self { rust: ident }
}
diff --git a/syntax/parse.rs b/syntax/parse.rs
index e4f0512..c571132 100644
--- a/syntax/parse.rs
+++ b/syntax/parse.rs
@@ -4,7 +4,7 @@
use crate::syntax::Atom::*;
use crate::syntax::{
attrs, error, Api, Array, Derive, Doc, Enum, ExternFn, ExternType, Impl, Include, IncludeKind,
- Lang, Namespace, Pair, Receiver, Ref, ResolvableName, Signature, SliceRef, Struct, Ty1, Type,
+ Lang, Namespace, Pair, Receiver, Ref, RustName, Signature, SliceRef, Struct, Ty1, Type,
TypeAlias, Var, Variant,
};
use proc_macro2::{Delimiter, Group, Span, TokenStream, TokenTree};
@@ -186,7 +186,7 @@
}
let ident = Ident::new(repr.as_ref(), Span::call_site());
- let repr_type = Type::Ident(ResolvableName::new(ident));
+ let repr_type = Type::Ident(RustName::new(ident));
Ok(Api::Enum(Enum {
doc,
@@ -289,7 +289,7 @@
if let Api::CxxFunction(efn) | Api::RustFunction(efn) = item {
if let Some(receiver) = &mut efn.receiver {
if receiver.ty.is_self() {
- receiver.ty = ResolvableName::new(single_type.rust.clone());
+ receiver.ty = RustName::new(single_type.rust.clone());
}
}
}
@@ -432,7 +432,7 @@
lifetime: lifetime.clone(),
mutable: arg.mutability.is_some(),
var: arg.self_token,
- ty: ResolvableName::make_self(arg.self_token.span),
+ ty: RustName::make_self(arg.self_token.span),
shorthand: true,
pin_tokens: None,
mutability: arg.mutability,
@@ -810,7 +810,7 @@
let segment = &path.segments[0];
let ident = segment.ident.clone();
match &segment.arguments {
- PathArguments::None => return Ok(Type::Ident(ResolvableName::new(ident))),
+ PathArguments::None => return Ok(Type::Ident(RustName::new(ident))),
PathArguments::AngleBracketed(generic) => {
if ident == "UniquePtr" && generic.args.len() == 1 {
if let GenericArgument::Type(arg) = &generic.args[0] {
diff --git a/syntax/tokens.rs b/syntax/tokens.rs
index 07738d8..ae2d1d9 100644
--- a/syntax/tokens.rs
+++ b/syntax/tokens.rs
@@ -1,7 +1,7 @@
use crate::syntax::atom::Atom::*;
use crate::syntax::{
- Array, Atom, Derive, Enum, ExternFn, ExternType, Impl, Receiver, Ref, ResolvableName,
- Signature, SliceRef, Struct, Ty1, Type, TypeAlias, Var,
+ Array, Atom, Derive, Enum, ExternFn, ExternType, Impl, Receiver, Ref, RustName, Signature,
+ SliceRef, Struct, Ty1, Type, TypeAlias, Var,
};
use proc_macro2::{Ident, Span, TokenStream};
use quote::{quote_spanned, ToTokens};
@@ -182,7 +182,7 @@
}
}
-impl ToTokens for ResolvableName {
+impl ToTokens for RustName {
fn to_tokens(&self, tokens: &mut TokenStream) {
self.rust.to_tokens(tokens);
}
diff --git a/syntax/types.rs b/syntax/types.rs
index 9fe3562..72216b3 100644
--- a/syntax/types.rs
+++ b/syntax/types.rs
@@ -3,8 +3,8 @@
use crate::syntax::report::Errors;
use crate::syntax::set::{OrderedSet as Set, UnorderedSet};
use crate::syntax::{
- derive, toposort, Api, Enum, ExternFn, ExternType, Impl, Pair, ResolvableName, Struct, Trait,
- Type, TypeAlias,
+ derive, toposort, Api, Enum, ExternFn, ExternType, Impl, Pair, RustName, Struct, Trait, Type,
+ TypeAlias,
};
use proc_macro2::Ident;
use quote::ToTokens;
@@ -20,7 +20,7 @@
pub untrusted: Map<&'a Ident, &'a ExternType>,
pub required_trivial: Map<&'a Ident, TrivialReason<'a>>,
pub explicit_impls: Set<&'a Impl>,
- pub resolutions: Map<&'a ResolvableName, &'a Pair>,
+ pub resolutions: Map<&'a RustName, &'a Pair>,
pub struct_improper_ctypes: UnorderedSet<&'a Ident>,
pub toposorted_structs: Vec<&'a Struct>,
}
@@ -63,7 +63,7 @@
}
let mut add_resolution = |pair: &'a Pair| {
- resolutions.insert(ResolvableName::from_ref(&pair.rust), pair);
+ resolutions.insert(RustName::from_ref(&pair.rust), pair);
};
let mut type_names = UnorderedSet::new();
@@ -290,7 +290,7 @@
}
}
- pub fn resolve(&self, ident: &ResolvableName) -> &Pair {
+ pub fn resolve(&self, ident: &RustName) -> &Pair {
self.resolutions.get(ident).expect("Unable to resolve type")
}
}