Skip to content

Use usize in QAnyStringView layout instead of c_void #1400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jnbooth wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use usize in QAnyStringView layout instead of c_void #1400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/cxx-qt-lib/src/core/qanystringview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// https://code.qt.io/cgit/qt/qtbase.git/tree/src/corelib/text/qanystringview.h
assert_alignment_and_size(QAnyStringView, {
::std::size_t a0;
void* a1;
::std::size_t a1;
});

static_assert(::std::is_trivially_copy_assignable<QAnyStringView>::value);
Expand Down
5 changes: 2 additions & 3 deletions crates/cxx-qt-lib/src/core/qanystringview.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
//
// SPDX-License-Identifier: MIT OR Apache-2.0
use crate::{QByteArray, QString};
use core::ffi::c_void;
use core::marker::PhantomData;
use core::mem::MaybeUninit;
use cxx::{type_id, ExternType};
Expand Down Expand Up @@ -72,8 +71,8 @@ mod ffi {
#[repr(C)]
pub struct QAnyStringView<'a> {
/// `QAnyStringView` has two members, a pointer and a `size_t`
_space: MaybeUninit<[usize; 1]>,
_space2: MaybeUninit<[c_void; 1]>,
_data: MaybeUninit<usize>,
_size: MaybeUninit<isize>,

/// Needed to keep the lifetime in check
_phantom: PhantomData<&'a usize>,
Expand Down
Loading