topjohnwu/cxx
1
0
Fork 0
mirror of https://github.com/topjohnwu/cxx.git synced 2025-02-25 02:20:49 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Collect reason that each alias is required trivial

Browse Source
This commit is contained in:
David Tolnay 2020-10-03 19:43:18 -07:00
parent 11fd6d0f1b
commit b5aca7b8a7
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
4 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gen/src/write.rs
View File

@ -81,7 +81,7 @@ pub(super) fn gen(
}
}
Api::TypeAlias(ety) => {
if types.required_trivial_aliases.contains(&ety.ident) {
if types.required_trivial_aliases.contains_key(&ety.ident) {
check_trivial_extern_type(out, &ety.ident)
}
}
@ -136,7 +136,7 @@ fn write_includes(out: &mut OutFile, types: &Types) {
Some(CxxString) => out.include.string = true,
Some(Bool) | Some(Isize) | Some(F32) | Some(F64) | Some(RustString) => {}
None => {
if types.required_trivial_aliases.contains(&ident) {
if types.required_trivial_aliases.contains_key(&ident) {
out.include.type_traits = true;
}
}

2
macro/src/expand.rs
View File

@ -683,7 +683,7 @@ fn expand_type_alias_verify(
const _: fn() = #begin #ident, #type_id #end;
};
if types.required_trivial_aliases.contains(&alias.ident) {
if types.required_trivial_aliases.contains_key(&alias.ident) {
let begin = quote_spanned!(begin_span=> ::cxx::private::verify_extern_kind::<);
verify.extend(quote! {
const _: fn() = #begin #ident, ::cxx::kind::Trivial #end;

4
syntax/check.rs
View File

@ -338,7 +338,7 @@ fn is_unsized(cx: &mut Check, ty: &Type) -> bool {
|| cx.types.cxx.contains(ident)
&& !cx.types.structs.contains_key(ident)
&& !cx.types.enums.contains_key(ident)
&& !cx.types.required_trivial_aliases.contains(ident)
&& !cx.types.required_trivial_aliases.contains_key(ident)
|| cx.types.rust.contains(ident)
}
@ -377,7 +377,7 @@ fn describe(cx: &mut Check, ty: &Type) -> String {
} else if cx.types.enums.contains_key(ident) {
"enum".to_owned()
} else if cx.types.cxx.contains(ident) {
if cx.types.required_trivial_aliases.contains(ident) {
if cx.types.required_trivial_aliases.contains_key(ident) {
"trivial C++ type".to_owned()
} else {
"non-trivial C++ type".to_owned()

26
syntax/types.rs
View File

@ -1,7 +1,7 @@
use crate::syntax::atom::Atom::{self, *};
use crate::syntax::report::Errors;
use crate::syntax::set::OrderedSet as Set;
use crate::syntax::{Api, Derive, Enum, ExternType, Struct, Type, TypeAlias};
use crate::syntax::{Api, Derive, Enum, ExternFn, ExternType, Struct, Type, TypeAlias};
use proc_macro2::Ident;
use quote::ToTokens;
use std::collections::{BTreeMap as Map, HashSet as UnorderedSet};
@ -14,7 +14,7 @@ pub struct Types<'a> {
pub rust: Set<&'a Ident>,
pub aliases: Map<&'a Ident, &'a TypeAlias>,
pub untrusted: Map<&'a Ident, &'a ExternType>,
pub required_trivial_aliases: UnorderedSet<&'a Ident>,
pub required_trivial_aliases: Map<&'a Ident, TrivialReason<'a>>,
}
impl<'a> Types<'a> {
@ -140,27 +140,30 @@ impl<'a> Types<'a> {
// we check that this is permissible. We do this _after_ scanning all
// the APIs above, in case some function or struct references a type
// which is declared subsequently.
let mut required_trivial_aliases = UnorderedSet::new();
let mut insist_alias_types_are_trivial = |ty: &'a Type| {
let mut required_trivial_aliases = Map::new();
let mut insist_alias_types_are_trivial = |ty: &'a Type, reason| {
if let Type::Ident(ident) = ty {
if aliases.contains_key(ident) {
required_trivial_aliases.insert(ident);
required_trivial_aliases.entry(ident).or_insert(reason);
}
}
};
for api in apis {
match api {
Api::Struct(strct) => {
let reason = TrivialReason::StructField(strct);
for field in &strct.fields {
insist_alias_types_are_trivial(&field.ty);
insist_alias_types_are_trivial(&field.ty, reason);
}
}
Api::CxxFunction(efn) | Api::RustFunction(efn) => {
let reason = TrivialReason::FunctionArgument(efn);
for arg in &efn.args {
insist_alias_types_are_trivial(&arg.ty);
insist_alias_types_are_trivial(&arg.ty, reason);
}
if let Some(ret) = &efn.ret {
insist_alias_types_are_trivial(&ret);
let reason = TrivialReason::FunctionReturn(efn);
insist_alias_types_are_trivial(&ret, reason);
}
}
_ => {}
@ -211,6 +214,13 @@ impl<'t, 'a> IntoIterator for &'t Types<'a> {
}
}
#[derive(Copy, Clone)]
pub enum TrivialReason<'a> {
StructField(&'a Struct),
FunctionArgument(&'a ExternFn),
FunctionReturn(&'a ExternFn),
}
fn duplicate_name(cx: &mut Errors, sp: impl ToTokens, ident: &Ident) {
let msg = format!("the name `{}` is defined multiple times", ident);
cx.error(sp, msg);