fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-16 06:38:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Relax borrow stack lifetimes (#823)

Browse Source 
Relax lifetimes for borrow_stack
This commit is contained in:
TrueDoctor
2022-10-26 00:35:30 +02:00
committed by Keavon Chambers
parent 11c6413251
commit b2a90ddc2c
7 changed files with 67 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
node-graph/gstd/src/document.rs
View File

@@ -3,6 +3,7 @@ use std::fmt::Display;
use std::sync::Mutex;
use dyn_any::{DynAny, StaticType};
use dyn_clone::DynClone;
use rand_chacha::{
rand_core::{RngCore, SeedableRng},
ChaCha20Rng,
@@ -119,14 +120,14 @@ pub struct NodeNetwork {
pub nodes: HashMap<NodeId, DocumentNode>,
}
pub type Value = Box<dyn ValueTrait>;
pub trait ValueTrait: DynAny<'static> + std::fmt::Debug {}
pub trait ValueTrait: DynAny<'static> + std::fmt::Debug + DynClone {}
pub trait IntoValue: Sized + ValueTrait + 'static {
fn into_any(self) -> Value {
Box::new(self)
}
}
impl<T: 'static + StaticType + std::fmt::Debug + PartialEq> ValueTrait for T {}
impl<T: 'static + StaticType + std::fmt::Debug + PartialEq + Clone> ValueTrait for T {}
impl<T: 'static + ValueTrait> IntoValue for T {}
#[repr(C)]
@@ -156,6 +157,20 @@ impl PartialEq for Box<dyn ValueTrait> {
}
}
impl Clone for Value {
fn clone(&self) -> Self {
let self_trait_object = unsafe { std::mem::transmute::<&dyn ValueTrait, TraitObject>(self.as_ref()) };
let size = self_trait_object.vtable.size;
let self_mem = unsafe { std::slice::from_raw_parts(self_trait_object.self_ptr, size) }.to_owned();
let ptr = Vec::leak(self_mem);
unsafe {
std::mem::transmute(TraitObject {
self_ptr: ptr as *mut [u8] as *mut u8,
vtable: self_trait_object.vtable,
})
}
}
}
#[derive(Debug, Default)]
pub enum ConstructionArgs {
None,

4
node-graph/gstd/src/raster.rs
View File

@@ -111,8 +111,8 @@ impl<'a> IntoIterator for &'a Image {
pub fn file_node<'n, P: AsRef<Path> + 'n>() -> impl Node<P, Output = Result<Vec<u8>, Error>> {
let fs = ValueNode(StdFs).clone();
let fs = ConsNode(fs, PhantomData);
let file: ComposeNode<_, _, P> = fs.then(FileNode(PhantomData));
let fs = ConsNode::new(fs);
let file = fs.then(FileNode(PhantomData));
file.then(FlatMapResultNode::new(BufferNode))
}