git.iko.soy/dodrio
on master help sign in
Add a bunch of tests and test infrastructure

And fix a diffing bug that was caught by tests!

commit4f69e48874f7b4981c3db6715cf972b4cb463de8 authorNick Fitzgerald <fitzgen@gmail.com> dateTue 22 Jan 2019, 11:25 (8 years ago) parent4c88329
3 files changed+413−150
compare with master
unifiedsplit
Cargo.lock+85−92 src/vdom.rs+15−15 tests/web.rs+313−43
Cargo.lock+85−92
@@ -3,7 +3,7 @@ name = "aho-corasick"
33version = "0.6.9"
44source = "registry+https://github.com/rust-lang/crates.io-index"
55dependencies = [
6− "memchr 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
6+ "memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
77]
88
99[[package]]
@@ -18,7 +18,7 @@ dependencies = [
1818
1919[[package]]
2020name = "autocfg"
21−version = "0.1.1"
21+version = "0.1.2"
2222source = "registry+https://github.com/rust-lang/crates.io-index"
2323
2424[[package]]
@@ -26,7 +26,7 @@ name = "backtrace"
2626version = "0.3.13"
2727source = "registry+https://github.com/rust-lang/crates.io-index"
2828dependencies = [
29− "autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
29+ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
3030 "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
3131 "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
3232 "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -64,7 +64,7 @@ version = "0.1.5"
6464source = "registry+https://github.com/rust-lang/crates.io-index"
6565dependencies = [
6666 "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
67− "wasm-bindgen 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
67+ "wasm-bindgen 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
6868]
6969
7070[[package]]
@@ -73,7 +73,7 @@ version = "0.1.2"
7373source = "registry+https://github.com/rust-lang/crates.io-index"
7474dependencies = [
7575 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
76− "web-sys 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
76+ "web-sys 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)",
7777]
7878
7979[[package]]
@@ -82,11 +82,11 @@ version = "0.1.0"
8282dependencies = [
8383 "bumpalo 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
8484 "console_log 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
85− "js-sys 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
85+ "js-sys 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)",
8686 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
87− "wasm-bindgen 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
88− "wasm-bindgen-test 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
89− "web-sys 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
87+ "wasm-bindgen 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
88+ "wasm-bindgen-test 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
89+ "web-sys 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)",
9090]
9191
9292[[package]]
@@ -96,9 +96,9 @@ dependencies = [
9696 "bumpalo 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
9797 "console_error_panic_hook 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
9898 "dodrio 0.1.0",
99− "wasm-bindgen 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
100− "wasm-bindgen-test 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
101− "web-sys 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
99+ "wasm-bindgen 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
100+ "wasm-bindgen-test 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
101+ "web-sys 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)",
102102]
103103
104104[[package]]
@@ -108,9 +108,9 @@ dependencies = [
108108 "bumpalo 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
109109 "console_error_panic_hook 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
110110 "dodrio 0.1.0",
111− "wasm-bindgen 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
112− "wasm-bindgen-test 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
113− "web-sys 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
111+ "wasm-bindgen 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
112+ "wasm-bindgen-test 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
113+ "web-sys 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)",
114114]
115115
116116[[package]]
@@ -120,9 +120,9 @@ dependencies = [
120120 "bumpalo 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
121121 "console_error_panic_hook 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
122122 "dodrio 0.1.0",
123− "wasm-bindgen 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
124− "wasm-bindgen-test 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
125− "web-sys 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
123+ "wasm-bindgen 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
124+ "wasm-bindgen-test 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
125+ "web-sys 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)",
126126]
127127
128128[[package]]
@@ -151,8 +151,8 @@ name = "failure_derive"
151151version = "0.1.5"
152152source = "registry+https://github.com/rust-lang/crates.io-index"
153153dependencies = [
154− "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
155− "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
154+ "proc-macro2 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)",
155+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
156156 "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
157157 "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
158158]
@@ -180,10 +180,10 @@ dependencies = [
180180
181181[[package]]
182182name = "js-sys"
183−version = "0.3.9"
183+version = "0.3.10"
184184source = "registry+https://github.com/rust-lang/crates.io-index"
185185dependencies = [
186− "wasm-bindgen 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
186+ "wasm-bindgen 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
187187]
188188
189189[[package]]
@@ -206,12 +206,11 @@ dependencies = [
206206
207207[[package]]
208208name = "memchr"
209−version = "2.1.2"
209+version = "2.1.3"
210210source = "registry+https://github.com/rust-lang/crates.io-index"
211211dependencies = [
212212 "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
213213 "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
214− "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
215214]
216215
217216[[package]]
@@ -219,12 +218,12 @@ name = "nom"
219218version = "4.1.1"
220219source = "registry+https://github.com/rust-lang/crates.io-index"
221220dependencies = [
222− "memchr 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
221+ "memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
223222]
224223
225224[[package]]
226225name = "proc-macro2"
227−version = "0.4.25"
226+version = "0.4.26"
228227source = "registry+https://github.com/rust-lang/crates.io-index"
229228dependencies = [
230229 "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -237,15 +236,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
237236
238237[[package]]
239238name = "quote"
240−version = "0.6.10"
239+version = "0.6.11"
241240source = "registry+https://github.com/rust-lang/crates.io-index"
242241dependencies = [
243− "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
242+ "proc-macro2 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)",
244243]
245244
246245[[package]]
247246name = "redox_syscall"
248−version = "0.1.50"
247+version = "0.1.51"
249248source = "registry+https://github.com/rust-lang/crates.io-index"
250249
251250[[package]]
@@ -253,7 +252,7 @@ name = "redox_termios"
253252version = "0.1.1"
254253source = "registry+https://github.com/rust-lang/crates.io-index"
255254dependencies = [
256− "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
255+ "redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)",
257256]
258257
259258[[package]]
@@ -262,7 +261,7 @@ version = "1.1.0"
262261source = "registry+https://github.com/rust-lang/crates.io-index"
263262dependencies = [
264263 "aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
265− "memchr 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
264+ "memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
266265 "regex-syntax 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
267266 "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
268267 "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -296,8 +295,8 @@ name = "syn"
296295version = "0.15.26"
297296source = "registry+https://github.com/rust-lang/crates.io-index"
298297dependencies = [
299− "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
300− "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
298+ "proc-macro2 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)",
299+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
301300 "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
302301]
303302
@@ -306,8 +305,8 @@ name = "synstructure"
306305version = "0.10.1"
307306source = "registry+https://github.com/rust-lang/crates.io-index"
308307dependencies = [
309− "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
310− "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
308+ "proc-macro2 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)",
309+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
311310 "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
312311 "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
313312]
@@ -326,7 +325,7 @@ version = "1.5.1"
326325source = "registry+https://github.com/rust-lang/crates.io-index"
327326dependencies = [
328327 "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
329− "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
328+ "redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)",
330329 "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
331330]
332331
@@ -358,117 +357,112 @@ name = "utf8-ranges"
358357version = "1.0.2"
359358source = "registry+https://github.com/rust-lang/crates.io-index"
360359
361−[[package]]
362−name = "version_check"
363−version = "0.1.5"
364−source = "registry+https://github.com/rust-lang/crates.io-index"
365−
366360[[package]]
367361name = "wasm-bindgen"
368−version = "0.2.32"
362+version = "0.2.33"
369363source = "registry+https://github.com/rust-lang/crates.io-index"
370364dependencies = [
371− "wasm-bindgen-macro 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
365+ "wasm-bindgen-macro 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
372366]
373367
374368[[package]]
375369name = "wasm-bindgen-backend"
376−version = "0.2.32"
370+version = "0.2.33"
377371source = "registry+https://github.com/rust-lang/crates.io-index"
378372dependencies = [
379373 "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
380374 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
381− "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
382− "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
375+ "proc-macro2 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)",
376+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
383377 "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
384− "wasm-bindgen-shared 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
378+ "wasm-bindgen-shared 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
385379]
386380
387381[[package]]
388382name = "wasm-bindgen-futures"
389−version = "0.3.9"
383+version = "0.3.10"
390384source = "registry+https://github.com/rust-lang/crates.io-index"
391385dependencies = [
392386 "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
393− "js-sys 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
394− "wasm-bindgen 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
387+ "js-sys 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)",
388+ "wasm-bindgen 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
395389]
396390
397391[[package]]
398392name = "wasm-bindgen-macro"
399−version = "0.2.32"
393+version = "0.2.33"
400394source = "registry+https://github.com/rust-lang/crates.io-index"
401395dependencies = [
402− "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
403− "wasm-bindgen-macro-support 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
396+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
397+ "wasm-bindgen-macro-support 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
404398]
405399
406400[[package]]
407401name = "wasm-bindgen-macro-support"
408−version = "0.2.32"
402+version = "0.2.33"
409403source = "registry+https://github.com/rust-lang/crates.io-index"
410404dependencies = [
411− "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
412− "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
405+ "proc-macro2 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)",
406+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
413407 "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
414− "wasm-bindgen-backend 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
415− "wasm-bindgen-shared 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
408+ "wasm-bindgen-backend 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
409+ "wasm-bindgen-shared 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
416410]
417411
418412[[package]]
419413name = "wasm-bindgen-shared"
420−version = "0.2.32"
414+version = "0.2.33"
421415source = "registry+https://github.com/rust-lang/crates.io-index"
422416
423417[[package]]
424418name = "wasm-bindgen-test"
425−version = "0.2.32"
419+version = "0.2.33"
426420source = "registry+https://github.com/rust-lang/crates.io-index"
427421dependencies = [
428422 "console_error_panic_hook 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
429423 "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
430− "js-sys 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
424+ "js-sys 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)",
431425 "scoped-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
432− "wasm-bindgen 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
433− "wasm-bindgen-futures 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
434− "wasm-bindgen-test-macro 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
426+ "wasm-bindgen 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
427+ "wasm-bindgen-futures 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)",
428+ "wasm-bindgen-test-macro 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
435429]
436430
437431[[package]]
438432name = "wasm-bindgen-test-macro"
439−version = "0.2.32"
433+version = "0.2.33"
440434source = "registry+https://github.com/rust-lang/crates.io-index"
441435dependencies = [
442− "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
443− "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
436+ "proc-macro2 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)",
437+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
444438]
445439
446440[[package]]
447441name = "wasm-bindgen-webidl"
448−version = "0.2.26"
442+version = "0.2.27"
449443source = "registry+https://github.com/rust-lang/crates.io-index"
450444dependencies = [
451445 "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
452446 "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
453447 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
454− "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
455− "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
448+ "proc-macro2 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)",
449+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
456450 "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
457− "wasm-bindgen-backend 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
451+ "wasm-bindgen-backend 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
458452 "weedle 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
459453]
460454
461455[[package]]
462456name = "web-sys"
463−version = "0.3.9"
457+version = "0.3.10"
464458source = "registry+https://github.com/rust-lang/crates.io-index"
465459dependencies = [
466460 "env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
467461 "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
468− "js-sys 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
462+ "js-sys 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)",
469463 "sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
470− "wasm-bindgen 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
471− "wasm-bindgen-webidl 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
464+ "wasm-bindgen 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
465+ "wasm-bindgen-webidl 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
472466]
473467
474468[[package]]
@@ -518,7 +512,7 @@ dependencies = [
518512[metadata]
519513"checksum aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e"
520514"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
521−"checksum autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4e5f34df7a019573fb8bdc7e24a2bfebe51a2a1d6bfdbaeccedb3c41fc574727"
515+"checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799"
522516"checksum backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5"
523517"checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"
524518"checksum bumpalo 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "38da2bd7a4195f03c07e3cb21d7963729722541c6b94ec245ac818eab48b2ff7"
@@ -532,16 +526,16 @@ dependencies = [
532526"checksum futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)" = "49e7653e374fe0d0c12de4250f0bdb60680b8c80eed558c5c7538eec9c89e21b"
533527"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
534528"checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114"
535−"checksum js-sys 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "ed193fd4e8f0f40a417f904357af9defa269f462fdd4f2219f797e6191ca3b1c"
529+"checksum js-sys 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)" = "f0edfcbe54ba2071053f2e67f5dfbcea344b69aedfb371b76e27392427a5750f"
536530"checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1"
537531"checksum libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)" = "48450664a984b25d5b479554c29cc04e3150c97aa4c01da5604a2d4ed9151476"
538532"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
539−"checksum memchr 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "db4c41318937f6e76648f42826b1d9ade5c09cafb5aef7e351240a70f39206e9"
533+"checksum memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e1dd4eaac298c32ce07eb6ed9242eda7d82955b9170b7d6db59b2e02cc63fcb8"
540534"checksum nom 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9c349f68f25f596b9f44cf0e7c69752a5c633b0550c3ff849518bfba0233774a"
541−"checksum proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)" = "d3797b7142c9aa74954e351fc089bbee7958cebbff6bf2815e7ffff0b19f547d"
535+"checksum proc-macro2 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)" = "38fddd23d98b2144d197c0eca5705632d4fe2667d14a6be5df8934f8d74f1978"
542536"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
543−"checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c"
544−"checksum redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)" = "52ee9a534dc1301776eff45b4fa92d2c39b1d8c3d3357e6eb593e0d795506fc2"
537+"checksum quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)" = "cdd8e04bd9c52e0342b406469d494fcb033be4bdbe5c606016defbb1681411e1"
538+"checksum redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)" = "423e376fffca3dfa06c9e9790a9ccd282fafb3cc6e6397d01dbf64f9bacc6b85"
545539"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
546540"checksum regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "37e7cbbd370869ce2e8dff25c7018702d10b21a20ef7135316f8daecd6c25b7f"
547541"checksum regex-syntax 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4e47a2ed29da7a9e1960e1639e7a982e6edc6d49be308a3b02daf511504a16d1"
@@ -557,17 +551,16 @@ dependencies = [
557551"checksum unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aa6024fc12ddfd1c6dbc14a80fa2324d4568849869b779f6bd37e5e4c03344d1"
558552"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
559553"checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737"
560−"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
561−"checksum wasm-bindgen 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)" = "710152b9cc4b688f91a23ad1574d0f3d6334ccb883896f6886531dc536944330"
562−"checksum wasm-bindgen-backend 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)" = "1f425d1c38c61c25d6ce5a07411cc9f859fbb1bac0eccdf812d7e7e521d4214a"
563−"checksum wasm-bindgen-futures 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1b78d6049bba69b8550ec68a541cad41c3ebbdb40e69d8d7e21b7cf889f22dea"
564−"checksum wasm-bindgen-macro 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)" = "8541976809a58d1f08c3689c8ec3d98c9a7910794b1642f96dea56beb527aa1e"
565−"checksum wasm-bindgen-macro-support 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)" = "e3296c9a30e13a2672e5dbe41a7258e54c74512b579cee1de7c17c7f60080231"
566−"checksum wasm-bindgen-shared 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)" = "a6c76e3857dc73f19bb3ef9f228f1b7f2552c7bba44a43e3df68daee79e2d963"
567−"checksum wasm-bindgen-test 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)" = "6333f80ed95175356d7fde8c7546fc6253ccb64050ad285d5ac0ec446da0f518"
568−"checksum wasm-bindgen-test-macro 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)" = "7b498dddf81ef021a6ff088132116558471713f7bf7015bd3f66b14a55643702"
569−"checksum wasm-bindgen-webidl 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)" = "ea6121ab08bb3d6f8e5d6c4aab25db8909cb0d3a17506031131fa73df9349d70"
570−"checksum web-sys 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "505280f2d416df8ac559604b8184a65afd0de4ac11928fd1b6c5f9fc7e581e2e"
554+"checksum wasm-bindgen 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "2d8c1eb210a0e91e24feb8ccd6f7484a5d442bfdf2ff179204b3a1d16e1029cc"
555+"checksum wasm-bindgen-backend 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "57ab9a5e88bf5dea5be82bb5f8b68c0f8e550675796ac88570ea4c4e89923413"
556+"checksum wasm-bindgen-futures 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d35a917b7c857bf8bce3e47d51d7d74a074d467aa2b750857fc7d9f878483124"
557+"checksum wasm-bindgen-macro 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "52909345426e198a0d34f63526f9f4d86ca50c24b4a22a019d0bc86570ffe1e3"
558+"checksum wasm-bindgen-macro-support 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "2a130a5906bd540390cda0a28e7f8a2d450222461beb92a5eb5c6a33b8b8bc2a"
559+"checksum wasm-bindgen-shared 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "9c406cd5b42c36db6f76f17d28bcd26187fd90cda686231f3d04de07a716fc3a"
560+"checksum wasm-bindgen-test 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "edda7c4a76a8b2c1852e2bf707c3c537ae1a910fe5324bda77b10d249b6afd51"
561+"checksum wasm-bindgen-test-macro 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "1a97eada8f48c14b098237f45332b3b9d88bbc15ee9f93bf2478853fae85ebf2"
562+"checksum wasm-bindgen-webidl 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)" = "068ab8c6b5682c5ac2aa7c2178ecdfc91143e3d62da458997ee1299c3fbf0e85"
563+"checksum web-sys 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53890ae11f09f4f08f8dc0d76d03cedfb4aa1f667b17ee1b9d6aa23b314cb940"
571564"checksum weedle 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "26a4c67f132386d965390b8a734d5d10adbcd30eb5cc74bd9229af8b83f10044"
572565"checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0"
573566"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
src/vdom.rs+15−15
@@ -186,34 +186,35 @@ impl Vdom {
186186 self.change_list.emit_push_first_child();
187187 pushed = true;
188188 } else {
189+ debug_assert!(pushed);
189190 self.change_list.emit_pop_push_next_sibling();
190191 }
191192
192193 self.diff(old_child.clone(), new_child.clone());
193194 }
194195
195− debug!(" removing extra old children");
196−
197196 if old_children.next().is_some() {
197+ debug!(" removing extra old children");
198+ debug_assert!(new_children.next().is_none());
198199 if !pushed {
199200 self.change_list.emit_push_first_child();
200− pushed = true;
201+ } else {
202+ self.change_list.emit_pop_push_next_sibling();
201203 }
202204 self.change_list.emit_remove_self_and_next_siblings();
203− }
204−
205− debug!(" creating new children");
206−
207− for (i, new_child) in new_children.enumerate() {
208− if i == 0 && pushed {
209− self.change_list.emit_pop();
210− pushed = false;
205+ pushed = false;
206+ } else {
207+ debug!(" creating new children");
208+ for (i, new_child) in new_children.enumerate() {
209+ if i == 0 && pushed {
210+ self.change_list.emit_pop();
211+ pushed = false;
212+ }
213+ self.create(new_child.clone());
214+ self.change_list.emit_append_child();
211215 }
212− self.create(new_child.clone());
213− self.change_list.emit_append_child();
214216 }
215217
216− // TODO FITZGEN: only if we pushed?
217218 debug!(" done updating children");
218219 if pushed {
219220 self.change_list.emit_pop();
@@ -221,7 +222,6 @@ impl Vdom {
221222 }
222223
223224 fn create(&self, node: Node) {
224− // debug!("dodrio::Vdom::create({:#?})", node);
225225 match node {
226226 Node::Text(TextNode { text }) => {
227227 self.change_list.emit_create_text_node(text);
tests/web.rs+313−43
@@ -56,18 +56,27 @@ fn assert_rendered<R: Render>(container: &web_sys::Element, r: &R) {
5656 }
5757
5858 fn check_node(actual: &web_sys::Node, expected: &Node) {
59− info!("check_render:");
60− info!(" actual = {}", stringify_actual_node(&actual));
61− info!(" expected = {:?}", expected);
59+ debug!("check_render:");
60+ debug!(" actual = {}", stringify_actual_node(&actual));
61+ debug!(" expected = {:#?}", expected);
6262 match expected {
6363 Node::Text(text_node) => {
64− assert_eq!(actual.node_name().to_uppercase(), "#TEXT");
65− assert_eq!(actual.text_content().unwrap_or_default(), text_node.text());
64+ assert_eq!(
65+ actual.node_name().to_uppercase(),
66+ "#TEXT",
67+ "actual.node_name() == #TEXT"
68+ );
69+ assert_eq!(
70+ actual.text_content().unwrap_or_default(),
71+ text_node.text(),
72+ "actual.text_content() == expected.text()"
73+ );
6674 }
6775 Node::Element(elem) => {
6876 assert_eq!(
6977 actual.node_name().to_uppercase(),
70− elem.tag_name().to_uppercase()
78+ elem.tag_name().to_uppercase(),
79+ "actual.node_name() == expected.tag_name()"
7180 );
7281 let actual = actual
7382 .dyn_ref::<web_sys::Element>()
@@ -79,17 +88,30 @@ fn assert_rendered<R: Render>(container: &web_sys::Element, r: &R) {
7988 }
8089
8190 fn check_attributes(actual: web_sys::NamedNodeMap, expected: &[Attribute]) {
82− assert_eq!(actual.length(), expected.len() as u32);
91+ assert_eq!(
92+ actual.length(),
93+ expected.len() as u32,
94+ "actual's number of attributes == expected's number of attributes"
95+ );
8396 for attr in expected {
8497 let actual_attr = actual
8598 .get_named_item(attr.name)
8699 .expect(&format!("should have attribute \"{}\"", attr.name));
87− assert_eq!(actual_attr.value(), attr.value);
100+ assert_eq!(
101+ actual_attr.value(),
102+ attr.value,
103+ "actual attr value == expected attr value for attr \"{}\"",
104+ attr.name
105+ );
88106 }
89107 }
90108
91109 fn check_children(actual: web_sys::NodeList, expected: &[Node]) {
92− assert_eq!(actual.length(), expected.len() as u32);
110+ assert_eq!(
111+ actual.length(),
112+ expected.len() as u32,
113+ "actual children length == expected children length"
114+ );
93115 for (i, child) in expected.iter().enumerate() {
94116 let actual_child = actual.item(i as u32).unwrap();
95117 check_node(&actual_child, child);
@@ -97,49 +119,297 @@ fn assert_rendered<R: Render>(container: &web_sys::Element, r: &R) {
97119 }
98120}
99121
100−#[wasm_bindgen_test]
101−fn render_initial_text() {
102− struct Hello;
122+struct RenderFn<F>(F)
123+where
124+ F: for<'bump> Fn(&'bump Bump) -> Node<'bump>;
103125
104− impl Render for Hello {
105− fn render<'a, 'bump>(&'a self, _bump: &'bump Bump) -> Node<'bump>
106− where
107− 'a: 'bump,
108− {
109− Node::text("Hello")
110− }
126+impl<F> Render for RenderFn<F>
127+where
128+ F: for<'bump> Fn(&'bump Bump) -> Node<'bump>,
129+{
130+ fn render<'a, 'bump>(&'a self, bump: &'bump Bump) -> Node<'bump>
131+ where
132+ 'a: 'bump,
133+ {
134+ (self.0)(bump)
111135 }
136+}
137+
138+#[wasm_bindgen_test]
139+fn render_initial_text() {
140+ let hello = RenderFn(|_bump| Node::text("hello"));
112141
113142 let container = create_element("div");
114− Vdom::new(&container, &Hello);
115− assert_rendered(&container, &Hello);
143+ Vdom::new(&container, &hello);
144+ assert_rendered(&container, &hello);
116145}
117146
118147#[wasm_bindgen_test]
119148fn render_initial_node() {
120− struct Hello;
121−
122− impl Render for Hello {
123− fn render<'a, 'bump>(&'a self, bump: &'bump Bump) -> Node<'bump>
124− where
125− 'a: 'bump,
126− {
127− Node::element(
128− bump,
129− "div",
130− [Attribute {
131− name: "id",
132− value: "hello-world",
133− }],
134− [
135− Node::text("Hello "),
136− Node::element(bump, "span", [], [Node::text("World!")]),
137− ],
138− )
149+ let hello = RenderFn(|bump| {
150+ Node::element(
151+ bump,
152+ "div",
153+ [Attribute {
154+ name: "id",
155+ value: "hello-world",
156+ }],
157+ [
158+ Node::text("Hello "),
159+ Node::element(bump, "span", [], [Node::text("World!")]),
160+ ],
161+ )
162+ });
163+
164+ let container = create_element("div");
165+ Vdom::new(&container, &hello);
166+ assert_rendered(&container, &hello);
167+}
168+
169+fn assert_before_after<R, S>(before: R, after: S)
170+where
171+ R: Render,
172+ S: Render,
173+{
174+ let container = create_element("div");
175+
176+ debug!("====== Rendering the *before* DOM into the physical DOM ======");
177+ let mut vdom = Vdom::new(&container, &before);
178+ debug!("====== Checking the *before* DOM against the physical DOM ======");
179+ assert_rendered(&container, &before);
180+
181+ debug!("====== Rendering the *after* DOM into the physical DOM ======");
182+ vdom.render(&after);
183+ debug!("====== Checking the *after* DOM against the physical DOM ======");
184+ assert_rendered(&container, &after);
185+}
186+
187+macro_rules! before_after {
188+ ( $(
189+ $name:ident {
190+ before($before_bump:ident) {
191+ $( $before:tt )*
192+ }
193+ after($after_bump:ident) {
194+ $( $after:tt )*
195+ }
139196 }
197+ )* ) => {
198+ $(
199+ #[wasm_bindgen_test]
200+ fn $name() {
201+ assert_before_after(
202+ RenderFn(|$before_bump| { $( $before )* }),
203+ RenderFn(|$after_bump| { $( $after )* })
204+ );
205+ }
206+ )*
140207 }
208+}
141209
142− let container = create_element("div");
143− Vdom::new(&container, &Hello);
144− assert_rendered(&container, &Hello);
210+before_after! {
211+ same_text {
212+ before(_bump) {
213+ Node::text("hello")
214+ }
215+ after(_bump) {
216+ Node::text("hello")
217+ }
218+ }
219+
220+ update_text {
221+ before(_bump) {
222+ Node::text("before")
223+ }
224+ after(_bump) {
225+ Node::text("after")
226+ }
227+ }
228+
229+ replace_text_with_elem {
230+ before(_bump) {
231+ Node::text("before")
232+ }
233+ after(bump) {
234+ Node::element(bump, "div", [], [])
235+ }
236+ }
237+
238+ replace_elem_with_text {
239+ before(bump) {
240+ Node::element(bump, "div", [], [])
241+ }
242+ after(_bump) {
243+ Node::text("before")
244+ }
245+ }
246+
247+ same_elem {
248+ before(bump) {
249+ Node::element(bump, "div", [], [])
250+ }
251+ after(bump) {
252+ Node::element(bump, "div", [], [])
253+ }
254+ }
255+
256+ elems_with_different_tag_names {
257+ before(bump) {
258+ Node::element(bump, "span", [], [])
259+ }
260+ after(bump) {
261+ Node::element(bump, "div", [], [])
262+ }
263+ }
264+
265+ same_tag_name_update_attribute {
266+ before(bump) {
267+ Node::element(bump, "div", [Attribute { name: "value", value: "1" }], [])
268+ }
269+ after(bump) {
270+ Node::element(bump, "div", [Attribute { name: "value", value: "2" }], [])
271+ }
272+ }
273+
274+ same_tag_name_remove_attribute {
275+ before(bump) {
276+ Node::element(bump, "div", [Attribute { name: "value", value: "1" }], [])
277+ }
278+ after(bump) {
279+ Node::element(bump, "div", [], [])
280+ }
281+ }
282+
283+ same_tag_name_add_attribute {
284+ before(bump) {
285+ Node::element(bump, "div", [], [])
286+ }
287+ after(bump) {
288+ Node::element(bump, "div", [Attribute { name: "value", value: "2" }], [])
289+ }
290+ }
291+
292+ same_tag_name_many_attributes {
293+ before(bump) {
294+ Node::element(bump, "div", [
295+ Attribute { name: "before-1", value: "1" },
296+ Attribute { name: "shared-1", value: "1" },
297+ Attribute { name: "modified-1", value: "1" },
298+ Attribute { name: "before-2", value: "2" },
299+ Attribute { name: "shared-2", value: "2" },
300+ Attribute { name: "modified-2", value: "2" },
301+ Attribute { name: "before-3", value: "3" },
302+ Attribute { name: "shared-3", value: "3" },
303+ Attribute { name: "modified-3", value: "3" },
304+ ], [])
305+ }
306+ after(bump) {
307+ Node::element(bump, "div", [
308+ Attribute { name: "after-1", value: "1" },
309+ Attribute { name: "shared-1", value: "1" },
310+ Attribute { name: "modified-1", value: "100" },
311+ Attribute { name: "after-2", value: "2" },
312+ Attribute { name: "shared-2", value: "2" },
313+ Attribute { name: "modified-2", value: "200" },
314+ Attribute { name: "after-3", value: "3" },
315+ Attribute { name: "shared-3", value: "3" },
316+ Attribute { name: "modified-3", value: "300" },
317+ ], [])
318+ }
319+ }
320+
321+ same_tag_same_children {
322+ before(bump) {
323+ Node::element(bump, "div", [], [
324+ Node::text("child")
325+ ])
326+ }
327+ after(bump) {
328+ Node::element(bump, "div", [], [
329+ Node::text("child")
330+ ])
331+ }
332+ }
333+
334+ same_tag_update_child {
335+ before(bump) {
336+ Node::element(bump, "div", [], [
337+ Node::text("before")
338+ ])
339+ }
340+ after(bump) {
341+ Node::element(bump, "div", [], [
342+ Node::text("after")
343+ ])
344+ }
345+ }
346+
347+ same_tag_add_child {
348+ before(bump) {
349+ Node::element(bump, "div", [], [])
350+ }
351+ after(bump) {
352+ Node::element(bump, "div", [], [
353+ Node::text("child")
354+ ])
355+ }
356+ }
357+
358+ same_tag_remove_child {
359+ before(bump) {
360+ Node::element(bump, "div", [], [
361+ Node::text("child")
362+ ])
363+ }
364+ after(bump) {
365+ Node::element(bump, "div", [], [])
366+ }
367+ }
368+
369+ same_tag_update_many_children {
370+ before(bump) {
371+ Node::element(bump, "div", [], [
372+ Node::element(bump, "div", [], []),
373+ Node::element(bump, "span", [], []),
374+ Node::element(bump, "p", [], []),
375+ ])
376+ }
377+ after(bump) {
378+ Node::element(bump, "div", [], [
379+ Node::element(bump, "span", [], []),
380+ Node::element(bump, "p", [], []),
381+ Node::element(bump, "div", [], []),
382+ ])
383+ }
384+ }
385+
386+ same_tag_remove_many_children {
387+ before(bump) {
388+ Node::element(bump, "div", [], [
389+ Node::element(bump, "div", [], []),
390+ Node::element(bump, "span", [], []),
391+ Node::element(bump, "p", [], []),
392+ ])
393+ }
394+ after(bump) {
395+ Node::element(bump, "div", [], [
396+ Node::element(bump, "div", [], []),
397+ ])
398+ }
399+ }
400+
401+ same_tag_add_many_children {
402+ before(bump) {
403+ Node::element(bump, "div", [], [
404+ Node::element(bump, "div", [], []),
405+ ])
406+ }
407+ after(bump) {
408+ Node::element(bump, "div", [], [
409+ Node::element(bump, "div", [], []),
410+ Node::element(bump, "span", [], []),
411+ Node::element(bump, "p", [], []),
412+ ])
413+ }
414+ }
145415}