topjohnwu/cxx
1
0
Fork 0
mirror of https://github.com/topjohnwu/cxx.git synced 2024-11-27 13:50:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use PartialEq<Atom> for some ident comparisons

Browse Source
This commit is contained in:
David Tolnay 2020-03-06 10:24:34 -08:00
parent 438e26034c
commit a52602b8af
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
macro/src/expand.rs
View File

@ -1,5 +1,5 @@
use crate::namespace::Namespace;
use crate::syntax::atom::Atom;
use crate::syntax::atom::Atom::{self, *};
use crate::syntax::{self, check, Api, ExternFn, ExternType, Struct, Type, Types};
use proc_macro2::{Ident, Span, TokenStream};
use quote::{format_ident, quote, quote_spanned};
@ -156,13 +156,13 @@ fn expand_cxx_function_shim(namespace: &Namespace, efn: &ExternFn, types: &Types
let vars = efn.args.iter().map(|arg| {
let var = &arg.ident;
match &arg.ty {
Type::Ident(ident) if ident == "String" => {
Type::Ident(ident) if ident == RustString => {
quote!(#var.as_mut_ptr() as *mut ::cxx::private::RustString)
}
Type::RustBox(_) => quote!(::std::boxed::Box::into_raw(#var)),
Type::UniquePtr(_) => quote!(::cxx::UniquePtr::into_raw(#var)),
Type::Ref(ty) => match &ty.inner {
Type::Ident(ident) if ident == "String" => {
Type::Ident(ident) if ident == RustString => {
quote!(::cxx::private::RustString::from_ref(#var))
}
_ => quote!(#var),
@ -204,11 +204,11 @@ fn expand_cxx_function_shim(namespace: &Namespace, efn: &ExternFn, types: &Types
.ret
.as_ref()
.and_then(|ret| match ret {
Type::Ident(ident) if ident == "String" => Some(quote!(#call.into_string())),
Type::Ident(ident) if ident == RustString => Some(quote!(#call.into_string())),
Type::RustBox(_) => Some(quote!(::std::boxed::Box::from_raw(#call))),
Type::UniquePtr(_) => Some(quote!(::cxx::UniquePtr::from_raw(#call))),
Type::Ref(ty) => match &ty.inner {
Type::Ident(ident) if ident == "String" => Some(quote!(#call.as_string())),
Type::Ident(ident) if ident == RustString => Some(quote!(#call.as_string())),
_ => None,
},
Type::Str(_) => Some(quote!(#call.as_str())),
@ -250,11 +250,11 @@ fn expand_rust_function_shim(namespace: &Namespace, efn: &ExternFn, types: &Type
let vars = efn.args.iter().map(|arg| {
let ident = &arg.ident;
match &arg.ty {
Type::Ident(i) if i == "String" => quote!(::std::mem::take((*#ident).as_mut_string())),
Type::Ident(i) if i == RustString => quote!(::std::mem::take((*#ident).as_mut_string())),
Type::RustBox(_) => quote!(::std::boxed::Box::from_raw(#ident)),
Type::UniquePtr(_) => quote!(::cxx::UniquePtr::from_raw(#ident)),
Type::Ref(ty) => match &ty.inner {
Type::Ident(i) if i == "String" => quote!(#ident.as_string()),
Type::Ident(i) if i == RustString => quote!(#ident.as_string()),
_ => quote!(#ident),
},
Type::Str(_) => quote!(#ident.as_str()),
@ -270,13 +270,13 @@ fn expand_rust_function_shim(namespace: &Namespace, efn: &ExternFn, types: &Type
.ret
.as_ref()
.and_then(|ret| match ret {
Type::Ident(ident) if ident == "String" => {
Type::Ident(ident) if ident == RustString => {
Some(quote!(::cxx::private::RustString::from(#call)))
}
Type::RustBox(_) => Some(quote!(::std::boxed::Box::into_raw(#call))),
Type::UniquePtr(_) => Some(quote!(::cxx::UniquePtr::into_raw(#call))),
Type::Ref(ty) => match &ty.inner {
Type::Ident(ident) if ident == "String" => {
Type::Ident(ident) if ident == RustString => {
Some(quote!(::cxx::private::RustString::from_ref(#call)))
}
_ => None,
@ -438,13 +438,13 @@ fn indirect_return(ret: &Option<Type>, types: &Types) -> bool {
fn expand_extern_type(ty: &Type) -> TokenStream {
match ty {
Type::Ident(ident) if ident == "String" => quote!(::cxx::private::RustString),
Type::Ident(ident) if ident == RustString => quote!(::cxx::private::RustString),
Type::RustBox(ty) | Type::UniquePtr(ty) => {
let inner = &ty.inner;
quote!(*mut #inner)
}
Type::Ref(ty) => match &ty.inner {
Type::Ident(ident) if ident == "String" => quote!(&::cxx::private::RustString),
Type::Ident(ident) if ident == RustString => quote!(&::cxx::private::RustString),
_ => quote!(#ty),
},
Type::Str(_) => quote!(::cxx::private::RustStr),

2
syntax/check.rs
View File

@ -96,7 +96,7 @@ fn is_unsized(ty: &Type, types: &Types) -> bool {
Type::Ident(ident) => ident,
_ => return false,
};
ident == "CxxString" || types.cxx.contains(ident) || types.rust.contains(ident)
ident == CxxString || types.cxx.contains(ident) || types.rust.contains(ident)
}
fn check_mut_return_restriction(efn: &ExternFn) -> Result<()> {

3
syntax/tokens.rs
View File

@ -1,3 +1,4 @@
use crate::syntax::atom::Atom::*;
use crate::syntax::{Derive, ExternFn, Ref, Ty1, Type, Var};
use proc_macro2::{Ident, Span, TokenStream};
use quote::{quote_spanned, ToTokens};
@ -7,7 +8,7 @@ impl ToTokens for Type {
fn to_tokens(&self, tokens: &mut TokenStream) {
match self {
Type::Ident(ident) => {
if ident == "CxxString" {
if ident == CxxString {
let span = ident.span();
tokens.extend(quote_spanned!(span=> ::cxx::));
}