Mirrors/dioxus
2
0
Fork 0
mirror of https://github.com/DioxusLabs/dioxus synced 2024-09-21 23:02:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: make miri pass

Browse source
This commit is contained in:
Jonathan Kelley 2022-12-16 20:39:19 -08:00
parent 261d688b6e
commit ea9245b0f7
2 changed files with 34 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
packages/core/src/diff.rs
View file

@ -155,21 +155,22 @@ impl<'b> VirtualDom {
// Replace components that have different render fns
if left.render_fn != right.render_fn {
todo!()
// let created = self.create_component_node(right_template, right, idx);
// let head = unsafe {
// self.scopes[left.scope.get().unwrap().0]
// .root_node()
// .extend_lifetime_ref()
// };
// let last = match head {
// RenderReturn::Sync(Ok(node)) => self.find_last_element(node),
// _ => todo!(),
// };
// self.mutations
// .push(Mutation::ReplaceWith { id, m: created });
// self.drop_scope(left.scope.get().unwrap());
// return;
let created = self.create_component_node(right_template, right, idx);
let head = unsafe {
self.scopes[left.scope.get().unwrap().0]
.root_node()
.extend_lifetime_ref()
};
let last = match head {
RenderReturn::Sync(Ok(node)) => self.find_last_element(node),
_ => todo!(),
};
self.mutations.push(Mutation::InsertAfter {
id: last,
m: created,
});
self.remove_component_node(left, true);
return;
}
// Make sure the new vcomponent has the right scopeid associated to it
@ -240,14 +241,13 @@ impl<'b> VirtualDom {
/// }
/// ```
fn light_diff_templates(&mut self, left: &'b VNode<'b>, right: &'b VNode<'b>) {
self.replace(left, [right]);
// match matching_components(left, right) {
// None => self.replace(left, [right]),
// Some(components) => components
// .into_iter()
// .enumerate()
// .for_each(|(idx, (l, r))| self.diff_vcomponent(l, r, right, idx)),
// }
match matching_components(left, right) {
None => self.replace(left, [right]),
Some(components) => components
.into_iter()
.enumerate()
.for_each(|(idx, (l, r))| self.diff_vcomponent(l, r, right, idx)),
}
}
/// Diff the two text nodes
@ -815,9 +815,6 @@ impl<'b> VirtualDom {
};
let props = self.scopes[scope.0].props.take();
// let props: Option<Box<dyn AnyProps>> = comp.props.take();
println!("taking props... {:?}", scope);
self.dirty_scopes.remove(&DirtyScope {
height: self.scopes[scope.0].height,

16
packages/core/src/lazynodes.rs
View file

@ -25,8 +25,11 @@ use crate::{innerlude::VNode, ScopeState};
/// LazyNodes::new(|f| f.element("div", [], [], [] None))
/// ```
pub struct LazyNodes<'a, 'b> {
#[cfg(not(miri))]
inner: SmallBox<dyn FnMut(&'a ScopeState) -> VNode<'a> + 'b, S16>,
#[cfg(miri)]
inner: Box<dyn FnMut(&'a ScopeState) -> VNode<'a> + 'b>,
// inner: SmallBox<dyn FnMut(&'a ScopeState) -> VNode<'a> + 'b, S16>,
}
impl<'a, 'b> LazyNodes<'a, 'b> {
@ -40,14 +43,17 @@ impl<'a, 'b> LazyNodes<'a, 'b> {
let mut slot = Some(val);
Self {
#[cfg(miri)]
inner: Box::new(move |f| {
let val = slot.take().expect("cannot call LazyNodes twice");
val(f)
}),
// inner: smallbox!(move |f| {
// let val = slot.take().expect("cannot call LazyNodes twice");
// val(f)
// }),
#[cfg(not(miri))]
inner: smallbox!(move |f| {
let val = slot.take().expect("cannot call LazyNodes twice");
val(f)
}),
}
}