language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-10-02 14:51:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

More work on the vtable macro to adapt the Component

Browse source 
This does not work yet
This commit is contained in:
Olivier Goffart 2020-05-14 22:12:52 +02:00
parent 1ced4224b5
commit 686f4c9591
12 changed files with 132 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

31
helper_crates/vtable/src/lib.rs
View file

@ -1,5 +1,5 @@
use core::ops::{Deref, DerefMut, Drop};
//use core::ptr::NonNull;
use core::ptr::NonNull;
pub use vtable_macro::vtable;
pub unsafe trait VTableMeta {
@ -20,6 +20,9 @@ pub unsafe trait VTableMeta {
unsafe fn map_to(to: &Self::TraitObject) -> &Self::Trait;
/// Same as map_to, but mutable
unsafe fn map_to_mut(to: &mut Self::TraitObject) -> &mut Self::Trait;
/// Return a raw pointer to the inside of the impl
unsafe fn as_ptr(from: &Self::TraitObject) -> NonNull<u8>;
}
pub trait VTableMetaDrop: VTableMeta {
@ -66,6 +69,9 @@ impl<T: ?Sized + VTableMetaDrop> VBox<T> {
pub unsafe fn inner(x: &Self) -> T::TraitObject {
x.inner
}
pub unsafe fn as_ptr(x: &Self) -> NonNull<u8> {
T::as_ptr(&x.inner)
}
}
/*
@ -87,12 +93,21 @@ impl<T: ?Sized + VTableMeta> VBox<T> {
}*/
}
*/
#[derive(Clone, Copy)]
pub struct VRef<'a, T: ?Sized + VTableMeta> {
inner: T::TraitObject,
_phantom: core::marker::PhantomData<&'a T::Trait>,
}
// Need to implement manually otheriwse it is not implemented if T do not implement Copy / Clone
impl<'a, T: ?Sized + VTableMeta> Copy for VRef<'a, T> {}
impl<'a, T: ?Sized + VTableMeta> Clone for VRef<'a, T> {
fn clone(&self) -> Self {
Self { inner: self.inner, _phantom: self._phantom }
}
}
impl<'a, T: ?Sized + VTableMeta> Deref for VRef<'a, T> {
type Target = T::Trait;
fn deref(&self) -> &Self::Target {
@ -108,6 +123,15 @@ impl<'a, T: ?Sized + VTableMeta> VRef<'a, T> {
pub unsafe fn inner(x: &Self) -> T::TraitObject {
x.inner
}
pub unsafe fn as_ptr(x: &Self) -> NonNull<u8> {
T::as_ptr(&x.inner)
}
}
impl<'a, T: ?Sized + VTableMeta> From<VRefMut<'a, T>> for VRef<'a, T> {
fn from(v: VRefMut<'a, T>) -> Self {
unsafe { VRef::from_inner(VRefMut::inner(&v)) }
}
}
pub struct VRefMut<'a, T: ?Sized + VTableMeta> {
@ -137,4 +161,7 @@ impl<'a, T: ?Sized + VTableMeta> VRefMut<'a, T> {
pub unsafe fn inner(x: &Self) -> T::TraitObject {
x.inner
}
pub unsafe fn as_ptr(x: &Self) -> NonNull<u8> {
T::as_ptr(&x.inner)
}
}