3906f80 · dodrio · git.iko.soy

git.iko.soy/dodrio

on master help sign in

Diff nodes by reference rather than by value

3906f80Nick Fitzgerald8 years ago

src/cached_set.rs+2−2

compare with master

unifiedsplit

@@ -140,7 +140,7 @@ impl CachedSet {

140 }

141

142 /// Get the node for the given cache id.

143− pub fn get(&self, mut id: CacheId) -> Node {

143+ pub fn get(&self, mut id: CacheId) -> &Node {

144 debug!("CachedSet::get: id = {:?}", id);

145 loop {

146 let entry = self

@@ -152,7 +152,7 @@ impl CachedSet {

152 id = c.id;

153 continue;

154 } else {

155− return node.clone();

155+ return node;

156 }

157 }

158 }

src/diff.rs+37−26

@@ -11,8 +11,8 @@ pub(crate) fn diff(

11 cached_set: &CachedSet,

12 change_list: &mut ChangeListBuilder,

13 registry: &mut EventsRegistry,

14− old: Node,

14+ old: &Node,

15− new: Node,

15+ new: &Node,

16 cached_roots: &mut FxHashSet<CacheId>,

17) {

18 match (&new.kind, &old.kind) {

@@ -197,6 +197,11 @@ fn diff_children(

197 return;

198 }

199

200+ if old.is_empty() {

201+ create_children(cached_set, change_list, registry, new, cached_roots);

202+ return;

203+ }

204+

200 debug!(" updating children shared by old and new");

205 debug!(" updating children shared by old and new");

201

206

202 let num_children_to_diff = cmp::min(new.len(), old.len());

207 let num_children_to_diff = cmp::min(new.len(), old.len());

@@ -222,8 +227,8 @@ fn diff_children(

222 cached_set,

227 cached_set,

223 change_list,

228 change_list,

224 registry,

229 registry,

225− old_child.clone(),

230+ old_child,

226− new_child.clone(),

231+ new_child,

227 cached_roots,

232 cached_roots,

228 );

233 );

229 }

234 }

@@ -240,20 +245,17 @@ fn diff_children(

240 pushed = false;

245 pushed = false;

241 } else {

246 } else {

242 debug!(" creating new children");

247 debug!(" creating new children");

243− for (i, new_child) in new_children.enumerate() {

244− if i == 0 && pushed {

248+ if pushed {

245− change_list.pop();

249+ change_list.pop();

246− pushed = false;

250+ pushed = false;

247− }

248− create(

249− cached_set,

250− change_list,

251− registry,

252− new_child.clone(),

253− cached_roots,

254− );

255− change_list.append_child();

256 }

251 }

252+ create_children(

253+ cached_set,

254+ change_list,

255+ registry,

256+ new_children,

257+ cached_roots,

258+ );

257 }

259 }

258

260

259 debug!(" done updating children");

261 debug!(" done updating children");

@@ -262,6 +264,21 @@ fn diff_children(

262 }

264 }

263}

265}

264

266

267+fn create_children<'a, I>(

268+ cached_set: &CachedSet,

269+ change_list: &mut ChangeListBuilder,

270+ registry: &mut EventsRegistry,

271+ new: I,

272+ cached_roots: &mut FxHashSet<CacheId>,

273+) where

274+ I: IntoIterator<Item = &'a Node<'a>>,

275+{

276+ for child in new {

277+ create(cached_set, change_list, registry, child, cached_roots);

278+ change_list.append_child();

279+ }

280+}

281+

265fn remove_children(

282fn remove_children(

266 change_list: &mut ChangeListBuilder,

283 change_list: &mut ChangeListBuilder,

267 registry: &mut EventsRegistry,

284 registry: &mut EventsRegistry,

@@ -279,7 +296,7 @@ fn create(

279 cached_set: &CachedSet,

296 cached_set: &CachedSet,

280 change_list: &mut ChangeListBuilder,

297 change_list: &mut ChangeListBuilder,

281 registry: &mut EventsRegistry,

298 registry: &mut EventsRegistry,

282− node: Node,

299+ node: &Node,

283 cached_roots: &mut FxHashSet<CacheId>,

300 cached_roots: &mut FxHashSet<CacheId>,

284) {

301) {

285 match node.kind {

302 match node.kind {

@@ -308,17 +325,11 @@ fn create(

308 change_list.set_attribute(&attr.name, &attr.value);

325 change_list.set_attribute(&attr.name, &attr.value);

309 }

326 }

310 for child in children {

327 for child in children {

311− create(

328+ create(cached_set, change_list, registry, child, cached_roots);

312− cached_set,

313− change_list,

314− registry,

315− child.clone(),

316− cached_roots,

317− );

318 change_list.append_child();

329 change_list.append_child();

319 }

330 }

320 }

331 }

321− NodeKind::Cached(c) => {

332+ NodeKind::Cached(ref c) => {

322 cached_roots.insert(c.id);

333 cached_roots.insert(c.id);

323 let node = cached_set.get(c.id);

334 let node = cached_set.get(c.id);

324 create(cached_set, change_list, registry, node, cached_roots)

335 create(cached_set, change_list, registry, node, cached_roots)

src/vdom.rs+2−2

@@ -277,8 +277,8 @@ impl VdomInnerExclusive {

277 &cached_set,

278 &mut change_list,

279 &mut registry,

280− old_contents,

280+ &old_contents,

281− new_contents.clone(),

281+ &new_contents,

282 &mut cache_roots,

283 );

284