openharmony/third_party_rust_cxx
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_rust_cxx synced 2024-11-24 07:40:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Check type name duplication more compactly

Browse Source
This commit is contained in:
David Tolnay 2020-05-04 00:21:37 -07:00
parent 96a826b8f0
commit ab91445c1d
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
2 changed files with 12 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
syntax/set.rs
View File

@ -18,10 +18,12 @@ where
}
}
pub fn insert(&mut self, value: &'a T) {
if self.set.insert(value) {
pub fn insert(&mut self, value: &'a T) -> bool {
let new = self.set.insert(value);
if new {
self.vec.push(value);
}
new
}
pub fn contains(&self, value: &T) -> bool {

35
syntax/types.rs
View File

@ -3,7 +3,7 @@ use crate::syntax::set::OrderedSet as Set;
use crate::syntax::{Api, Derive, Enum, ExternType, Struct, Type};
use proc_macro2::Ident;
use quote::quote;
use std::collections::BTreeMap as Map;
use std::collections::{BTreeMap as Map, HashSet as UnorderedSet};
use syn::{Error, Result};
pub struct Types<'a> {
@ -43,16 +43,12 @@ impl<'a> Types<'a> {
}
}
let mut type_names = UnorderedSet::new();
for api in apis {
match api {
Api::Include(_) => {}
Api::Struct(strct) => {
let ident = &strct.ident;
if structs.contains_key(ident)
|| enums.contains_key(ident)
|| cxx.contains(ident)
|| rust.contains(ident)
{
if !type_names.insert(&strct.ident) {
return Err(duplicate_struct(strct));
}
structs.insert(strct.ident.clone(), strct);
@ -61,37 +57,22 @@ impl<'a> Types<'a> {
}
}
Api::Enum(enm) => {
let ident = &enm.ident;
if structs.contains_key(ident)
|| enums.contains_key(ident)
|| cxx.contains(ident)
|| rust.contains(ident)
{
if !type_names.insert(&enm.ident) {
return Err(duplicate_enum(enm));
}
enums.insert(enm.ident.clone(), enm);
}
Api::CxxType(ety) => {
let ident = &ety.ident;
if structs.contains_key(ident)
|| enums.contains_key(ident)
|| cxx.contains(ident)
|| rust.contains(ident)
{
if !type_names.insert(&ety.ident) {
return Err(duplicate_type(ety));
}
cxx.insert(ident);
cxx.insert(&ety.ident);
}
Api::RustType(ety) => {
let ident = &ety.ident;
if structs.contains_key(ident)
|| enums.contains_key(ident)
|| cxx.contains(ident)
|| rust.contains(ident)
{
if !type_names.insert(&ety.ident) {
return Err(duplicate_type(ety));
}
rust.insert(ident);
rust.insert(&ety.ident);
}
Api::CxxFunction(efn) | Api::RustFunction(efn) => {
for arg in &efn.args {