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

Move is_valid_vector_target into type checker

Browse Source
This commit is contained in:
David Tolnay 2020-04-25 11:44:26 -07:00
parent f044663b2a
commit 7ff1b8c1b5
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
syntax/atom.rs
View File

@ -42,22 +42,6 @@ impl Atom {
_ => None,
}
}
pub fn is_valid_vector_target(&self) -> bool {
use self::Atom::*;
*self == U8
|| *self == U16
|| *self == U32
|| *self == U64
|| *self == Usize
|| *self == I8
|| *self == I16
|| *self == I32
|| *self == I64
|| *self == Isize
|| *self == F32
|| *self == F64
}
}
impl PartialEq<Atom> for Ident {

19
syntax/check.rs
View File

@ -92,7 +92,7 @@ fn check_type_box(cx: &mut Check, ptr: &Ty1) {
fn check_type_vec(cx: &mut Check, ptr: &Ty1) {
// Vec can contain either user-defined type or u8
if let Type::Ident(ident) = &ptr.inner {
if Atom::from(ident).map(|a| a.is_valid_vector_target()) == Some(true) {
if Atom::from(ident).map(is_valid_vector_target) == Some(true) {
return;
} else if cx.types.cxx.contains(ident) {
cx.error(ptr, error::VEC_CXX_TYPE.msg);
@ -130,7 +130,7 @@ fn check_type_vector(cx: &mut Check, ptr: &Ty1) {
match Atom::from(ident) {
None => return,
Some(atom) => {
if atom.is_valid_vector_target() {
if is_valid_vector_target(atom) {
return;
}
}
@ -299,6 +299,21 @@ fn is_unsized(cx: &mut Check, ty: &Type) -> bool {
ident == CxxString || cx.types.cxx.contains(ident) || cx.types.rust.contains(ident)
}
fn is_valid_vector_target(atom: Atom) -> bool {
atom == U8
|| atom == U16
|| atom == U32
|| atom == U64
|| atom == Usize
|| atom == I8
|| atom == I16
|| atom == I32
|| atom == I64
|| atom == Isize
|| atom == F32
|| atom == F64
}
fn span_for_struct_error(strct: &Struct) -> TokenStream {
let struct_token = strct.struct_token;
let mut brace_token = Group::new(Delimiter::Brace, TokenStream::new());