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

Merge pull request #651 from dtolnay/slices

Browse Source 
Enable slices and arrays containing str/slice
This commit is contained in:
David Tolnay 2021-01-02 23:24:26 -08:00 committed by GitHub
commit 2e040531f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
syntax/check.rs
View File

@ -234,10 +234,10 @@ fn check_type_ref(cx: &mut Check, ty: &Ref) {
} }
fn check_type_slice_ref(cx: &mut Check, ty: &SliceRef) { fn check_type_slice_ref(cx: &mut Check, ty: &SliceRef) {
let supported = match &ty.inner { let supported = !is_unsized(cx, &ty.inner)
Type::Str(_) | Type::SliceRef(_) => false, || match &ty.inner {
Type::Ident(ident) => !is_unsized(cx, &ty.inner) || cx.types.rust.contains(&ident.rust), Type::Ident(ident) => cx.types.rust.contains(&ident.rust),
element => !is_unsized(cx, element), _ => false,
}; };
if !supported { if !supported {
@ -253,10 +253,7 @@ fn check_type_slice_ref(cx: &mut Check, ty: &SliceRef) {
} }
fn check_type_array(cx: &mut Check, ty: &Array) { fn check_type_array(cx: &mut Check, ty: &Array) {
let supported = match &ty.inner { let supported = !is_unsized(cx, &ty.inner);
Type::Str(_) | Type::SliceRef(_) => false,
element => !is_unsized(cx, element),
};
if !supported { if !supported {
cx.error(ty, "unsupported array element type"); cx.error(ty, "unsupported array element type");