git.iko.soy/dodrio
on 2ef0923 help sign in
f1ba4fd
swap
0 ahead, 169 behind
72 files changed+2075−4464
since splitsnapshots
unifiedsplit
.travis.yml+12−18 Cargo.lock+499−507 Cargo.toml+15−28 README.md−9 benches/benches.rs+24−13 build.sh+2−2 crates/js-api/Cargo.toml+7−6 crates/js-api/src/lib.rs+10−13 examples/counter/Cargo.toml+5−5 examples/counter/README.md+1−1 examples/counter/index.html+3−3 examples/counter/src/lib.rs+4−5 examples/game-of-life/Cargo.toml+6−5 examples/game-of-life/README.md+1−1 examples/game-of-life/index.html+6−3 examples/game-of-life/src/lib.rs+13−18 examples/hello-world/Cargo.toml+3−3 examples/hello-world/README.md+1−1 examples/hello-world/index.html+3−3 examples/hello-world/src/lib.rs+2−2 examples/input-form/Cargo.toml+3−3 examples/input-form/README.md+1−1 examples/input-form/index.html+3−3 examples/input-form/src/lib.rs+2−2 examples/js-component/Cargo.toml+3−3 examples/js-component/README.md+1−1 examples/js-component/index.html+3−3 examples/js-component/src/lib.rs+3−3 examples/moire/Cargo.toml+9−8 examples/moire/README.md+1−1 examples/moire/index.html+3−3 examples/moire/src/lib.rs+7−6 examples/sierpinski-triangle/Cargo.toml+6−5 examples/sierpinski-triangle/README.md+2−2 examples/sierpinski-triangle/index.html+4−4 examples/sierpinski-triangle/src/lib.rs+6−5 examples/todomvc/Cargo.toml+12−11 examples/todomvc/README.md+1−1 examples/todomvc/index.html+3−3 examples/todomvc/src/router.rs+21−23 examples/todomvc/src/todo.rs+21−77 examples/todomvc/src/todos.rs+6−5 js/change-list-interpreter.js−377 js/change-list.js+289 js/package-lock.json+5 js/package.json+11 js/strace.js−80 src/builder.rs+5−64 src/cached.rs+22−91 src/cached_set.rs+61−95 src/change_list.rs+486 src/change_list/emitter.rs−292 src/change_list/js.rs−40 src/change_list/mod.rs−353 src/change_list/strings.rs−66 src/change_list/traversal.rs−344 src/diff.rs+101−916 src/events.rs+18−9 src/lib.rs+4−5 src/node.rs+39−83 src/render.rs+16−43 src/render_context.rs+2−43 src/strace.rs−22 src/vdom.rs+98−113 tests/web/cached.js−11 tests/web/cached.rs+48−103 tests/web/events.rs+73−56 tests/web/js_api.rs+37−30 tests/web/keyed.js−25 tests/web/keyed.rs−269 tests/web/main.rs+20−26 tests/web/render.rs+2−89
.travis.yml+12−18
@@ -25,30 +25,24 @@ matrix:
2525 - name: "build (beta)"
2626 rust: beta
2727 script: INSTALL=1 ./build.sh
28+ - name: "build (nightly)"
29+ rust: nightly
30+ script: INSTALL=1 ./build.sh
2831 - name: "headless browser tests (firefox)"
2932 rust: stable
3033 addons:
3134 firefox: latest
3235 script: wasm-pack test --firefox --headless -- --features xxx-unstable-internal-use-only
36+ - name: "headless browser tests (chrome)"
37+ rust: stable
38+ addons:
39+ chrome: stable
40+ script: wasm-pack test --chrome --headless -- --features xxx-unstable-internal-use-only
3341 - name: "native tests"
3442 rust: stable
3543 install: echo "no install"
3644 script: cargo test --all
37−
38− # TODO: A bug in `rustc` is making `js-sys` broken on nightly:
39− # https://github.com/rust-lang/rust/issues/69315
40− # - name: "build (nightly)"
41− # rust: nightly
42− # script: INSTALL=1 ./build.sh
43− # - name: "check native benches"
44− # rust: nightly
45− # install: echo "no install"
46− # script: cargo check --benches --features xxx-unstable-internal-use-only
47−
48− # TODO: `chromedriver` is complaining about ports or something. Temporarily
49− # disable in CI until we figure it out.
50− # - name: "headless browser tests (chrome)"
51− # rust: stable
52− # addons:
53− # chrome: stable
54− # script: wasm-pack test --chrome --headless -- --features xxx-unstable-internal-use-only
45+ - name: "check native benches"
46+ rust: nightly
47+ install: echo "no install"
48+ script: cargo check --benches --features xxx-unstable-internal-use-only
Cargo.lock+499−507
@@ -1,71 +1,102 @@
1−# This file is automatically @generated by Cargo.
2−# It is not intended for manual editing.
31[[package]]
4−name = "anyhow"
5−version = "1.0.25"
2+name = "aho-corasick"
3+version = "0.7.3"
64source = "registry+https://github.com/rust-lang/crates.io-index"
5+dependencies = [
6+ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
7+]
8+
9+[[package]]
10+name = "arrayvec"
11+version = "0.4.10"
12+source = "registry+https://github.com/rust-lang/crates.io-index"
13+dependencies = [
14+ "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
15+]
716
817[[package]]
918name = "atty"
10−version = "0.2.13"
19+version = "0.2.11"
1120source = "registry+https://github.com/rust-lang/crates.io-index"
1221dependencies = [
13− "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
14− "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
22+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
23+ "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
24+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
1525]
1626
1727[[package]]
1828name = "autocfg"
19−version = "0.1.7"
29+version = "0.1.2"
2030source = "registry+https://github.com/rust-lang/crates.io-index"
2131
2232[[package]]
23−name = "bitflags"
24−version = "1.2.1"
33+name = "backtrace"
34+version = "0.3.14"
2535source = "registry+https://github.com/rust-lang/crates.io-index"
36+dependencies = [
37+ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
38+ "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
39+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
40+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
41+ "rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
42+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
43+]
2644
2745[[package]]
28−name = "bstr"
29−version = "0.2.8"
46+name = "backtrace-sys"
47+version = "0.1.28"
3048source = "registry+https://github.com/rust-lang/crates.io-index"
3149dependencies = [
32− "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
33− "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
34− "regex-automata 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
35− "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",
50+ "cc 1.0.32 (registry+https://github.com/rust-lang/crates.io-index)",
51+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
3652]
3753
54+[[package]]
55+name = "bitflags"
56+version = "1.0.4"
57+source = "registry+https://github.com/rust-lang/crates.io-index"
58+
3859[[package]]
3960name = "bumpalo"
40−version = "2.6.0"
61+version = "2.3.0"
4162source = "registry+https://github.com/rust-lang/crates.io-index"
4263
4364[[package]]
4465name = "byteorder"
45−version = "1.3.2"
66+version = "1.3.1"
4667source = "registry+https://github.com/rust-lang/crates.io-index"
4768
4869[[package]]
4970name = "cast"
50−version = "0.2.3"
71+version = "0.2.2"
72+source = "registry+https://github.com/rust-lang/crates.io-index"
73+
74+[[package]]
75+name = "cc"
76+version = "1.0.32"
5177source = "registry+https://github.com/rust-lang/crates.io-index"
52−dependencies = [
53− "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
54−]
5578
5679[[package]]
5780name = "cfg-if"
58−version = "0.1.10"
81+version = "0.1.7"
5982source = "registry+https://github.com/rust-lang/crates.io-index"
6083
6184[[package]]
6285name = "clap"
63−version = "2.33.0"
86+version = "2.32.0"
6487source = "registry+https://github.com/rust-lang/crates.io-index"
6588dependencies = [
66− "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
67− "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
68− "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
89+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
90+ "textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
91+ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
92+]
93+
94+[[package]]
95+name = "cloudabi"
96+version = "0.0.3"
97+source = "registry+https://github.com/rust-lang/crates.io-index"
98+dependencies = [
99+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
69100]
70101
71102[[package]]
@@ -73,132 +104,118 @@ name = "console_error_panic_hook"
73104version = "0.1.6"
74105source = "registry+https://github.com/rust-lang/crates.io-index"
75106dependencies = [
76− "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
77− "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
107+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
108+ "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
78109]
79110
80111[[package]]
81112name = "console_log"
82−version = "0.2.0"
113+version = "0.1.2"
83114source = "registry+https://github.com/rust-lang/crates.io-index"
84115dependencies = [
85− "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
86− "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
116+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
117+ "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
87118]
88119
89120[[package]]
90121name = "criterion"
91−version = "0.3.3"
122+version = "0.2.10"
92123source = "registry+https://github.com/rust-lang/crates.io-index"
93124dependencies = [
94− "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
95− "cast 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
96− "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
97− "criterion-plot 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
98− "csv 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
99− "itertools 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
100− "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
101− "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
102− "oorandom 11.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
103− "plotters 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
104− "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
105− "regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
106− "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",
107− "serde_cbor 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
108− "serde_derive 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",
109− "serde_json 1.0.57 (registry+https://github.com/rust-lang/crates.io-index)",
110− "tinytemplate 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
111− "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
125+ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
126+ "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
127+ "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
128+ "criterion-plot 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
129+ "csv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
130+ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
131+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
132+ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
133+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
134+ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
135+ "rand_xoshiro 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
136+ "rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
137+ "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
138+ "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
139+ "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
140+ "tinytemplate 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
141+ "walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
112142]
113143
114144[[package]]
115145name = "criterion-plot"
116−version = "0.4.3"
146+version = "0.3.0"
117147source = "registry+https://github.com/rust-lang/crates.io-index"
118148dependencies = [
119− "cast 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
120− "itertools 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
149+ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
150+ "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
151+ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
121152]
122153
123154[[package]]
124155name = "crossbeam-deque"
125−version = "0.7.2"
156+version = "0.2.0"
126157source = "registry+https://github.com/rust-lang/crates.io-index"
127158dependencies = [
128− "crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
129− "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
159+ "crossbeam-epoch 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
160+ "crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
130161]
131162
132163[[package]]
133164name = "crossbeam-epoch"
134−version = "0.8.0"
135−source = "registry+https://github.com/rust-lang/crates.io-index"
136−dependencies = [
137− "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
138− "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
139− "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
140− "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
141− "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
142− "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
143−]
144−
145−[[package]]
146−name = "crossbeam-queue"
147−version = "0.2.0"
165+version = "0.3.1"
148166source = "registry+https://github.com/rust-lang/crates.io-index"
149167dependencies = [
150− "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
168+ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
169+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
170+ "crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
171+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
172+ "memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
173+ "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
174+ "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
151175]
152176
153177[[package]]
154178name = "crossbeam-utils"
155−version = "0.7.0"
179+version = "0.2.2"
156180source = "registry+https://github.com/rust-lang/crates.io-index"
157181dependencies = [
158− "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
159− "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
160− "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
182+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
161183]
162184
163185[[package]]
164186name = "csv"
165−version = "1.1.1"
187+version = "1.0.5"
166188source = "registry+https://github.com/rust-lang/crates.io-index"
167189dependencies = [
168− "bstr 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
169− "csv-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
170− "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
171− "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
172− "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",
190+ "csv-core 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
191+ "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
173192]
174193
175194[[package]]
176195name = "csv-core"
177−version = "0.1.6"
196+version = "0.1.5"
178197source = "registry+https://github.com/rust-lang/crates.io-index"
179198dependencies = [
180− "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
199+ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
181200]
182201
183202[[package]]
184203name = "dodrio"
185−version = "0.2.0"
204+version = "0.1.0"
186205dependencies = [
187− "bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
188− "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
189− "console_log 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
190− "criterion 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
191− "dodrio-js-api 0.2.0",
192− "futures 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
206+ "bumpalo 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
207+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
208+ "console_log 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
209+ "criterion 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
210+ "dodrio-js-api 0.1.0",
211+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
193212 "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
194− "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
195− "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
196− "longest-increasing-subsequence 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
197− "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",
198− "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
199− "wasm-bindgen-futures 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
200− "wasm-bindgen-test 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
201− "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
213+ "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
214+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
215+ "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
216+ "wasm-bindgen-futures 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
217+ "wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
218+ "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
202219]
203220
204221[[package]]
@@ -206,12 +223,12 @@ name = "dodrio-counter"
206223version = "0.1.0"
207224dependencies = [
208225 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
209− "console_log 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
210− "dodrio 0.2.0",
211− "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
212− "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
213− "wasm-bindgen-test 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
214− "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
226+ "console_log 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
227+ "dodrio 0.1.0",
228+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
229+ "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
230+ "wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
231+ "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
215232]
216233
217234[[package]]
@@ -219,12 +236,13 @@ name = "dodrio-game-of-life"
219236version = "0.1.0"
220237dependencies = [
221238 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
222− "dodrio 0.2.0",
223− "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
224− "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
225− "wasm-bindgen-futures 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
226− "wasm-bindgen-test 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
227− "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
239+ "dodrio 0.1.0",
240+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
241+ "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
242+ "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
243+ "wasm-bindgen-futures 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
244+ "wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
245+ "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
228246]
229247
230248[[package]]
@@ -232,10 +250,10 @@ name = "dodrio-hello-world"
232250version = "0.1.0"
233251dependencies = [
234252 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
235− "dodrio 0.2.0",
236− "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
237− "wasm-bindgen-test 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
238− "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
253+ "dodrio 0.1.0",
254+ "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
255+ "wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
256+ "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
239257]
240258
241259[[package]]
@@ -243,21 +261,22 @@ name = "dodrio-input-form"
243261version = "0.1.0"
244262dependencies = [
245263 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
246− "dodrio 0.2.0",
247− "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
248− "wasm-bindgen-test 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
249− "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
264+ "dodrio 0.1.0",
265+ "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
266+ "wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
267+ "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
250268]
251269
252270[[package]]
253271name = "dodrio-js-api"
254−version = "0.2.0"
272+version = "0.1.0"
255273dependencies = [
256− "dodrio 0.2.0",
257− "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
258− "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
259− "wasm-bindgen-futures 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
260− "wasm-bindgen-test 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
274+ "dodrio 0.1.0",
275+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
276+ "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
277+ "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
278+ "wasm-bindgen-futures 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
279+ "wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
261280]
262281
263282[[package]]
@@ -265,27 +284,28 @@ name = "dodrio-js-component"
265284version = "0.1.0"
266285dependencies = [
267286 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
268− "dodrio 0.2.0",
269− "dodrio-js-api 0.2.0",
270− "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
271− "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
272− "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
287+ "dodrio 0.1.0",
288+ "dodrio-js-api 0.1.0",
289+ "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
290+ "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
291+ "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
273292]
274293
275294[[package]]
276295name = "dodrio-moire"
277296version = "0.1.0"
278297dependencies = [
279− "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
298+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
280299 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
281− "console_log 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
282− "dodrio 0.2.0",
283− "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
284− "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
285− "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
286− "wasm-bindgen-futures 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
287− "wasm-bindgen-test 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
288− "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
300+ "console_log 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
301+ "dodrio 0.1.0",
302+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
303+ "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
304+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
305+ "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
306+ "wasm-bindgen-futures 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
307+ "wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
308+ "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
289309]
290310
291311[[package]]
@@ -293,372 +313,315 @@ name = "dodrio-sierpinski"
293313version = "0.1.0"
294314dependencies = [
295315 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
296− "dodrio 0.2.0",
297− "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
298− "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
299− "wasm-bindgen-futures 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
300− "wasm-bindgen-test 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
301− "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
316+ "dodrio 0.1.0",
317+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
318+ "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
319+ "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
320+ "wasm-bindgen-futures 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
321+ "wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
322+ "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
302323]
303324
304325[[package]]
305326name = "dodrio-todomvc"
306327version = "0.1.0"
307328dependencies = [
308− "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
329+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
309330 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
310− "console_log 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
311− "dodrio 0.2.0",
312− "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
313− "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
314− "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",
315− "serde_json 1.0.57 (registry+https://github.com/rust-lang/crates.io-index)",
316− "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
317− "wasm-bindgen-futures 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
318− "wasm-bindgen-test 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
319− "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
331+ "console_log 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
332+ "dodrio 0.1.0",
333+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
334+ "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
335+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
336+ "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
337+ "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
338+ "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
339+ "wasm-bindgen-futures 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
340+ "wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
341+ "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
320342]
321343
322344[[package]]
323345name = "either"
324−version = "1.5.3"
325−source = "registry+https://github.com/rust-lang/crates.io-index"
326−
327−[[package]]
328−name = "futures"
329−version = "0.3.5"
346+version = "1.5.1"
330347source = "registry+https://github.com/rust-lang/crates.io-index"
331−dependencies = [
332− "futures-channel 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
333− "futures-core 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
334− "futures-executor 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
335− "futures-io 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
336− "futures-sink 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
337− "futures-task 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
338− "futures-util 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
339−]
340348
341349[[package]]
342−name = "futures-channel"
343−version = "0.3.5"
350+name = "env_logger"
351+version = "0.6.1"
344352source = "registry+https://github.com/rust-lang/crates.io-index"
345353dependencies = [
346− "futures-core 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
347− "futures-sink 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
354+ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
355+ "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
356+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
357+ "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
358+ "termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
348359]
349360
350361[[package]]
351−name = "futures-core"
352−version = "0.3.5"
353−source = "registry+https://github.com/rust-lang/crates.io-index"
354−
355−[[package]]
356−name = "futures-executor"
357−version = "0.3.5"
362+name = "failure"
363+version = "0.1.5"
358364source = "registry+https://github.com/rust-lang/crates.io-index"
359365dependencies = [
360− "futures-core 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
361− "futures-task 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
362− "futures-util 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
366+ "backtrace 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
367+ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
363368]
364369
365370[[package]]
366−name = "futures-io"
367−version = "0.3.5"
368−source = "registry+https://github.com/rust-lang/crates.io-index"
369−
370−[[package]]
371−name = "futures-macro"
372−version = "0.3.5"
371+name = "failure_derive"
372+version = "0.1.5"
373373source = "registry+https://github.com/rust-lang/crates.io-index"
374374dependencies = [
375− "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
376− "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
377− "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
378− "syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
375+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
376+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
377+ "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
378+ "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
379379]
380380
381381[[package]]
382−name = "futures-sink"
383−version = "0.3.5"
382+name = "fuchsia-cprng"
383+version = "0.1.1"
384384source = "registry+https://github.com/rust-lang/crates.io-index"
385385
386386[[package]]
387−name = "futures-task"
388−version = "0.3.5"
389−source = "registry+https://github.com/rust-lang/crates.io-index"
390−dependencies = [
391− "once_cell 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
392−]
393−
394−[[package]]
395−name = "futures-util"
396−version = "0.3.5"
387+name = "futures"
388+version = "0.1.26"
397389source = "registry+https://github.com/rust-lang/crates.io-index"
398−dependencies = [
399− "futures-channel 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
400− "futures-core 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
401− "futures-io 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
402− "futures-macro 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
403− "futures-sink 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
404− "futures-task 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
405− "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
406− "pin-project 0.4.16 (registry+https://github.com/rust-lang/crates.io-index)",
407− "pin-utils 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
408− "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
409− "proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
410− "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
411−]
412390
413391[[package]]
414392name = "fxhash"
415393version = "0.2.1"
416394source = "registry+https://github.com/rust-lang/crates.io-index"
417395dependencies = [
418− "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
396+ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
419397]
420398
421−[[package]]
422−name = "half"
423−version = "1.6.0"
424−source = "registry+https://github.com/rust-lang/crates.io-index"
425−
426399[[package]]
427400name = "heck"
428401version = "0.3.1"
429402source = "registry+https://github.com/rust-lang/crates.io-index"
430403dependencies = [
431− "unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
404+ "unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
432405]
433406
434407[[package]]
435−name = "hermit-abi"
436−version = "0.1.3"
408+name = "humantime"
409+version = "1.2.0"
437410source = "registry+https://github.com/rust-lang/crates.io-index"
438411dependencies = [
439− "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
412+ "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
440413]
441414
442415[[package]]
443416name = "itertools"
444−version = "0.9.0"
417+version = "0.8.0"
445418source = "registry+https://github.com/rust-lang/crates.io-index"
446419dependencies = [
447− "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
420+ "either 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
448421]
449422
450423[[package]]
451424name = "itoa"
452−version = "0.4.4"
425+version = "0.4.3"
453426source = "registry+https://github.com/rust-lang/crates.io-index"
454427
455428[[package]]
456429name = "js-sys"
457−version = "0.3.32"
430+version = "0.3.17"
458431source = "registry+https://github.com/rust-lang/crates.io-index"
459432dependencies = [
460− "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
433+ "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
461434]
462435
463436[[package]]
464437name = "lazy_static"
465−version = "1.4.0"
438+version = "1.3.0"
466439source = "registry+https://github.com/rust-lang/crates.io-index"
467440
468441[[package]]
469442name = "libc"
470−version = "0.2.66"
443+version = "0.2.51"
471444source = "registry+https://github.com/rust-lang/crates.io-index"
472445
473446[[package]]
474447name = "log"
475−version = "0.4.11"
448+version = "0.4.6"
476449source = "registry+https://github.com/rust-lang/crates.io-index"
477450dependencies = [
478− "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
451+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
479452]
480453
481−[[package]]
482−name = "longest-increasing-subsequence"
483−version = "0.1.0"
484−source = "registry+https://github.com/rust-lang/crates.io-index"
485−
486454[[package]]
487455name = "memchr"
488−version = "2.2.1"
456+version = "2.2.0"
489457source = "registry+https://github.com/rust-lang/crates.io-index"
490458dependencies = [
491− "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
459+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
492460]
493461
494462[[package]]
495463name = "memoffset"
496−version = "0.5.3"
464+version = "0.2.1"
465+source = "registry+https://github.com/rust-lang/crates.io-index"
466+
467+[[package]]
468+name = "nodrop"
469+version = "0.1.13"
497470source = "registry+https://github.com/rust-lang/crates.io-index"
498−dependencies = [
499− "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
500−]
501471
502472[[package]]
503473name = "nom"
504474version = "4.2.3"
505475source = "registry+https://github.com/rust-lang/crates.io-index"
506476dependencies = [
507− "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
477+ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
508478 "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
509479]
510480
511481[[package]]
512482name = "num-traits"
513−version = "0.2.10"
483+version = "0.2.6"
514484source = "registry+https://github.com/rust-lang/crates.io-index"
515−dependencies = [
516− "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
517−]
518485
519486[[package]]
520487name = "num_cpus"
521−version = "1.11.1"
488+version = "1.10.0"
522489source = "registry+https://github.com/rust-lang/crates.io-index"
523490dependencies = [
524− "hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
525− "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
491+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
526492]
527493
528494[[package]]
529−name = "once_cell"
530−version = "1.3.1"
495+name = "proc-macro2"
496+version = "0.4.27"
531497source = "registry+https://github.com/rust-lang/crates.io-index"
498+dependencies = [
499+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
500+]
532501
533502[[package]]
534−name = "oorandom"
535−version = "11.1.0"
503+name = "quick-error"
504+version = "1.2.2"
536505source = "registry+https://github.com/rust-lang/crates.io-index"
537506
538507[[package]]
539−name = "pin-project"
540−version = "0.4.16"
508+name = "quote"
509+version = "0.6.11"
541510source = "registry+https://github.com/rust-lang/crates.io-index"
542511dependencies = [
543− "pin-project-internal 0.4.16 (registry+https://github.com/rust-lang/crates.io-index)",
512+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
544513]
545514
546515[[package]]
547−name = "pin-project-internal"
548−version = "0.4.16"
516+name = "rand_core"
517+version = "0.3.1"
549518source = "registry+https://github.com/rust-lang/crates.io-index"
550519dependencies = [
551− "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
552− "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
553− "syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
520+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
554521]
555522
556523[[package]]
557−name = "pin-utils"
558−version = "0.1.0"
524+name = "rand_core"
525+version = "0.4.0"
559526source = "registry+https://github.com/rust-lang/crates.io-index"
560527
561528[[package]]
562−name = "plotters"
563−version = "0.2.12"
529+name = "rand_os"
530+version = "0.1.3"
564531source = "registry+https://github.com/rust-lang/crates.io-index"
565532dependencies = [
566− "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
567− "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
568− "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
569− "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
533+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
534+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
535+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
536+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
537+ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
538+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
570539]
571540
572541[[package]]
573−name = "proc-macro-hack"
574−version = "0.5.11"
542+name = "rand_xoshiro"
543+version = "0.1.0"
575544source = "registry+https://github.com/rust-lang/crates.io-index"
576545dependencies = [
577− "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
578− "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
579− "syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
546+ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
547+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
580548]
581549
582550[[package]]
583−name = "proc-macro-nested"
584−version = "0.1.3"
585−source = "registry+https://github.com/rust-lang/crates.io-index"
586−
587−[[package]]
588−name = "proc-macro2"
589−version = "1.0.18"
551+name = "rayon"
552+version = "1.0.3"
590553source = "registry+https://github.com/rust-lang/crates.io-index"
591554dependencies = [
592− "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
555+ "crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
556+ "either 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
557+ "rayon-core 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
593558]
594559
595560[[package]]
596−name = "quote"
597−version = "1.0.2"
561+name = "rayon-core"
562+version = "1.4.1"
598563source = "registry+https://github.com/rust-lang/crates.io-index"
599564dependencies = [
600− "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
565+ "crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
566+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
567+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
568+ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
601569]
602570
603571[[package]]
604−name = "rayon"
605−version = "1.3.0"
572+name = "rdrand"
573+version = "0.4.0"
606574source = "registry+https://github.com/rust-lang/crates.io-index"
607575dependencies = [
608− "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
609− "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
610− "rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
576+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
611577]
612578
613579[[package]]
614−name = "rayon-core"
615−version = "1.7.0"
580+name = "redox_syscall"
581+version = "0.1.52"
616582source = "registry+https://github.com/rust-lang/crates.io-index"
617−dependencies = [
618− "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
619− "crossbeam-queue 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
620− "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
621− "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
622− "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
623−]
624583
625584[[package]]
626−name = "regex"
627−version = "1.3.3"
585+name = "redox_termios"
586+version = "0.1.1"
628587source = "registry+https://github.com/rust-lang/crates.io-index"
629588dependencies = [
630− "regex-syntax 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
589+ "redox_syscall 0.1.52 (registry+https://github.com/rust-lang/crates.io-index)",
631590]
632591
633592[[package]]
634−name = "regex-automata"
635−version = "0.1.8"
593+name = "regex"
594+version = "1.1.5"
636595source = "registry+https://github.com/rust-lang/crates.io-index"
637596dependencies = [
638− "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
597+ "aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
598+ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
599+ "regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
600+ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
601+ "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
639602]
640603
641604[[package]]
642605name = "regex-syntax"
643−version = "0.6.13"
606+version = "0.6.6"
644607source = "registry+https://github.com/rust-lang/crates.io-index"
608+dependencies = [
609+ "ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
610+]
645611
646612[[package]]
647−name = "rustc_version"
648−version = "0.2.3"
613+name = "rustc-demangle"
614+version = "0.1.13"
649615source = "registry+https://github.com/rust-lang/crates.io-index"
650−dependencies = [
651− "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
652−]
653616
654617[[package]]
655618name = "ryu"
656−version = "1.0.2"
619+version = "0.2.7"
657620source = "registry+https://github.com/rust-lang/crates.io-index"
658621
659622[[package]]
660623name = "same-file"
661−version = "1.0.5"
624+version = "1.0.4"
662625source = "registry+https://github.com/rust-lang/crates.io-index"
663626dependencies = [
664627 "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -671,109 +634,129 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
671634
672635[[package]]
673636name = "scopeguard"
674−version = "1.0.0"
637+version = "0.3.3"
675638source = "registry+https://github.com/rust-lang/crates.io-index"
676639
677640[[package]]
678−name = "semver"
679−version = "0.9.0"
641+name = "serde"
642+version = "1.0.89"
680643source = "registry+https://github.com/rust-lang/crates.io-index"
681644dependencies = [
682− "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
645+ "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
683646]
684647
685648[[package]]
686−name = "semver-parser"
687−version = "0.7.0"
649+name = "serde_derive"
650+version = "1.0.89"
688651source = "registry+https://github.com/rust-lang/crates.io-index"
652+dependencies = [
653+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
654+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
655+ "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
656+]
689657
690658[[package]]
691−name = "serde"
692−version = "1.0.114"
659+name = "serde_json"
660+version = "1.0.39"
693661source = "registry+https://github.com/rust-lang/crates.io-index"
694662dependencies = [
695− "serde_derive 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",
663+ "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
664+ "ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
665+ "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
696666]
697667
698668[[package]]
699−name = "serde_cbor"
700−version = "0.11.1"
669+name = "sourcefile"
670+version = "0.1.4"
701671source = "registry+https://github.com/rust-lang/crates.io-index"
702−dependencies = [
703− "half 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
704− "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",
705−]
706672
707673[[package]]
708−name = "serde_derive"
709−version = "1.0.114"
674+name = "syn"
675+version = "0.15.30"
710676source = "registry+https://github.com/rust-lang/crates.io-index"
711677dependencies = [
712− "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
713− "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
714− "syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
678+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
679+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
680+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
715681]
716682
717683[[package]]
718−name = "serde_json"
719−version = "1.0.57"
684+name = "synstructure"
685+version = "0.10.1"
720686source = "registry+https://github.com/rust-lang/crates.io-index"
721687dependencies = [
722− "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
723− "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
724− "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",
688+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
689+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
690+ "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
691+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
725692]
726693
727694[[package]]
728−name = "slab"
729−version = "0.4.2"
695+name = "termcolor"
696+version = "1.0.4"
730697source = "registry+https://github.com/rust-lang/crates.io-index"
698+dependencies = [
699+ "wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
700+]
731701
732702[[package]]
733−name = "sourcefile"
734−version = "0.1.4"
703+name = "termion"
704+version = "1.5.1"
735705source = "registry+https://github.com/rust-lang/crates.io-index"
706+dependencies = [
707+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
708+ "redox_syscall 0.1.52 (registry+https://github.com/rust-lang/crates.io-index)",
709+ "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
710+]
736711
737712[[package]]
738−name = "syn"
739−version = "1.0.33"
713+name = "textwrap"
714+version = "0.10.0"
740715source = "registry+https://github.com/rust-lang/crates.io-index"
741716dependencies = [
742− "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
743− "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
744− "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
717+ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
745718]
746719
747720[[package]]
748−name = "textwrap"
749−version = "0.11.0"
721+name = "thread_local"
722+version = "0.3.6"
750723source = "registry+https://github.com/rust-lang/crates.io-index"
751724dependencies = [
752− "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
725+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
753726]
754727
755728[[package]]
756729name = "tinytemplate"
757−version = "1.1.0"
730+version = "1.0.1"
758731source = "registry+https://github.com/rust-lang/crates.io-index"
759732dependencies = [
760− "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",
761− "serde_json 1.0.57 (registry+https://github.com/rust-lang/crates.io-index)",
733+ "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
734+ "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
762735]
763736
737+[[package]]
738+name = "ucd-util"
739+version = "0.1.3"
740+source = "registry+https://github.com/rust-lang/crates.io-index"
741+
764742[[package]]
765743name = "unicode-segmentation"
766−version = "1.6.0"
744+version = "1.2.1"
767745source = "registry+https://github.com/rust-lang/crates.io-index"
768746
769747[[package]]
770748name = "unicode-width"
771−version = "0.1.6"
749+version = "0.1.5"
772750source = "registry+https://github.com/rust-lang/crates.io-index"
773751
774752[[package]]
775753name = "unicode-xid"
776−version = "0.2.0"
754+version = "0.1.0"
755+source = "registry+https://github.com/rust-lang/crates.io-index"
756+
757+[[package]]
758+name = "utf8-ranges"
759+version = "1.0.2"
777760source = "registry+https://github.com/rust-lang/crates.io-index"
778761
779762[[package]]
@@ -783,126 +766,126 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
783766
784767[[package]]
785768name = "walkdir"
786−version = "2.3.1"
769+version = "2.2.7"
787770source = "registry+https://github.com/rust-lang/crates.io-index"
788771dependencies = [
789− "same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
790− "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
772+ "same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
773+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
791774 "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
792775]
793776
794777[[package]]
795778name = "wasm-bindgen"
796−version = "0.2.55"
779+version = "0.2.40"
797780source = "registry+https://github.com/rust-lang/crates.io-index"
798781dependencies = [
799− "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
800− "wasm-bindgen-macro 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
782+ "wasm-bindgen-macro 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
801783]
802784
803785[[package]]
804786name = "wasm-bindgen-backend"
805−version = "0.2.55"
787+version = "0.2.40"
806788source = "registry+https://github.com/rust-lang/crates.io-index"
807789dependencies = [
808− "bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
809− "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
810− "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
811− "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
812− "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
813− "syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
814− "wasm-bindgen-shared 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
790+ "bumpalo 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
791+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
792+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
793+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
794+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
795+ "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
796+ "wasm-bindgen-shared 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
815797]
816798
817799[[package]]
818800name = "wasm-bindgen-futures"
819−version = "0.4.5"
801+version = "0.3.17"
820802source = "registry+https://github.com/rust-lang/crates.io-index"
821803dependencies = [
822− "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
823− "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
824− "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
825− "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
804+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
805+ "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
806+ "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
826807]
827808
828809[[package]]
829810name = "wasm-bindgen-macro"
830−version = "0.2.55"
811+version = "0.2.40"
831812source = "registry+https://github.com/rust-lang/crates.io-index"
832813dependencies = [
833− "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
834− "wasm-bindgen-macro-support 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
814+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
815+ "wasm-bindgen-macro-support 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
835816]
836817
837818[[package]]
838819name = "wasm-bindgen-macro-support"
839−version = "0.2.55"
820+version = "0.2.40"
840821source = "registry+https://github.com/rust-lang/crates.io-index"
841822dependencies = [
842− "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
843− "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
844− "syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
845− "wasm-bindgen-backend 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
846− "wasm-bindgen-shared 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
823+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
824+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
825+ "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
826+ "wasm-bindgen-backend 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
827+ "wasm-bindgen-shared 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
847828]
848829
849830[[package]]
850831name = "wasm-bindgen-shared"
851−version = "0.2.55"
832+version = "0.2.40"
852833source = "registry+https://github.com/rust-lang/crates.io-index"
853834
854835[[package]]
855836name = "wasm-bindgen-test"
856−version = "0.3.5"
837+version = "0.2.40"
857838source = "registry+https://github.com/rust-lang/crates.io-index"
858839dependencies = [
859840 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
860− "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
841+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
842+ "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
861843 "scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
862− "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
863− "wasm-bindgen-futures 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
864− "wasm-bindgen-test-macro 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
844+ "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
845+ "wasm-bindgen-futures 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
846+ "wasm-bindgen-test-macro 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
865847]
866848
867849[[package]]
868850name = "wasm-bindgen-test-macro"
869−version = "0.3.5"
851+version = "0.2.40"
870852source = "registry+https://github.com/rust-lang/crates.io-index"
871853dependencies = [
872− "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
873− "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
854+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
855+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
874856]
875857
876858[[package]]
877859name = "wasm-bindgen-webidl"
878−version = "0.2.55"
860+version = "0.2.40"
879861source = "registry+https://github.com/rust-lang/crates.io-index"
880862dependencies = [
881− "anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
863+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
882864 "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
883− "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
884− "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
885− "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
886− "syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
887− "wasm-bindgen-backend 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
888− "weedle 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
865+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
866+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
867+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
868+ "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
869+ "wasm-bindgen-backend 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
870+ "weedle 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
889871]
890872
891873[[package]]
892874name = "web-sys"
893−version = "0.3.32"
875+version = "0.3.17"
894876source = "registry+https://github.com/rust-lang/crates.io-index"
895877dependencies = [
896− "anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
897− "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
878+ "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
879+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
880+ "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
898881 "sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
899− "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
900− "wasm-bindgen-webidl 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
882+ "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
883+ "wasm-bindgen-webidl 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
901884]
902885
903886[[package]]
904887name = "weedle"
905−version = "0.10.0"
888+version = "0.8.0"
906889source = "registry+https://github.com/rust-lang/crates.io-index"
907890dependencies = [
908891 "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -910,7 +893,7 @@ dependencies = [
910893
911894[[package]]
912895name = "winapi"
913−version = "0.3.8"
896+version = "0.3.6"
914897source = "registry+https://github.com/rust-lang/crates.io-index"
915898dependencies = [
916899 "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -927,7 +910,7 @@ name = "winapi-util"
927910version = "0.1.2"
928911source = "registry+https://github.com/rust-lang/crates.io-index"
929912dependencies = [
930− "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
913+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
931914]
932915
933916[[package]]
@@ -935,101 +918,110 @@ name = "winapi-x86_64-pc-windows-gnu"
935918version = "0.4.0"
936919source = "registry+https://github.com/rust-lang/crates.io-index"
937920
921+[[package]]
922+name = "wincolor"
923+version = "1.0.1"
924+source = "registry+https://github.com/rust-lang/crates.io-index"
925+dependencies = [
926+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
927+ "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
928+]
929+
938930[metadata]
939−"checksum anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "9267dff192e68f3399525901e709a48c1d3982c9c072fa32f2127a0cb0babf14"
940−"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
941−"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
942−"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
943−"checksum bstr 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8d6c2c5b58ab920a4f5aeaaca34b4488074e8cc7596af94e6f8c6ff247c60245"
944−"checksum bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad807f2fc2bf185eeb98ff3a901bd46dc5ad58163d0fa4577ba0d25674d71708"
945−"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
946−"checksum cast 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0"
947−"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
948−"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
931+"checksum aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e6f484ae0c99fec2e858eb6134949117399f222608d84cadb3f58c1f97c2364c"
932+"checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71"
933+"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
934+"checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799"
935+"checksum backtrace 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "cd5a90e2b463010cd0e0ce9a11d4a9d5d58d9f41d4a6ba3dcaf9e68b466e88b4"
936+"checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"
937+"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
938+"checksum bumpalo 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f6a6bc2ba935b1e2f810787ceba8dfe86cbc164cee55925cae715541186673c4"
939+"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb"
940+"checksum cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "926013f2860c46252efceabb19f4a6b308197505082c609025aa6706c011d427"
941+"checksum cc 1.0.32 (registry+https://github.com/rust-lang/crates.io-index)" = "ad0daef304fa0b4238f5f7ed7178774b43b06f6a9b6509f6642bef4ff1f7b9b2"
942+"checksum cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11d43355396e872eefb45ce6342e4374ed7bc2b3a502d1b28e36d6e23c05d1f4"
943+"checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e"
944+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
949945"checksum console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"
950−"checksum console_log 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "501a375961cef1a0d44767200e66e4a559283097e91d0730b1d75dfb2f8a1494"
951−"checksum criterion 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "70daa7ceec6cf143990669a04c7df13391d55fb27bd4079d252fca774ba244d8"
952−"checksum criterion-plot 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d"
953−"checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca"
954−"checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac"
955−"checksum crossbeam-queue 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dfd6515864a82d2f877b42813d4553292c6659498c9a2aa31bab5a15243c2700"
956−"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4"
957−"checksum csv 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "37519ccdfd73a75821cac9319d4fce15a81b9fcf75f951df5b9988aa3a0af87d"
958−"checksum csv-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9b5cadb6b25c77aeff80ba701712494213f4a8418fcda2ee11b6560c3ad0bf4c"
959−"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
960−"checksum futures 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1e05b85ec287aac0dc34db7d4a569323df697f9c55b99b15d6b4ef8cde49f613"
961−"checksum futures-channel 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5"
962−"checksum futures-core 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "59f5fff90fd5d971f936ad674802482ba441b6f09ba5e15fd8b39145582ca399"
963−"checksum futures-executor 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "10d6bb888be1153d3abeb9006b11b02cf5e9b209fda28693c31ae1e4e012e314"
964−"checksum futures-io 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789"
965−"checksum futures-macro 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39"
966−"checksum futures-sink 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc"
967−"checksum futures-task 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626"
968−"checksum futures-util 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6"
946+"checksum console_log 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1e7871d2947441b0fdd8e2bd1ce2a2f75304f896582c0d572162d48290683c48"
947+"checksum criterion 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "1c6e5ee5b9652d4f851418c448af105642e1f99e9a2741a8ff45c0d2c911b1e0"
948+"checksum criterion-plot 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4107e4a5abb94267e0149922b8ff49dc70a87cc202820fdbfc0d3e1edbdc4b16"
949+"checksum crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f739f8c5363aca78cfb059edf753d8f0d36908c348f3d8d1503f03d8b75d9cf3"
950+"checksum crossbeam-epoch 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "927121f5407de9956180ff5e936fe3cf4324279280001cd56b669d28ee7e9150"
951+"checksum crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2760899e32a1d58d5abb31129f8fae5de75220bc2176e77ff7c627ae45c918d9"
952+"checksum csv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "9fd1c44c58078cfbeaf11fbb3eac9ae5534c23004ed770cc4bfb48e658ae4f04"
953+"checksum csv-core 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa5cdef62f37e6ffe7d1f07a381bc0db32b7a3ff1cac0de56cb0d81e71f53d65"
954+"checksum either 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c67353c641dc847124ea1902d69bd753dee9bb3beff9aa3662ecf86c971d1fac"
955+"checksum env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b61fa891024a945da30a9581546e8cfaf5602c7b3f4c137a2805cf388f92075a"
956+"checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"
957+"checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
958+"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
959+"checksum futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "62941eff9507c8177d448bd83a44d9b9760856e184081d8cd79ba9f03dd24981"
969960"checksum fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
970−"checksum half 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d36fab90f82edc3c747f9d438e06cf0a491055896f2a279638bb5beed6c40177"
971961"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
972−"checksum hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120"
973−"checksum itertools 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
974−"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
975−"checksum js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)" = "1c840fdb2167497b0bd0db43d6dfe61e91637fa72f9d061f8bd17ddc44ba6414"
976−"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
977−"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
978−"checksum log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
979−"checksum longest-increasing-subsequence 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3bd0dd2cd90571056fdb71f6275fada10131182f84899f4b2a916e565d81d86"
980−"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
981−"checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9"
962+"checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114"
963+"checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358"
964+"checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b"
965+"checksum js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "d4bda84b98977341bb6ba1086ecbd9eab8bc929de0f2923c118baf76c21dd0c8"
966+"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14"
967+"checksum libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)" = "bedcc7a809076656486ffe045abeeac163da1b558e963a31e29fbfbeba916917"
968+"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
969+"checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39"
970+"checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
971+"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
982972"checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
983−"checksum num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c81ffc11c212fa327657cb19dd85eb7419e163b5b076bede2bdb5c974c07e4"
984−"checksum num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72"
985−"checksum once_cell 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b1c601810575c99596d4afc46f78a678c80105117c379eb3650cf99b8a21ce5b"
986−"checksum oorandom 11.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ebcec7c9c2a95cacc7cd0ecb89d8a8454eca13906f6deb55258ffff0adeb9405"
987−"checksum pin-project 0.4.16 (registry+https://github.com/rust-lang/crates.io-index)" = "81d480cb4e89522ccda96d0eed9af94180b7a5f93fb28f66e1fd7d68431663d1"
988−"checksum pin-project-internal 0.4.16 (registry+https://github.com/rust-lang/crates.io-index)" = "a82996f11efccb19b685b14b5df818de31c1edcee3daa256ab5775dd98e72feb"
989−"checksum pin-utils 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
990−"checksum plotters 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "4e3bb8da247d27ae212529352020f3e5ee16e83c0c258061d27b08ab92675eeb"
991−"checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5"
992−"checksum proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "369a6ed065f249a159e06c45752c780bda2fb53c995718f9e484d08daa9eb42e"
993−"checksum proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa"
994−"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
995−"checksum rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098"
996−"checksum rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9"
997−"checksum regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b5508c1941e4e7cb19965abef075d35a9a8b5cdf0846f30b4050e9b55dc55e87"
998−"checksum regex-automata 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "92b73c2a1770c255c240eaa4ee600df1704a38dc3feaa6e949e7fcd4f8dc09f9"
999−"checksum regex-syntax 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e734e891f5b408a29efbf8309e656876276f49ab6a6ac208600b4419bd893d90"
1000−"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
1001−"checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
1002−"checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421"
973+"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"
974+"checksum num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a23f0ed30a54abaa0c7e83b1d2d87ada7c3c23078d1d87815af3e3b6385fbba"
975+"checksum proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)" = "4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915"
976+"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
977+"checksum quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)" = "cdd8e04bd9c52e0342b406469d494fcb033be4bdbe5c606016defbb1681411e1"
978+"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
979+"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0"
980+"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
981+"checksum rand_xoshiro 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "03b418169fb9c46533f326efd6eed2576699c44ca92d3052a066214a8d828929"
982+"checksum rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "373814f27745b2686b350dd261bfd24576a6fb0e2c5919b3a2b6005f820b0473"
983+"checksum rayon-core 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b055d1e92aba6877574d8fe604a63c8b5df60f60e5982bf7ccbb1338ea527356"
984+"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
985+"checksum redox_syscall 0.1.52 (registry+https://github.com/rust-lang/crates.io-index)" = "d32b3053e5ced86e4bc0411fec997389532bf56b000e66cb4884eeeb41413d69"
986+"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
987+"checksum regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "559008764a17de49a3146b234641644ed37d118d1ef641a0bb573d146edc6ce0"
988+"checksum regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dcfd8681eebe297b81d98498869d4aae052137651ad7b96822f09ceb690d0a96"
989+"checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619"
990+"checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7"
991+"checksum same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267"
1003992"checksum scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
1004−"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
1005−"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
1006−"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
1007−"checksum serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)" = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3"
1008−"checksum serde_cbor 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622"
1009−"checksum serde_derive 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)" = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e"
1010−"checksum serde_json 1.0.57 (registry+https://github.com/rust-lang/crates.io-index)" = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c"
1011−"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
993+"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
994+"checksum serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)" = "92514fb95f900c9b5126e32d020f5c6d40564c27a5ea6d1d7d9f157a96623560"
995+"checksum serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)" = "bb6eabf4b5914e88e24eea240bb7c9f9a2cbc1bbbe8d961d381975ec3c6b806c"
996+"checksum serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)" = "5a23aa71d4a4d43fdbfaac00eff68ba8a06a51759a89ac3304323e800c4dd40d"
1012997"checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3"
1013−"checksum syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)" = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd"
1014−"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
1015−"checksum tinytemplate 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d3dc76004a03cec1c5932bca4cdc2e39aaa798e3f82363dd94f9adf6098c12f"
1016−"checksum unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
1017−"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20"
1018−"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
998+"checksum syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)" = "66c8865bf5a7cbb662d8b011950060b3c8743dca141b054bf7195b20d314d8e2"
999+"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
1000+"checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f"
1001+"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
1002+"checksum textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6"
1003+"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
1004+"checksum tinytemplate 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7655088894274afb52b807bd3c87072daa1fedd155068b8705cabfd628956115"
1005+"checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86"
1006+"checksum unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aa6024fc12ddfd1c6dbc14a80fa2324d4568849869b779f6bd37e5e4c03344d1"
1007+"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526"
1008+"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
1009+"checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737"
10191010"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
1020−"checksum walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
1021−"checksum wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "29ae32af33bacd663a9a28241abecf01f2be64e6a185c6139b04f18b6385c5f2"
1022−"checksum wasm-bindgen-backend 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "1845584bd3593442dc0de6e6d9f84454a59a057722f36f005e44665d6ab19d85"
1023−"checksum wasm-bindgen-futures 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1458706aa1b8fe6898d19433c9f110d93a05d1f22ae6adf55810409a94df34b4"
1024−"checksum wasm-bindgen-macro 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "87fcc747e6b73c93d22c947a6334644d22cfec5abd8b66238484dc2b0aeb9fe4"
1025−"checksum wasm-bindgen-macro-support 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "3dc4b3f2c4078c8c4a5f363b92fcf62604c5913cbd16c6ff5aaf0f74ec03f570"
1026−"checksum wasm-bindgen-shared 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "ca0b78d6d3be8589b95d1d49cdc0794728ca734adf36d7c9f07e6459508bb53d"
1027−"checksum wasm-bindgen-test 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ed5833682054e941db0b7e2b4877b61bbaafd680608e40d268e070d34558b305"
1028−"checksum wasm-bindgen-test-macro 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "9c5dcf70d21d0ff0ea5cdb97dba9a9b56ddad4a9bd10c8912eedc55618be022f"
1029−"checksum wasm-bindgen-webidl 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "3126356474ceb717c8fb5549ae387c9fbf4872818454f4d87708bee997214bb5"
1030−"checksum web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)" = "98405c0a2e722ed3db341b4c5b70eb9fe0021621f7350bab76df93b09b649bbf"
1031−"checksum weedle 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3bb43f70885151e629e2a19ce9e50bd730fd436cfd4b666894c9ce4de9141164"
1032−"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
1011+"checksum walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "9d9d7ed3431229a144296213105a390676cc49c9b6a72bd19f3176c98e129fa1"
1012+"checksum wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "9742fc4860f47bede1090a5e4b0cfc33afcd70cfdf45dd28f2cfb02d4662b0dd"
1013+"checksum wasm-bindgen-backend 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "c6d7f35ecbb4180513cdb9b298543321bcb278670730415cbb3205ff2c66a477"
1014+"checksum wasm-bindgen-futures 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "67bfbec85e48e8915b6acfa1c4d90b770ce033c96dc2067688f3bccd00d3b9e1"
1015+"checksum wasm-bindgen-macro 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "e3c86b06bcd28e92e87d2c2ad208889b2f69ea33f79810b91ef660cc3de65a4c"
1016+"checksum wasm-bindgen-macro-support 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "81d7338dd8c67e193d8ef18e5802dc03d8710456baa792c1c2e66847e57fd389"
1017+"checksum wasm-bindgen-shared 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "0d57c3b66f2f3e4d96b50f49b7b7e2f4cfcddc88b15744433c98c5c105b26672"
1018+"checksum wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "85bbc3ad78a8d59a63a02d59345e8da9a3e0c1617f79e77fd1c3da6e047db63e"
1019+"checksum wasm-bindgen-test-macro 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "114dfdf01bd3659dd79db05480fbd2751759d1c79cd9edc22f2fe611c866e932"
1020+"checksum wasm-bindgen-webidl 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "fc7052a577eefce17a439edfce5c2eedc8432fe7457bbe949624cdf946233fa7"
1021+"checksum web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "72d02003924c77af871ad74216f828b6e32af776cbb3f5dab3dcde2f2713c012"
1022+"checksum weedle 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "26a4c67f132386d965390b8a734d5d10adbcd30eb5cc74bd9229af8b83f10044"
1023+"checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0"
10331024"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
10341025"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"
10351026"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
1027+"checksum wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba"
Cargo.toml+15−28
@@ -8,7 +8,7 @@ license = "MPL-2.0"
88name = "dodrio"
99readme = "./README.md"
1010repository = "https://github.com/fitzgen/dodrio"
11−version = "0.2.0"
11+version = "0.1.0"
1212
1313[badges]
1414travis-ci = { repository = "fitzgen/dodrio" }
@@ -29,31 +29,22 @@ harness = false
2929required-features = ["xxx-unstable-internal-use-only"]
3030
3131[features]
32−# Don't rely on this feature! Its behavior will change and it could go away at
33−# any time. This enables monkey-patching DOM methods so that we wrap them and
34−# trace what DOM methods are used and how many times they are invoked when
35−# applying our emitted change lists to the physical DOM. This is useful for
36−# evaluating the differences between how Dodrio applies changes from virtual
37−# nodes to the physical DOM versus how other virtual DOM libraries do the same.
38−xxx-unstable-strace = []
39−
4032# Don't use this feature! It only exists for exposing otherwise-internal APIs
4133# for testing and benchmarks.
4234xxx-unstable-internal-use-only = []
4335
4436[dependencies]
45−bumpalo = "2.6.0"
46−cfg-if = "0.1.10"
37+bumpalo = "2.3.0"
38+cfg-if = "0.1.7"
39+futures = "0.1.26"
40+wasm-bindgen = "0.2.39"
41+wasm-bindgen-futures = "0.3.16"
42+js-sys = "0.3.16"
4743fxhash = "0.2.1"
48−js-sys = "0.3.32"
49−log = { version = "0.4.11", optional = true }
50−longest-increasing-subsequence = "0.1.0"
51−serde = { version = "1.0.114", optional = true }
52−wasm-bindgen = "0.2.55"
53−wasm-bindgen-futures = "0.4.5"
44+log = { version = "0.4.6", optional = true }
5445
5546[dependencies.web-sys]
56−version = "0.3.32"
47+version = "0.3.16"
5748features = [
5849 "console",
5950 "Document",
@@ -64,14 +55,13 @@ features = [
6455]
6556
6657[dev-dependencies]
67−console_log = "0.2.0"
68−dodrio-js-api = { version = "=0.2.0", path = "./crates/js-api" }
69−futures = "0.3.5"
70−log = "0.4.11"
71−wasm-bindgen-test = "0.3.5"
58+console_log = "0.1.2"
59+dodrio-js-api = { version = "=0.1.0", path = "./crates/js-api" }
60+log = "0.4.6"
61+wasm-bindgen-test = "0.2.39"
7262
7363[dev-dependencies.web-sys]
74−version = "0.3.32"
64+version = "0.3.16"
7565features = [
7666 "Attr",
7767 "EventTarget",
@@ -81,10 +71,7 @@ features = [
8171]
8272
8373[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
84−criterion = "0.3.3"
85−
86−[profile.bench]
87−debug = true
74+criterion = "0.2.10"
8875
8976[profile.release]
9077incremental = false
README.md−9
@@ -57,15 +57,6 @@ directory](https://github.com/fitzgen/dodrio/tree/master/examples), including:
5757* [`js-component`](https://github.com/fitzgen/dodrio/tree/master/examples/js-component):
5858 Defines a rendering component in JavaScript with the `dodrio-js-api` crate.
5959
60−## Cargo Features
61−
62−* `log` — enable debugging-oriented log messages with the `log` crate's
63− facade. You still have to initialize a logger for the messages to go anywhere,
64− such as [`console_log`](https://github.com/iamcodemaker/console_log).
65−
66−* `serde` — enable `serde::{Serialize, Deserialize}` implementations for
67− `Cached<R>` where `R` is serializable and deserializable.
68−
6960## Design
7061
7162### Bump Allocation
benches/benches.rs+24−13
@@ -13,20 +13,19 @@ use dodrio::{
1313 CachedSet, Node, Render, RenderContext, Vdom,
1414};
1515use std::cell::RefCell;
16−use std::convert::TryInto;
1716
1817/// The simplest thing we can render: `<div/>`.
1918struct Empty;
20−impl<'a> Render<'a> for Empty {
21− fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
19+impl Render for Empty {
20+ fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
2221 div(&cx).finish()
2322 }
2423}
2524
2625/// Render a list that is `self.0` items long, has attributes and listeners.
2726struct SimpleList(usize);
28−impl<'a> Render<'a> for SimpleList {
29− fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
27+impl Render for SimpleList {
28+ fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
3029 let mut children = bumpalo::collections::Vec::with_capacity_in(self.0, cx.bump);
3130 children.extend((0..self.0).map(|_| {
3231 li(&cx)
@@ -47,10 +46,9 @@ fn criterion_benchmark(c: &mut Criterion) {
4746 Benchmark::new("empty", {
4847 let mut bump = Bump::new();
4948 let cached_set = RefCell::new(CachedSet::default());
50− let mut templates = Default::default();
5149 move |b| {
5250 bump.reset();
53− let mut cx = RenderContext::new(&bump, &cached_set, &mut templates);
51+ let mut cx = RenderContext::new(&bump, &cached_set);
5452 b.iter(|| {
5553 black_box(Empty.render(&mut cx));
5654 })
@@ -65,18 +63,24 @@ fn criterion_benchmark(c: &mut Criterion) {
6563 {
6664 let mut bump = Bump::new();
6765 let cached_set = RefCell::new(CachedSet::default());
68− let mut templates = Default::default();
6966 move |b, n| {
7067 bump.reset();
71− let mut cx = RenderContext::new(&bump, &cached_set, &mut templates);
68+ let mut cx = RenderContext::new(&bump, &cached_set);
7269 b.iter(|| {
7370 black_box(SimpleList(*n).render(&mut cx));
7471 })
7572 }
7673 },
77− vec![100, 1_000, 10_000],
74+ vec![
75+ // TODO: Only test one `n` value until
76+ // https://github.com/bheisler/criterion.rs/issues/269 is fixed.
77+ //
78+ // 100,
79+ // 1_000,
80+ 10_000,
81+ ],
7882 )
79− .throughput(|n| Throughput::Elements((*n).try_into().unwrap())),
83+ .throughput(|n| Throughput::Elements(*n as u32)),
8084 );
8185
8286 c.bench(
@@ -90,7 +94,14 @@ fn criterion_benchmark(c: &mut Criterion) {
9094 black_box(&vdom);
9195 })
9296 },
93− vec![100, 1_000, 10_000],
97+ vec![
98+ // TODO: Only test one `n` value until
99+ // https://github.com/bheisler/criterion.rs/issues/269 is fixed.
100+ //
101+ // 100,
102+ // 1_000,
103+ 10_000,
104+ ],
94105 )
95106 .with_function("empty-to-full-list-to-empty", |b, &n| {
96107 b.iter(|| {
@@ -110,7 +121,7 @@ fn criterion_benchmark(c: &mut Criterion) {
110121 black_box(&vdom);
111122 })
112123 })
113− .throughput(|n| Throughput::Elements((*n).try_into().unwrap())),
124+ .throughput(|n| Throughput::Elements(*n as u32)),
114125 );
115126}
116127
build.sh+2−2
@@ -4,8 +4,8 @@ cd $(dirname $0)
44set -eux
55
66cargo fmt --all || true
7−cargo build --all --target wasm32-unknown-unknown
7+cargo check --all --target wasm32-unknown-unknown
88
99for x in ./examples/*; do
10− wasm-pack build --target web "$x"
10+ wasm-pack build --target no-modules "$x"
1111done
crates/js-api/Cargo.toml+7−6
@@ -7,16 +7,17 @@ keywords = ["javascript", "js", "vdom", "virtual-dom"]
77license = "MPL-2.0"
88name = "dodrio-js-api"
99repository = "https://github.com/fitzgen/dodrio"
10−version = "0.2.0"
10+version = "0.1.0"
1111
1212[badges]
1313travis-ci = { repository = "fitzgen/dodrio" }
1414
1515[dependencies]
16−dodrio = { version = "=0.2.0", path = "../.." }
17−wasm-bindgen = "0.2.55"
18−js-sys = "0.3.32"
19−wasm-bindgen-futures = "0.4.5"
16+dodrio = { version = "=0.1.0", path = "../.." }
17+wasm-bindgen = "0.2.39"
18+js-sys = "0.3.16"
19+wasm-bindgen-futures = "0.3.16"
20+futures = "0.1.26"
2021
2122[dev-dependencies]
22−wasm-bindgen-test = "0.3.5"
23+wasm-bindgen-test = "0.2.39"
crates/js-api/src/lib.rs+10−13
@@ -99,8 +99,8 @@ impl GreetingViaJs {
9999
100100/// And finally the `Render` implementation! This adds a `<p>` element and some
101101/// text around whatever the inner JS `Greeting` component renders.
102−impl<'a> Render<'a> for GreetingViaJs {
103− fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
102+impl Render for GreetingViaJs {
103+ fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
104104 use dodrio::builder::*;
105105 p(&cx)
106106 .children([
@@ -116,6 +116,7 @@ impl<'a> Render<'a> for GreetingViaJs {
116116#![deny(missing_docs, missing_debug_implementations)]
117117
118118use dodrio::{builder, bumpalo, Node, Render, RenderContext};
119+use futures::prelude::*;
119120use js_sys::{Object, Promise, Reflect};
120121use wasm_bindgen::prelude::*;
121122use wasm_bindgen::JsCast;
@@ -184,16 +185,12 @@ impl VdomWeak {
184185 /// Schedule re-rendering of the virtual DOM. A promise is returned that is
185186 /// resolved after the rendering has happened.
186187 pub fn render(&self) -> Promise {
187− let future = self.inner.render();
188−
189− wasm_bindgen_futures::future_to_promise(async move {
190− if let Err(e) = future.await {
188+ wasm_bindgen_futures::future_to_promise(
189+ self.inner.render().map(|_| JsValue::null()).map_err(|e| {
191190 let msg = e.to_string();
192− Err(js_sys::Error::new(&msg).into())
193− } else {
194− Ok(JsValue::null())
195− }
196− })
191+ js_sys::Error::new(&msg).into()
192+ }),
193+ )
197194 }
198195}
199196
@@ -216,8 +213,8 @@ impl JsRender {
216213 }
217214}
218215
219−impl<'a> Render<'a> for JsRender {
220− fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
216+impl Render for JsRender {
217+ fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
221218 create(cx, self.render())
222219 }
223220}
examples/counter/Cargo.toml+5−5
@@ -11,13 +11,13 @@ crate-type = ["cdylib"]
1111
1212[dependencies]
1313console_error_panic_hook = "0.1.6"
14−console_log = "0.2.0"
14+console_log = "0.1.2"
1515dodrio = { path = "../.." }
16−log = "0.4.11"
17−wasm-bindgen = "0.2.55"
16+log = "0.4.6"
17+wasm-bindgen = "0.2.39"
1818
1919[dependencies.web-sys]
20−version = "0.3.32"
20+version = "0.3.16"
2121features = [
2222 "console",
2323 "Document",
@@ -30,4 +30,4 @@ features = [
3030]
3131
3232[dev-dependencies]
33−wasm-bindgen-test = "0.3.5"
33+wasm-bindgen-test = "0.2.39"
examples/counter/README.md+1−1
@@ -9,7 +9,7 @@ See `src/lib.rs`.
99## Build
1010
1111```
12−wasm-pack build --target web
12+wasm-pack build --target no-modules
1313```
1414
1515## Serve
examples/counter/index.html+3−3
@@ -5,9 +5,9 @@
55 <title>Counter</title>
66 </head>
77 <body>
8− <script type="module">
9− import init from "./pkg/dodrio_counter.js";
10− init("./pkg/dodrio_counter_bg.wasm");
8+ <script src="pkg/dodrio_counter.js"></script>
9+ <script>
10+ wasm_bindgen("pkg/dodrio_counter_bg.wasm");
1111 </script>
1212 </body>
1313</html>
examples/counter/src/lib.rsmode 100755 → 100644+4−5
@@ -1,4 +1,4 @@
1−use dodrio::{bumpalo, Node, Render, RenderContext};
1+use dodrio::{bumpalo, Render, RenderContext};
22use log::*;
33use wasm_bindgen::prelude::*;
44
@@ -26,8 +26,8 @@ impl Counter {
2626
2727// The `Render` implementation for `Counter`s displays the current count and has
2828// buttons to increment and decrement the count.
29−impl<'a> Render<'a> for Counter {
30− fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
29+impl Render for Counter {
30+ fn render<'a>(&self, cx: &mut RenderContext<'a>) -> dodrio::Node<'a> {
3131 use dodrio::builder::*;
3232
3333 // Stringify the count as a bump-allocated string.
@@ -54,8 +54,7 @@ impl<'a> Render<'a> for Counter {
5454 button(&cx)
5555 .on("click", |root, vdom, _event| {
5656 // Same as above, but decrementing instead of incrementing.
57− let counter = root.unwrap_mut::<Counter>();
58− counter.decrement();
57+ root.unwrap_mut::<Counter>().decrement();
5958 vdom.schedule_render();
6059 })
6160 .children([text("-")])
examples/game-of-life/Cargo.toml+6−5
@@ -11,13 +11,14 @@ crate-type = ["cdylib"]
1111
1212[dependencies]
1313dodrio = { path = "../.." }
14−wasm-bindgen = "0.2.55"
14+wasm-bindgen = "0.2.39"
1515console_error_panic_hook = "0.1.6"
16−js-sys = "0.3.32"
17−wasm-bindgen-futures = "0.4.5"
16+js-sys = "0.3.16"
17+wasm-bindgen-futures = "0.3.16"
18+futures = "0.1.26"
1819
1920[dependencies.web-sys]
20−version = "0.3.32"
21+version = "0.3.16"
2122features = [
2223 "Document",
2324 "HtmlElement",
@@ -26,4 +27,4 @@ features = [
2627]
2728
2829[dev-dependencies]
29−wasm-bindgen-test = "0.3.5"
30+wasm-bindgen-test = "0.2.39"
examples/game-of-life/README.md+1−1
@@ -11,7 +11,7 @@ See `src/lib.rs`.
1111## Build
1212
1313```
14−wasm-pack build --target web
14+wasm-pack build --target no-modules
1515```
1616
1717## Serve
examples/game-of-life/index.htmlmode 100755 → 100644+6−3
@@ -19,6 +19,9 @@
1919 padding: 0;
2020 }
2121
22+ .universe {
23+ }
24+
2225 body {
2326 width: 100vw;
2427 height: 100vh;
@@ -36,9 +39,9 @@
3639 </style>
3740 </head>
3841 <body>
39− <script type="module">
40− import init from "./pkg/dodrio_game_of_life.js";
41− init("./pkg/dodrio_game_of_life_bg.wasm");
42+ <script src="pkg/dodrio_game_of_life.js"></script>
43+ <script>
44+ wasm_bindgen("pkg/dodrio_game_of_life_bg.wasm");
4245 </script>
4346 </body>
4447</html>
examples/game-of-life/src/lib.rs+13−18
@@ -1,4 +1,5 @@
11use dodrio::{bumpalo, Node, Render, RenderContext, Vdom};
2+use futures::prelude::*;
23use std::cell::RefCell;
34use std::rc::Rc;
45use wasm_bindgen::{prelude::*, JsCast};
@@ -126,8 +127,8 @@ impl Universe {
126127}
127128
128129/// The rendering implementation for our Game of Life.
129−impl<'a> Render<'a> for Universe {
130− fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
130+impl Render for Universe {
131+ fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
131132 use dodrio::builder::*;
132133
133134 let mut rows = bumpalo::collections::Vec::with_capacity_in(self.height as usize, cx.bump);
@@ -171,32 +172,26 @@ pub fn run() {
171172 // Create a new Game of Life `Universe` render component.
172173 let universe = Universe::new();
173174
174− // Create a virtual DOM and mount it and the `Universe` render component to the
175+ // Create a virtual DOM and mount it and the `Hello` render component to the
175176 // `<body>`.
176177 let vdom = Vdom::new(body.as_ref(), universe);
177178
178179 // Kick off a loop that keeps computing a tick of the universe and then
179180 // re-rendering on every animation frame.
180− let rc = <Rc<RefCell<Option<Closure<dyn FnMut()>>>>>::default();
181+ let rc: Rc<RefCell<Option<Closure<FnMut()>>>> = Rc::new(RefCell::new(None));
181182 let rc2 = rc.clone();
182183 let window2 = window.clone();
183184 let weak = vdom.weak();
184185 let f = Closure::wrap(Box::new(move || {
185186 weak.schedule_render();
186187
187− wasm_bindgen_futures::spawn_local({
188− let weak = weak.clone();
189− async move {
190− let fut = weak.with_component(|root| {
191− let universe = root.unwrap_mut::<Universe>();
192− universe.tick();
193− });
194−
195− if fut.await.is_err() {
196− wasm_bindgen::throw_str("impossible, we always keep the vdom alive");
197− }
198− }
199− });
188+ wasm_bindgen_futures::spawn_local(
189+ weak.with_component(|root| {
190+ let universe = root.unwrap_mut::<Universe>();
191+ universe.tick();
192+ })
193+ .map_err(|_| wasm_bindgen::throw_str("impossible, we always keep the vdom alive")),
194+ );
200195
201196 window
202197 .request_animation_frame(
@@ -207,7 +202,7 @@ pub fn run() {
207202 .unchecked_ref::<js_sys::Function>(),
208203 )
209204 .unwrap_throw();
210− }) as Box<dyn FnMut()>);
205+ }) as Box<FnMut()>);
211206 window2
212207 .request_animation_frame(f.as_ref().unchecked_ref::<js_sys::Function>())
213208 .unwrap_throw();
examples/hello-world/Cargo.toml+3−3
@@ -11,11 +11,11 @@ crate-type = ["cdylib"]
1111
1212[dependencies]
1313dodrio = { path = "../.." }
14−wasm-bindgen = "0.2.55"
14+wasm-bindgen = "0.2.39"
1515console_error_panic_hook = "0.1.6"
1616
1717[dependencies.web-sys]
18−version = "0.3.32"
18+version = "0.3.16"
1919features = [
2020 "Document",
2121 "HtmlElement",
@@ -24,4 +24,4 @@ features = [
2424]
2525
2626[dev-dependencies]
27−wasm-bindgen-test = "0.3.5"
27+wasm-bindgen-test = "0.2.39"
examples/hello-world/README.md+1−1
@@ -9,7 +9,7 @@ See `src/lib.rs`.
99## Build
1010
1111```
12−wasm-pack build --target web
12+wasm-pack build --target no-modules
1313```
1414
1515## Serve
examples/hello-world/index.html+3−3
@@ -5,9 +5,9 @@
55 <title>Hello, World!</title>
66 </head>
77 <body>
8− <script type="module">
9− import init from "./pkg/dodrio_hello_world.js";
10− init("./pkg/dodrio_hello_world_bg.wasm");
8+ <script src="pkg/dodrio_hello_world.js"></script>
9+ <script>
10+ wasm_bindgen("pkg/dodrio_hello_world_bg.wasm");
1111 </script>
1212 </body>
1313</html>
examples/hello-world/src/lib.rs+2−2
@@ -10,8 +10,8 @@ struct Hello {
1010
1111// The `Render` implementation describes how to render a `Hello` component into
1212// HTML.
13−impl<'a> Render<'a> for Hello {
14− fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
13+impl Render for Hello {
14+ fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
1515 let msg = bumpalo::format!(in cx.bump, "Hello, {}!", self.who);
1616 let msg = msg.into_bump_str();
1717 p(&cx).children([text(msg)]).finish()
examples/input-form/Cargo.toml+3−3
@@ -11,11 +11,11 @@ crate-type = ["cdylib"]
1111
1212[dependencies]
1313dodrio = { path = "../.." }
14−wasm-bindgen = "0.2.55"
14+wasm-bindgen = "0.2.39"
1515console_error_panic_hook = "0.1.6"
1616
1717[dependencies.web-sys]
18−version = "0.3.32"
18+version = "0.3.16"
1919features = [
2020 "console",
2121 "Document",
@@ -29,4 +29,4 @@ features = [
2929]
3030
3131[dev-dependencies]
32−wasm-bindgen-test = "0.3.5"
32+wasm-bindgen-test = "0.2.39"
examples/input-form/README.md+1−1
@@ -10,7 +10,7 @@ See `src/lib.rs`.
1010## Build
1111
1212```
13−wasm-pack build --target web
13+wasm-pack build --target no-modules
1414```
1515
1616## Serve
examples/input-form/index.html+3−3
@@ -5,9 +5,9 @@
55 <title>Input Form</title>
66 </head>
77 <body>
8− <script type="module">
9− import init from "./pkg/dodrio_input_form.js";
10− init("./pkg/dodrio_input_form_bg.wasm");
8+ <script src="pkg/dodrio_input_form.js"></script>
9+ <script>
10+ wasm_bindgen("pkg/dodrio_input_form_bg.wasm");
1111 </script>
1212 </body>
1313</html>
examples/input-form/src/lib.rs+2−2
@@ -23,8 +23,8 @@ impl SayHelloTo {
2323
2424// The `Render` implementation has a text `<input>` and a `<div>` that shows a
2525// greeting to the `<input>`'s value.
26−impl<'a> Render<'a> for SayHelloTo {
27− fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
26+impl Render for SayHelloTo {
27+ fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
2828 use dodrio::builder::*;
2929
3030 div(&cx)
examples/js-component/Cargo.toml+3−3
@@ -12,12 +12,12 @@ crate-type = ["cdylib"]
1212[dependencies]
1313dodrio = { path = "../.." }
1414dodrio-js-api = { path = "../../crates/js-api" }
15−wasm-bindgen = "0.2.55"
15+wasm-bindgen = "0.2.39"
1616console_error_panic_hook = "0.1.6"
17−js-sys = "0.3.32"
17+js-sys = "0.3.16"
1818
1919[dependencies.web-sys]
20−version = "0.3.32"
20+version = "0.3.16"
2121features = [
2222 "Document",
2323 "HtmlElement",
examples/js-component/README.md+1−1
@@ -11,7 +11,7 @@ See `src/lib.rs` for the Rust code.
1111## Build
1212
1313```
14−wasm-pack build --target web
14+wasm-pack build --target no-modules
1515```
1616
1717## Serve
examples/js-component/index.html+3−3
@@ -6,9 +6,9 @@
66 </head>
77 <body>
88 <script src="greeting.js"></script>
9− <script type="module">
10− import init from "./pkg/dodrio_js_component.js";
11− init("./pkg/dodrio_js_component_bg.wasm");
9+ <script src="pkg/dodrio_js_component.js"></script>
10+ <script>
11+ wasm_bindgen("pkg/dodrio_js_component_bg.wasm");
1212 </script>
1313 </body>
1414</html>
examples/js-component/src/lib.rs+3−3
@@ -31,8 +31,8 @@ impl GreetingViaJs {
3131
3232/// Here's the `Render` implementation! This adds a `<p>` element and some text
3333/// around whatever the inner JS `Greeting` component renders.
34−impl<'a> Render<'a> for GreetingViaJs {
35− fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
34+impl Render for GreetingViaJs {
35+ fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
3636 use dodrio::builder::*;
3737 p(&cx)
3838 .children([text("JavaScript says: "), self.js.render(cx)])
@@ -54,7 +54,7 @@ pub fn run() {
5454 // Create a new `GreetingViaJs` render component.
5555 let component = GreetingViaJs::new("World");
5656
57− // Create a virtual DOM and mount it and the `GreetingViaJs` render component to the
57+ // Create a virtual DOM and mount it and the `Hello` render component to the
5858 // `<body>`.
5959 let vdom = Vdom::new(body.as_ref(), component);
6060
examples/moire/Cargo.toml+9−8
@@ -8,19 +8,20 @@ edition = "2018"
88crate-type = ["cdylib"]
99
1010[dependencies]
11−cfg-if = "0.1.10"
11+cfg-if = "0.1.7"
1212dodrio = { path = "../.." }
13−log = "0.4.11"
14−wasm-bindgen = "0.2.55"
15−wasm-bindgen-futures = "0.4.5"
13+futures = "0.1.26"
14+log = "0.4.6"
15+wasm-bindgen = "0.2.39"
16+wasm-bindgen-futures = "0.3.16"
1617
1718# Optional dependencies for logging.
1819console_error_panic_hook = { optional = true, version = "0.1.6" }
19−console_log = { optional = true, version = "0.2.0" }
20−js-sys = "0.3.32"
20+console_log = { optional = true, version = "0.1.2" }
21+js-sys = "0.3.16"
2122
2223[dependencies.web-sys]
23−version = "0.3.32"
24+version = "0.3.16"
2425features = [
2526 "Document",
2627 "Element",
@@ -34,7 +35,7 @@ features = [
3435]
3536
3637[dev-dependencies]
37−wasm-bindgen-test = "0.3.5"
38+wasm-bindgen-test = "0.2.39"
3839
3940[features]
4041logging = [
examples/moire/README.md+1−1
@@ -14,7 +14,7 @@ conversion and other color utilities.
1414## Build
1515
1616```
17−wasm-pack build --target web
17+wasm-pack build --target no-modules
1818```
1919
2020## Serve
examples/moire/index.html+3−3
@@ -42,9 +42,9 @@
4242 <body>
4343 <code>FPS: <output id="fps"></code></code>
4444 <div id="scene"></div>
45− <script type="module">
46− import init from "./pkg/dodrio_moire.js";
47− init("./pkg/dodrio_moire_bg.wasm");
45+ <script src="pkg/dodrio_moire.js"></script>
46+ <script>
47+ wasm_bindgen("pkg/dodrio_moire_bg.wasm");
4848 </script>
4949 <script>
5050 let lastTime = 0
examples/moire/src/lib.rs+7−6
@@ -5,7 +5,8 @@ use dodrio::{bumpalo, Node, Render, RenderContext, Vdom};
55use std::cell::RefCell;
66use std::rc::Rc;
77use std::str;
8−use wasm_bindgen::{prelude::*, JsCast};
8+use wasm_bindgen::prelude::*;
9+use wasm_bindgen::JsCast;
910
1011/// This is the main function that is automatically invoked when the wasm module
1112/// is loaded.
@@ -22,12 +23,12 @@ pub fn run() {
2223 // Create a new `Moire` render component.
2324 let component = Moire::new();
2425
25− // Create a virtual DOM and mount it and the `Moire` render component to the
26+ // Create a virtual DOM and mount it and the `Hello` render component to the
2627 // scene.
2728 let vdom = Vdom::new(&scene, component);
2829
2930 // Kick off a loop that keeps re-rendering on every animation frame.
30− let rc = <Rc<RefCell<Option<Closure<dyn FnMut()>>>>>::default();
31+ let rc: Rc<RefCell<Option<Closure<FnMut()>>>> = Rc::new(RefCell::new(None));
3132 let rc2 = rc.clone();
3233 let window2 = window.clone();
3334 let weak = vdom.weak();
@@ -42,7 +43,7 @@ pub fn run() {
4243 .unchecked_ref::<js_sys::Function>(),
4344 )
4445 .unwrap_throw();
45− }) as Box<dyn FnMut()>);
46+ }) as Box<FnMut()>);
4647 window2
4748 .request_animation_frame(f.as_ref().unchecked_ref::<js_sys::Function>())
4849 .unwrap_throw();
@@ -104,8 +105,8 @@ impl Moire {
104105 }
105106}
106107
107−impl<'a> Render<'a> for Moire {
108− fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
108+impl Render for Moire {
109+ fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
109110 use dodrio::builder::*;
110111
111112 let elapsed = web_sys::window()
examples/sierpinski-triangle/Cargo.toml+6−5
@@ -9,13 +9,14 @@ crate-type = ["cdylib"]
99
1010[dependencies]
1111dodrio = { path = "../.." }
12−wasm-bindgen = "0.2.55"
12+wasm-bindgen = "0.2.39"
1313console_error_panic_hook = "0.1.6"
14−js-sys = "0.3.32"
15−wasm-bindgen-futures = "0.4.5"
14+js-sys = "0.3.16"
15+wasm-bindgen-futures = "0.3.16"
16+futures = "0.1.26"
1617
1718[dependencies.web-sys]
18−version = "0.3.32"
19+version = "0.3.16"
1920features = [
2021 "Document",
2122 "HtmlElement",
@@ -25,4 +26,4 @@ features = [
2526]
2627
2728[dev-dependencies]
28−wasm-bindgen-test = "0.3.5"
29+wasm-bindgen-test = "0.2.39"
examples/sierpinski-triangle/README.mdmode 100755 → 100644+2−2
@@ -12,7 +12,7 @@ See `src/lib.rs`.
1212## Build
1313
1414```
15−wasm-pack build --target web
15+wasm-pack build --target no-modules
1616```
1717
1818## Serve
@@ -20,5 +20,5 @@ wasm-pack build --target web
2020Use any HTTP server, for example:
2121
2222```
23−python -m SimpleHTTPServer
23+python -m http.server
2424```
examples/sierpinski-triangle/index.html+4−4
@@ -39,9 +39,9 @@
3939 <code>FPS: <output id="fps">...</output></code>
4040 <div id="scene"></div>
4141
42− <script type="module">
43− import init from "./pkg/dodrio_sierpinski.js";
44− init("./pkg/dodrio_sierpinski_bg.wasm");
42+ <script src="pkg/dodrio_sierpinski.js"></script>
43+ <script>
44+ wasm_bindgen("pkg/dodrio_sierpinski_bg.wasm");
4545 </script>
4646
4747 <script>
@@ -66,4 +66,4 @@
6666 </script>
6767</body>
6868
69−</html>
69+</html>
examples/sierpinski-triangle/src/lib.rs+6−5
@@ -1,7 +1,8 @@
11use dodrio::{bumpalo, Node, Render, RenderContext, Vdom};
22use std::cell::RefCell;
33use std::rc::Rc;
4−use wasm_bindgen::{prelude::*, JsCast};
4+use wasm_bindgen::prelude::*;
5+use wasm_bindgen::JsCast;
56use web_sys::Window;
67
78// Triangle container defining target size.
@@ -85,8 +86,8 @@ impl Container {
8586 }
8687}
8788
88−impl<'a> Render<'a> for Container {
89− fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
89+impl Render for Container {
90+ fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
9091 use dodrio::builder::div;
9192
9293 let elapsed = web_sys::window()
@@ -111,7 +112,7 @@ impl<'a> Render<'a> for Container {
111112
112113// Kick off a loop that keeps re-rendering on every animation frame.
113114fn animate(window: Window, vdom: Vdom) {
114− let rc = <Rc<RefCell<Option<Closure<dyn FnMut()>>>>>::default();
115+ let rc: Rc<RefCell<Option<Closure<FnMut()>>>> = Rc::new(RefCell::new(None));
115116 let rc2 = rc.clone();
116117 let window2 = window.clone();
117118 let weak = vdom.weak();
@@ -126,7 +127,7 @@ fn animate(window: Window, vdom: Vdom) {
126127 .unchecked_ref::<js_sys::Function>(),
127128 )
128129 .unwrap_throw();
129− }) as Box<dyn FnMut()>);
130+ }) as Box<FnMut()>);
130131 window2
131132 .request_animation_frame(f.as_ref().unchecked_ref::<js_sys::Function>())
132133 .unwrap_throw();
examples/todomvc/Cargo.toml+12−11
@@ -5,21 +5,22 @@ name = "dodrio-todomvc"
55version = "0.1.0"
66
77[dependencies]
8−cfg-if = "0.1.10"
9−dodrio = { path = "../..", features = ["serde"] }
10−js-sys = "0.3.32"
11−serde = { features = ["derive"], version = "1.0.114" }
12−serde_json = "1.0.57"
13−wasm-bindgen = "0.2.55"
14−wasm-bindgen-futures = "0.4.5"
8+cfg-if = "0.1.7"
9+dodrio = { path = "../.." }
10+futures = "0.1.26"
11+js-sys = "0.3.16"
12+serde = { features = ["derive"], version = "1.0.89" }
13+serde_json = "1.0.39"
14+wasm-bindgen = "0.2.39"
15+wasm-bindgen-futures = "0.3.16"
1516
1617# Optional dependencies for logging.
1718console_error_panic_hook = { optional = true, version = "0.1.6" }
18−console_log = { optional = true, version = "0.2.0" }
19−log = { optional = true, version = "0.4.11" }
19+console_log = { optional = true, version = "0.1.2" }
20+log = { optional = true, version = "0.4.6" }
2021
2122[dependencies.web-sys]
22−version = "0.3.32"
23+version = "0.3.16"
2324features = [
2425 "Document",
2526 "Event",
@@ -34,7 +35,7 @@ features = [
3435]
3536
3637[dev-dependencies]
37−wasm-bindgen-test = "0.3.5"
38+wasm-bindgen-test = "0.2.39"
3839
3940[features]
4041logging = [
examples/todomvc/README.md+1−1
@@ -21,7 +21,7 @@ most important are:
2121## Build
2222
2323```
24−wasm-pack build --target web
24+wasm-pack build --target no-modules
2525```
2626
2727## Serve
examples/todomvc/index.html+3−3
@@ -13,9 +13,9 @@
1313 <footer class="info">
1414 <p>Double-click to edit a todo</p>
1515 </footer>
16− <script type="module">
17− import init from "./pkg/dodrio_todomvc.js";
18− init("./pkg/dodrio_todomvc_bg.wasm");
16+ <script src="pkg/dodrio_todomvc.js"></script>
17+ <script>
18+ wasm_bindgen("pkg/dodrio_todomvc_bg.wasm");
1919 </script>
2020 </body>
2121</html>
examples/todomvc/src/router.rsmode 100755 → 100644+21−23
@@ -4,8 +4,10 @@ use crate::todos::Todos;
44use crate::utils;
55use crate::visibility::Visibility;
66use dodrio::VdomWeak;
7+use futures::prelude::*;
78use std::str::FromStr;
8−use wasm_bindgen::{prelude::*, JsCast};
9+use wasm_bindgen::prelude::*;
10+use wasm_bindgen::JsCast;
911
1012/// Start the router.
1113pub fn start(vdom: VdomWeak) {
@@ -28,27 +30,23 @@ pub fn start(vdom: VdomWeak) {
2830 v
2931 });
3032
31− wasm_bindgen_futures::spawn_local({
32− let vdom = vdom.clone();
33− async move {
34− let _ = vdom
35− .with_component({
36− let vdom = vdom.clone();
37− move |root| {
38− let todos = root.unwrap_mut::<Todos>();
39− // If the todos' visibility already matches the event's
40− // visibility, then there is nothing to do (ha). If they
41− // don't match, then we need to update the todos' visibility
42− // and re-render.
43− if todos.visibility() != new_vis {
44− todos.set_visibility(new_vis);
45− vdom.schedule_render();
46− }
47− }
48− })
49− .await;
50− }
51− });
33+ wasm_bindgen_futures::spawn_local(
34+ vdom.with_component({
35+ let vdom = vdom.clone();
36+ move |root| {
37+ let todos = root.unwrap_mut::<Todos>();
38+ // If the todos' visibility already matches the event's
39+ // visibility, then there is nothing to do (ha). If they
40+ // don't match, then we need to update the todos' visibility
41+ // and re-render.
42+ if todos.visibility() != new_vis {
43+ todos.set_visibility(new_vis);
44+ vdom.schedule_render();
45+ }
46+ }
47+ })
48+ .map_err(|_| ()),
49+ );
5250 };
5351
5452 // Call it once to handle the initial `#` fragment.
@@ -59,7 +57,7 @@ pub fn start(vdom: VdomWeak) {
5957 // Note that if we ever intended to unmount our todos app, we would want to
6058 // provide a method for removing this router's event listener and cleaning
6159 // up after ourselves.
62− let on_hash_change = Closure::wrap(Box::new(on_hash_change) as Box<dyn FnMut()>);
60+ let on_hash_change = Closure::wrap(Box::new(on_hash_change) as Box<FnMut()>);
6361 let window = utils::window();
6462 window
6563 .add_event_listener_with_callback("hashchange", on_hash_change.as_ref().unchecked_ref())
examples/todomvc/src/todo.rs+21−77
@@ -1,19 +1,14 @@
11//! Type definition and `dodrio::Render` implementation for a single todo item.
22
33use crate::keys;
4−use dodrio::{Cached, Node, Render, RenderContext, RootRender, VdomWeak};
4+use dodrio::{Node, Render, RenderContext, RootRender, VdomWeak};
55use serde::{Deserialize, Serialize};
66use std::marker::PhantomData;
77use wasm_bindgen::{prelude::*, JsCast};
88
99/// A single todo item.
10−#[derive(Default)]
11−pub struct Todo<C> {
12− inner: Cached<TodoInner<C>>,
13−}
14−
1510#[derive(Serialize, Deserialize)]
16−struct TodoInner<C> {
11+pub struct Todo<C> {
1712 id: usize,
1813 title: String,
1914 completed: bool,
@@ -53,87 +48,68 @@ impl<C> Todo<C> {
5348 let completed = false;
5449 let edits = None;
5550 Todo {
56− inner: Cached::new(TodoInner {
57− id,
58− title,
59− completed,
60− edits,
61− _controller: PhantomData,
62− }),
51+ id,
52+ title,
53+ completed,
54+ edits,
55+ _controller: PhantomData,
6356 }
6457 }
6558
6659 /// Set this todo item's id.
6760 pub fn set_id(&mut self, id: usize) {
68− if id != self.inner.id {
69− Cached::invalidate(&self.inner);
70− }
71− self.inner.id = id;
61+ self.id = id;
7262 }
7363
7464 /// Is this `Todo` complete?
7565 pub fn is_complete(&self) -> bool {
76− self.inner.completed
66+ self.completed
7767 }
7868
7969 /// Mark the `Todo` as complete or not.
8070 pub fn set_complete(&mut self, to: bool) {
81− if to != self.inner.completed {
82− Cached::invalidate(&self.inner);
83− }
84− self.inner.completed = to;
71+ self.completed = to;
8572 }
8673
8774 /// Get this todo's title.
8875 pub fn title(&self) -> &str {
89− &self.inner.title
76+ &self.title
9077 }
9178
9279 /// Set this todo item's title.
9380 pub fn set_title<S: Into<String>>(&mut self, title: S) {
94− let title = title.into();
95− if title != self.inner.title {
96− Cached::invalidate(&self.inner);
97− }
98− self.inner.title = title;
81+ self.title = title.into();
9982 }
10083
10184 /// Set the edits for this todo.
10285 pub fn set_edits<S: Into<String>>(&mut self, edits: Option<S>) {
103− let edits = edits.map(Into::into);
104− if edits != self.inner.edits {
105− Cached::invalidate(&self.inner);
106− }
107− self.inner.edits = edits;
86+ self.edits = edits.map(Into::into);
10887 }
10988
11089 /// Take this todo's edits, leaving `None` in their place.
11190 pub fn take_edits(&mut self) -> Option<String> {
112− if self.inner.edits.is_some() {
113− Cached::invalidate(&self.inner);
114− }
115− self.inner.edits.take()
91+ self.edits.take()
11692 }
11793}
11894
119−impl<'a, C: TodoActions> Render<'a> for Todo<C> {
120− fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
95+impl<C: TodoActions> Render for Todo<C> {
96+ fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
12197 use dodrio::{
12298 builder::*,
12399 bumpalo::{self, collections::String},
124100 };
125101
126− let id = self.inner.id;
127− let title = self.inner.edits.as_ref().unwrap_or(&self.inner.title);
102+ let id = self.id;
103+ let title = self.edits.as_ref().unwrap_or(&self.title);
128104 let title = bumpalo::format!(in cx.bump, "{}", title).into_bump_str();
129105
130106 li(&cx)
131107 .attr("class", {
132108 let mut class = String::new_in(cx.bump);
133− if self.inner.completed {
109+ if self.completed {
134110 class.push_str("completed ");
135111 }
136− if self.inner.edits.is_some() {
112+ if self.edits.is_some() {
137113 class.push_str("editing");
138114 }
139115 class.into_bump_str()
@@ -145,7 +121,7 @@ impl<'a, C: TodoActions> Render<'a> for Todo<C> {
145121 input(&cx)
146122 .attr("class", "toggle")
147123 .attr("type", "checkbox")
148− .bool_attr("checked", self.inner.completed)
124+ .bool_attr("checked", self.completed)
149125 .on("click", move |root, vdom, _event| {
150126 C::toggle_completed(root, vdom, id);
151127 })
@@ -195,35 +171,3 @@ impl<'a, C: TodoActions> Render<'a> for Todo<C> {
195171 .finish()
196172 }
197173}
198−
199−impl<C> Default for TodoInner<C> {
200− fn default() -> Self {
201− TodoInner {
202− id: Default::default(),
203− title: Default::default(),
204− completed: Default::default(),
205− edits: Default::default(),
206− _controller: PhantomData,
207− }
208− }
209−}
210−
211−impl<C> serde::Serialize for Todo<C> {
212− fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
213− where
214− S: serde::Serializer,
215− {
216− self.inner.serialize(serializer)
217− }
218−}
219−
220−impl<'de, C> Deserialize<'de> for Todo<C> {
221− fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
222− where
223− D: serde::Deserializer<'de>,
224− {
225− Ok(Todo {
226− inner: <Cached<TodoInner<C>>>::deserialize(deserializer)?,
227− })
228− }
229−}
examples/todomvc/src/todos.rsmode 100755 → 100644+6−5
@@ -9,7 +9,8 @@ use dodrio::{bumpalo, Node, Render, RenderContext, RootRender, VdomWeak};
99use serde::{Deserialize, Serialize};
1010use std::marker::PhantomData;
1111use std::mem;
12−use wasm_bindgen::{prelude::*, JsCast};
12+use wasm_bindgen::prelude::*;
13+use wasm_bindgen::JsCast;
1314
1415/// A collection of todos.
1516#[derive(Default, Serialize, Deserialize)]
@@ -28,7 +29,7 @@ pub struct Todos<C = Controller> {
2829}
2930
3031/// Actions for `Todos` that can be triggered by UI interactions.
31−pub trait TodosActions: 'static + TodoActions {
32+pub trait TodosActions: TodoActions {
3233 /// Toggle the completion state of all todo items.
3334 fn toggle_all(root: &mut dyn RootRender, vdom: VdomWeak);
3435
@@ -49,7 +50,7 @@ pub trait TodosActions: 'static + TodoActions {
4950impl<C> Todos<C> {
5051 /// Construct a new todos set.
5152 ///
52− /// If an existing set is available in local storage, then use that,
53+ /// If an existing set is available in local storage, then us that,
5354 /// otherwise create a new set.
5455 pub fn new() -> Self
5556 where
@@ -289,8 +290,8 @@ impl<C: TodosActions> Todos<C> {
289290 }
290291}
291292
292−impl<'a, C: TodosActions> Render<'a> for Todos<C> {
293− fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
293+impl<C: TodosActions> Render for Todos<C> {
294+ fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
294295 use dodrio::builder::*;
295296
296297 div(&cx)
js/change-list-interpreter.jsdeleted−377
@@ -1,377 +0,0 @@
1−const decoder = new TextDecoder();
2−
3−function top(stack) {
4− return stack[stack.length - 1];
5−}
6−
7−function string(mem, pointer, length) {
8− const buf = mem.subarray(pointer, pointer + length);
9− return decoder.decode(buf);
10−}
11−
12−const OP_TABLE = [
13− // 0
14− function setText(interpreter, mem8, mem32, i) {
15− const pointer = mem32[i++];
16− const length = mem32[i++];
17− const str = string(mem8, pointer, length);
18− top(interpreter.stack).textContent = str;
19− return i;
20− },
21−
22− // 1
23− function removeSelfAndNextSiblings(interpreter, mem8, mem32, i) {
24− const node = interpreter.stack.pop();
25− let sibling = node.nextSibling;
26− while (sibling) {
27− const temp = sibling.nextSibling;
28− sibling.remove();
29− sibling = temp;
30− }
31− node.remove();
32− return i;
33− },
34−
35− // 2
36− function replaceWith(interpreter, mem8, mem32, i) {
37− const newNode = interpreter.stack.pop();
38− const oldNode = interpreter.stack.pop();
39− oldNode.replaceWith(newNode);
40− interpreter.stack.push(newNode);
41− return i;
42− },
43−
44− // 3
45− function setAttribute(interpreter, mem8, mem32, i) {
46− const nameId = mem32[i++];
47− const valueId = mem32[i++];
48− const name = interpreter.getCachedString(nameId);
49− const value = interpreter.getCachedString(valueId);
50− const node = top(interpreter.stack);
51− node.setAttribute(name, value);
52−
53− // Some attributes are "volatile" and don't work through `setAttribute`.
54− if (name === "value") {
55− node.value = value;
56− }
57− if (name === "checked") {
58− node.checked = true;
59− }
60− if (name === "selected") {
61− node.selected = true;
62− }
63−
64− return i;
65− },
66−
67− // 4
68− function removeAttribute(interpreter, mem8, mem32, i) {
69− const nameId = mem32[i++];
70− const name = interpreter.getCachedString(nameId);
71− const node = top(interpreter.stack);
72− node.removeAttribute(name);
73−
74− // Some attributes are "volatile" and don't work through `removeAttribute`.
75− if (name === "value") {
76− node.value = null;
77− }
78− if (name === "checked") {
79− node.checked = false;
80− }
81− if (name === "selected") {
82− node.selected = false;
83− }
84−
85− return i;
86− },
87−
88− // 5
89− function pushReverseChild(interpreter, mem8, mem32, i) {
90− const n = mem32[i++];
91− const parent = top(interpreter.stack);
92− const children = parent.childNodes;
93− const child = children[children.length - n - 1];
94− interpreter.stack.push(child);
95− return i;
96− },
97−
98− // 6
99− function popPushChild(interpreter, mem8, mem32, i) {
100− const n = mem32[i++];
101− interpreter.stack.pop();
102− const parent = top(interpreter.stack);
103− const children = parent.childNodes;
104− const child = children[n];
105− interpreter.stack.push(child);
106− return i;
107− },
108−
109− // 7
110− function pop(interpreter, mem8, mem32, i) {
111− interpreter.stack.pop();
112− return i;
113− },
114−
115− // 8
116− function appendChild(interpreter, mem8, mem32, i) {
117− const child = interpreter.stack.pop();
118− top(interpreter.stack).appendChild(child);
119− return i;
120− },
121−
122− // 9
123− function createTextNode(interpreter, mem8, mem32, i) {
124− const pointer = mem32[i++];
125− const length = mem32[i++];
126− const text = string(mem8, pointer, length);
127− interpreter.stack.push(document.createTextNode(text));
128− return i;
129− },
130−
131− // 10
132− function createElement(interpreter, mem8, mem32, i) {
133− const tagNameId = mem32[i++];
134− const tagName = interpreter.getCachedString(tagNameId);
135− interpreter.stack.push(document.createElement(tagName));
136− return i;
137− },
138−
139− // 11
140− function newEventListener(interpreter, mem8, mem32, i) {
141− const eventId = mem32[i++];
142− const eventType = interpreter.getCachedString(eventId);
143− const a = mem32[i++];
144− const b = mem32[i++];
145− const el = top(interpreter.stack);
146− el.addEventListener(eventType, interpreter.eventHandler);
147− el[`dodrio-a-${eventType}`] = a;
148− el[`dodrio-b-${eventType}`] = b;
149− return i;
150− },
151−
152− // 12
153− function updateEventListener(interpreter, mem8, mem32, i) {
154− const eventId = mem32[i++];
155− const eventType = interpreter.getCachedString(eventId);
156− const el = top(interpreter.stack);
157− el[`dodrio-a-${eventType}`] = mem32[i++];
158− el[`dodrio-b-${eventType}`] = mem32[i++];
159− return i;
160− },
161−
162− // 13
163− function removeEventListener(interpreter, mem8, mem32, i) {
164− const eventId = mem32[i++];
165− const eventType = interpreter.getCachedString(eventId);
166− const el = top(interpreter.stack);
167− el.removeEventListener(eventType, interpreter.eventHandler);
168− return i;
169− },
170−
171− // 14
172− function addCachedString(interpreter, mem8, mem32, i) {
173− const pointer = mem32[i++];
174− const length = mem32[i++];
175− const id = mem32[i++];
176− const str = string(mem8, pointer, length);
177− interpreter.addCachedString(str, id);
178− return i;
179− },
180−
181− // 15
182− function dropCachedString(interpreter, mem8, mem32, i) {
183− const id = mem32[i++];
184− interpreter.dropCachedString(id);
185− return i;
186− },
187−
188− // 16
189− function createElementNS(interpreter, mem8, mem32, i) {
190− const tagNameId = mem32[i++];
191− const tagName = interpreter.getCachedString(tagNameId);
192− const nsId = mem32[i++];
193− const ns = interpreter.getCachedString(nsId);
194− interpreter.stack.push(document.createElementNS(ns, tagName));
195− return i;
196− },
197−
198− // 17
199− function saveChildrenToTemporaries(interpreter, mem8, mem32, i) {
200− let temp = mem32[i++];
201− const start = mem32[i++];
202− const end = mem32[i++];
203− const parent = top(interpreter.stack);
204− const children = parent.childNodes;
205− for (let i = start; i < end; i++) {
206− interpreter.temporaries[temp++] = children[i];
207− }
208− return i;
209− },
210−
211− // 18
212− function pushChild(interpreter, mem8, mem32, i) {
213− const parent = top(interpreter.stack);
214− const n = mem32[i++];
215− const child = parent.childNodes[n];
216− interpreter.stack.push(child);
217− return i;
218− },
219−
220− // 19
221− function pushTemporary(interpreter, mem8, mem32, i) {
222− const temp = mem32[i++];
223− interpreter.stack.push(interpreter.temporaries[temp]);
224− return i;
225− },
226−
227− // 20
228− function insertBefore(interpreter, mem8, mem32, i) {
229− const before = interpreter.stack.pop();
230− const after = interpreter.stack.pop();
231− after.parentNode.insertBefore(before, after);
232− interpreter.stack.push(before);
233− return i;
234− },
235−
236− // 21
237− function popPushReverseChild(interpreter, mem8, mem32, i) {
238− const n = mem32[i++];
239− interpreter.stack.pop();
240− const parent = top(interpreter.stack);
241− const children = parent.childNodes;
242− const child = children[children.length - n - 1];
243− interpreter.stack.push(child);
244− return i;
245− },
246−
247− // 22
248− function removeChild(interpreter, mem8, mem32, i) {
249− const n = mem32[i++];
250− const parent = top(interpreter.stack);
251− const child = parent.childNodes[n];
252− child.remove();
253− return i;
254− },
255−
256− // 23
257− function setClass(interpreter, mem8, mem32, i) {
258− const classId = mem32[i++];
259− const className = interpreter.getCachedString(classId);
260− top(interpreter.stack).className = className;
261− return i;
262− },
263−
264− // 24
265− function saveTemplate(interpreter, mem8, mem32, i) {
266− const id = mem32[i++];
267− const template = top(interpreter.stack);
268− interpreter.saveTemplate(id, template.cloneNode(true));
269− return i;
270− },
271−
272− // 25
273− function pushTemplate(interpreter, mem8, mem32, i) {
274− const id = mem32[i++];
275− const template = interpreter.getTemplate(id);
276− interpreter.stack.push(template.cloneNode(true));
277− return i;
278− }
279−];
280−
281−export class ChangeListInterpreter {
282− constructor(container) {
283− this.trampoline = null;
284− this.container = container;
285− this.ranges = [];
286− this.stack = [];
287− this.strings = new Map();
288− this.temporaries = [];
289− this.templates = new Map();
290− }
291−
292− unmount() {
293− this.trampoline.mounted = false;
294−
295− // Null out all of our properties just to ensure that if we mistakenly ever
296− // call a method on this instance again, it will throw.
297− this.trampoline = null;
298− this.container = null;
299− this.ranges = null;
300− this.stack = null;
301− this.strings = null;
302− this.temporaries = null;
303− this.templates = null;
304− }
305−
306− addChangeListRange(start, len) {
307− this.ranges.push(start);
308− this.ranges.push(len);
309− }
310−
311− applyChanges(memory) {
312− if (this.ranges.length == 0) {
313− return;
314− }
315−
316− this.stack.push(this.container.firstChild);
317− const mem8 = new Uint8Array(memory.buffer);
318− const mem32 = new Uint32Array(memory.buffer);
319−
320− for (let i = 0; i < this.ranges.length; i += 2) {
321− const start = this.ranges[i];
322− const len = this.ranges[i + 1];
323− this.applyChangeRange(mem8, mem32, start, len);
324− }
325−
326− this.ranges.length = 0;
327− this.stack.length = 0;
328− this.temporaries.length = 0;
329− }
330−
331− applyChangeRange(mem8, mem32, start, len) {
332− const end = (start + len) / 4;
333− for (let i = start / 4; i < end; ) {
334− const op = mem32[i++];
335− i = OP_TABLE[op](this, mem8, mem32, i);
336− }
337− }
338−
339− addCachedString(str, id) {
340− this.strings.set(id, str);
341− }
342−
343− dropCachedString(id) {
344− this.strings.delete(id);
345− }
346−
347− getCachedString(id) {
348− return this.strings.get(id);
349− }
350−
351− saveTemplate(id, template) {
352− this.templates.set(id, template);
353− }
354−
355− getTemplate(id) {
356− return this.templates.get(id);
357− }
358−
359− initEventsTrampoline(trampoline) {
360− this.trampoline = trampoline;
361− trampoline.mounted = true;
362− this.eventHandler = function(event) {
363− if (!trampoline.mounted) {
364− throw new Error("invocation of listener after VDOM has been unmounted");
365− }
366−
367− // `this` always refers to the element the handler was added to.
368− // Since we're adding the handler to all elements our content wants
369− // to listen for events on, this ensures that we always get the right
370− // values for `a` and `b`.
371− const type = event.type;
372− const a = this[`dodrio-a-${type}`];
373− const b = this[`dodrio-b-${type}`];
374− trampoline(event, a, b);
375− }
376− }
377−}
js/change-list.jsnew file+289
@@ -0,0 +1,289 @@
1+const decoder = new TextDecoder();
2+
3+function top(stack) {
4+ return stack[stack.length - 1];
5+}
6+
7+function string(mem, pointer, length) {
8+ const buf = mem.subarray(pointer, pointer + length);
9+ return decoder.decode(buf);
10+}
11+
12+const OP_TABLE = [
13+ // 0
14+ function setText(changeList, mem8, mem32, i) {
15+ const pointer = mem32[i++];
16+ const length = mem32[i++];
17+ const str = string(mem8, pointer, length);
18+ top(changeList.stack).textContent = str;
19+ return i;
20+ },
21+
22+ // 1
23+ function removeSelfAndNextSiblings(changeList, mem8, mem32, i) {
24+ const node = changeList.stack.pop();
25+ let sibling = node.nextSibling;
26+ while (sibling) {
27+ const temp = sibling.nextSibling;
28+ sibling.remove();
29+ sibling = temp;
30+ }
31+ node.remove();
32+ return i;
33+ },
34+
35+ // 2
36+ function replaceWith(changeList, mem8, mem32, i) {
37+ const newNode = changeList.stack.pop();
38+ const oldNode = changeList.stack.pop();
39+ oldNode.replaceWith(newNode);
40+ changeList.stack.push(newNode);
41+ return i;
42+ },
43+
44+ // 3
45+ function setAttribute(changeList, mem8, mem32, i) {
46+ const nameId = mem32[i++];
47+ const valueId = mem32[i++];
48+ const name = changeList.getString(nameId);
49+ const value = changeList.getString(valueId);
50+ const node = top(changeList.stack);
51+ node.setAttribute(name, value);
52+
53+ // Some attributes are "volatile" and don't work through `setAttribute`.
54+ if (name === "value") {
55+ node.value = value;
56+ }
57+ if (name === "checked") {
58+ node.checked = true;
59+ }
60+ if (name === "selected") {
61+ node.selected = true;
62+ }
63+
64+ return i;
65+ },
66+
67+ // 4
68+ function removeAttribute(changeList, mem8, mem32, i) {
69+ const nameId = mem32[i++];
70+ const name = changeList.getString(nameId);
71+ const node = top(changeList.stack);
72+ node.removeAttribute(name);
73+
74+ // Some attributes are "volatile" and don't work through `removeAttribute`.
75+ if (name === "value") {
76+ node.value = null;
77+ }
78+ if (name === "checked") {
79+ node.checked = false;
80+ }
81+ if (name === "selected") {
82+ node.selected = false;
83+ }
84+
85+ return i;
86+ },
87+
88+ // 5
89+ function pushFirstChild(changeList, mem8, mem32, i) {
90+ changeList.stack.push(top(changeList.stack).firstChild);
91+ return i;
92+ },
93+
94+ // 6
95+ function popPushNextSibling(changeList, mem8, mem32, i) {
96+ const node = changeList.stack.pop();
97+ changeList.stack.push(node.nextSibling);
98+ return i;
99+ },
100+
101+ // 7
102+ function pop(changeList, mem8, mem32, i) {
103+ changeList.stack.pop();
104+ return i;
105+ },
106+
107+ // 8
108+ function appendChild(changeList, mem8, mem32, i) {
109+ const child = changeList.stack.pop();
110+ top(changeList.stack).appendChild(child);
111+ return i;
112+ },
113+
114+ // 9
115+ function createTextNode(changeList, mem8, mem32, i) {
116+ const pointer = mem32[i++];
117+ const length = mem32[i++];
118+ const text = string(mem8, pointer, length);
119+ changeList.stack.push(document.createTextNode(text));
120+ return i;
121+ },
122+
123+ // 10
124+ function createElement(changeList, mem8, mem32, i) {
125+ const tagNameId = mem32[i++];
126+ const tagName = changeList.getString(tagNameId);
127+ changeList.stack.push(document.createElement(tagName));
128+ return i;
129+ },
130+
131+ // 11
132+ function newEventListener(changeList, mem8, mem32, i) {
133+ const eventId = mem32[i++];
134+ const eventType = changeList.getString(eventId);
135+ const a = mem32[i++];
136+ const b = mem32[i++];
137+ const el = top(changeList.stack);
138+ el.addEventListener(eventType, changeList.eventHandler);
139+ el[`dodrio-a-${eventType}`] = a;
140+ el[`dodrio-b-${eventType}`] = b;
141+ return i;
142+ },
143+
144+ // 12
145+ function updateEventListener(changeList, mem8, mem32, i) {
146+ const eventId = mem32[i++];
147+ const eventType = changeList.getString(eventId);
148+ const el = top(changeList.stack);
149+ el[`dodrio-a-${eventType}`] = mem32[i++];
150+ el[`dodrio-b-${eventType}`] = mem32[i++];
151+ return i;
152+ },
153+
154+ // 13
155+ function removeEventListener(changeList, mem8, mem32, i) {
156+ const eventId = mem32[i++];
157+ const eventType = changeList.getString(eventId);
158+ const el = top(changeList.stack);
159+ el.removeEventListener(eventType, changeList.eventHandler);
160+ return i;
161+ },
162+
163+ // 14
164+ function addString(changeList, mem8, mem32, i) {
165+ const pointer = mem32[i++];
166+ const length = mem32[i++];
167+ const id = mem32[i++];
168+ const str = string(mem8, pointer, length);
169+ changeList.addString(str, id);
170+ return i;
171+ },
172+
173+ // 15
174+ function dropString(changeList, mem8, mem32, i) {
175+ const id = mem32[i++];
176+ changeList.dropString(id);
177+ return i;
178+ },
179+
180+ // 16
181+ function createElementNS(changeList, mem8, mem32, i) {
182+ const tagNameId = mem32[i++];
183+ const tagName = changeList.getString(tagNameId);
184+ const nsId = mem32[i++];
185+ const ns = changeList.getString(nsId);
186+ changeList.stack.push(document.createElementNS(ns, tagName));
187+ return i;
188+ },
189+
190+ // 17
191+ function setAttributeNS(changeList, mem8, mem32, i) {
192+ const nameId = mem32[i++];
193+ const valueId = mem32[i++];
194+ const name = changeList.getString(nameId);
195+ const value = changeList.getString(valueId);
196+ const node = top(changeList.stack);
197+ node.setAttributeNS(null, name, value);
198+ return i;
199+ }
200+];
201+
202+// export
203+class ChangeList {
204+ constructor(container) {
205+ this.trampoline = null;
206+ this.container = container;
207+ this.ranges = [];
208+ this.stack = [];
209+ this.strings = new Map();
210+ }
211+
212+ unmount() {
213+ this.trampoline.mounted = false;
214+
215+ // Null out all of our properties just to ensure that if we mistakenly ever
216+ // call a method on this instance again, it will throw.
217+ this.trampoline = null;
218+ this.container = null;
219+ this.ranges = null;
220+ this.stack = null;
221+ this.strings = null;
222+ }
223+
224+ addChangeListRange(start, len) {
225+ this.ranges.push(start);
226+ this.ranges.push(len);
227+ }
228+
229+ applyChanges(memory) {
230+ if (this.ranges.length == 0) {
231+ return;
232+ }
233+
234+ this.stack.push(this.container.firstChild);
235+ const mem8 = new Uint8Array(memory.buffer);
236+ const mem32 = new Uint32Array(memory.buffer);
237+
238+ for (let i = 0; i < this.ranges.length; i += 2) {
239+ const start = this.ranges[i];
240+ const len = this.ranges[i + 1];
241+ this.applyChangeRange(mem8, mem32, start, len);
242+ }
243+
244+ this.ranges.length = 0;
245+ this.stack.length = 0;
246+ }
247+
248+ applyChangeRange(mem8, mem32, start, len) {
249+ const end = (start + len) / 4;
250+ for (let i = start / 4; i < end; ) {
251+ const op = mem32[i++];
252+ i = OP_TABLE[op](this, mem8, mem32, i);
253+ }
254+ }
255+
256+ addString(str, id) {
257+ this.strings.set(id, str);
258+ }
259+
260+ dropString(id) {
261+ this.strings.delete(id);
262+ }
263+
264+ getString(id) {
265+ return this.strings.get(id);
266+ }
267+
268+ initEventsTrampoline(trampoline) {
269+ this.trampoline = trampoline;
270+ trampoline.mounted = true;
271+ this.eventHandler = function(event) {
272+ if (!trampoline.mounted) {
273+ throw new Error("invocation of listener after VDOM has been unmounted");
274+ }
275+
276+ // `this` always refers to the element the handler was added to.
277+ // Since we're adding the handler to all elements our content wants
278+ // to listen for events on, this ensures that we always get the right
279+ // values for `a` and `b`.
280+ const type = event.type;
281+ const a = this[`dodrio-a-${type}`];
282+ const b = this[`dodrio-b-${type}`];
283+ trampoline(event, a, b);
284+ }
285+ }
286+}
287+window.ChangeList = ChangeList;
288+
289+//# sourceURL=dodrio/change-list.js
js/package-lock.jsonnew file+5
@@ -0,0 +1,5 @@
1+{
2+ "name": "dodrio",
3+ "version": "0.1.0",
4+ "lockfileVersion": 1
5+}
js/package.jsonnew file+11
@@ -0,0 +1,11 @@
1+{
2+ "name": "dodrio",
3+ "version": "0.1.0",
4+ "description": "Dodrio",
5+ "main": "dodrio.js",
6+ "scripts": {
7+ "test": "echo \"Error: no test specified\" && exit 1"
8+ },
9+ "author": "Nick Fitzgerald <fitzgen@gmail.com>",
10+ "license": "MPL-2.0"
11+}
js/strace.jsdeleted−80
@@ -1,80 +0,0 @@
1−export function initStrace() {
2− instrumentAll(Element.prototype);
3− instrumentAll(Document.prototype);
4− instrumentAll(Node.prototype);
5− instrumentAll(EventTarget.prototype);
6−}
7−
8−const counts = new Map;
9−counts.total = 0;
10−
11−let timer = null;
12−
13−function log(ctorName, kind, key) {
14− counts.total += 1;
15−
16− const entry = `${kind} ${ctorName}#${key}`
17− const count = counts.get(entry);
18− if (count === undefined) {
19− counts.set(entry, 1);
20− } else {
21− counts.set(entry, count + 1);
22− }
23−
24− if (timer !== null) {
25− clearTimeout(timer);
26− }
27− timer = setTimeout(dumpAndReset, 100);
28−}
29−
30−function dumpAndReset() {
31− const data = [...counts]
32− .sort((a, b) => b[1] - a[1])
33− .map(a => ({ "DOM Method": a[0], "Count": a[1] }));
34−
35− data.push({ "DOM Method": "<total>", "Count": counts.total });
36−
37− console.table(data, ["DOM Method", "Count"]);
38−
39− counts.clear();
40− counts.total = 0;
41−}
42−
43−function instrument(proto, key, desc) {
44− const ctorName = proto.constructor.name;
45−
46− if (typeof desc.value == "function") {
47− const f = desc.value;
48− desc.value = function (...args) {
49− log(ctorName, "call", key);
50− return f.apply(this, args);
51− };
52− }
53−
54− if (typeof desc.get == "function") {
55− const get = desc.get;
56− desc.get = function (...args) {
57− log(ctorName, "get", key);
58− return get.apply(this, args);
59− };
60− }
61−
62− if (typeof desc.set == "function") {
63− const set = desc.set;
64− desc.set = function (...args) {
65− log(ctorName, "set", key);
66− return set.apply(this, args);
67− };
68− }
69−
70− Object.defineProperty(proto, key, desc);
71−}
72−
73−function instrumentAll(proto) {
74− for (const key of Object.keys(proto)) {
75− const desc = Object.getOwnPropertyDescriptor(proto, key);
76− if (desc.configurable) {
77− instrument(proto, key, desc);
78− }
79− }
80−}
src/builder.rs+5−64
@@ -1,6 +1,6 @@
11//! Helpers for building virtual DOM nodes.
22
3−use crate::{node::NodeKey, Attribute, Listener, Node, RootRender, VdomWeak};
3+use crate::{Attribute, Listener, Node, RootRender, VdomWeak};
44use bumpalo::Bump;
55
66/// A virtual DOM element builder.
@@ -16,7 +16,6 @@ where
1616 Children: 'a + AsRef<[Node<'a>]>,
1717{
1818 bump: &'a Bump,
19− key: NodeKey,
2019 tag_name: &'a str,
2120 listeners: Listeners,
2221 attributes: Attributes,
@@ -62,7 +61,6 @@ impl<'a>
6261 let bump = bump.into();
6362 ElementBuilder {
6463 bump,
65− key: NodeKey::NONE,
6664 tag_name,
6765 listeners: bumpalo::collections::Vec::new_in(bump),
6866 attributes: bumpalo::collections::Vec::new_in(bump),
@@ -112,7 +110,6 @@ where
112110 {
113111 ElementBuilder {
114112 bump: self.bump,
115− key: self.key,
116113 tag_name: self.tag_name,
117114 listeners,
118115 attributes: self.attributes,
@@ -151,7 +148,6 @@ where
151148 {
152149 ElementBuilder {
153150 bump: self.bump,
154− key: self.key,
155151 tag_name: self.tag_name,
156152 listeners: self.listeners,
157153 attributes,
@@ -190,7 +186,6 @@ where
190186 {
191187 ElementBuilder {
192188 bump: self.bump,
193− key: self.key,
194189 tag_name: self.tag_name,
195190 listeners: self.listeners,
196191 attributes: self.attributes,
@@ -209,7 +204,7 @@ where
209204 /// let b = Bump::new();
210205 ///
211206 /// // Create a `<td>` tag with an xhtml namespace
212− /// let my_td = td(&b)
207+ /// let my_div = td(&b)
213208 /// .namespace(Some("http://www.w3.org/1999/xhtml"))
214209 /// .finish();
215210 /// ```
@@ -217,7 +212,6 @@ where
217212 pub fn namespace(self, namespace: Option<&'a str>) -> Self {
218213 ElementBuilder {
219214 bump: self.bump,
220− key: self.key,
221215 tag_name: self.tag_name,
222216 listeners: self.listeners,
223217 attributes: self.attributes,
@@ -226,45 +220,6 @@ where
226220 }
227221 }
228222
229− /// Set this element's key.
230− ///
231− /// When diffing sets of siblings, if an old sibling and new sibling share a
232− /// key, then they will always reuse the same physical DOM node. This is
233− /// important when using CSS animations, web components, third party JS, or
234− /// anything else that makes the diffing implementation observable.
235− ///
236− /// Do not use keys if such a scenario does not apply. Keyed diffing is
237− /// generally more expensive than not, since it is putting greater
238− /// constraints on the diffing algorithm.
239− ///
240− /// # Invariants You Must Uphold
241− ///
242− /// The key may not be `u32::MAX`, which is a reserved key value.
243− ///
244− /// Keys must be unique among siblings.
245− ///
246− /// All sibling nodes must be keyed, or they must all not be keyed. You may
247− /// not mix keyed and unkeyed siblings.
248− ///
249− /// # Example
250− ///
251− /// ```no_run
252− /// use dodrio::{builder::*, bumpalo::Bump};
253− ///
254− /// let b = Bump::new();
255− ///
256− /// let my_li = li(&b)
257− /// .key(1337)
258− /// .finish();
259− /// ```
260− #[inline]
261− pub fn key(mut self, key: u32) -> Self {
262− use std::u32;
263− debug_assert!(key != u32::MAX);
264− self.key = NodeKey(key);
265− self
266− }
267−
268223 /// Create the virtual DOM node described by this builder.
269224 ///
270225 /// # Example
@@ -282,22 +237,12 @@ where
282237 /// ```
283238 #[inline]
284239 pub fn finish(self) -> Node<'a> {
285− let children: &'a Children = self.bump.alloc(self.children);
286− let children: &'a [Node<'a>] = children.as_ref();
287−
288− let listeners: &'a Listeners = self.bump.alloc(self.listeners);
289− let listeners: &'a [Listener<'a>] = listeners.as_ref();
290−
291− let attributes: &'a Attributes = self.bump.alloc(self.attributes);
292− let attributes: &'a [Attribute<'a>] = attributes.as_ref();
293−
294240 Node::element(
295241 self.bump,
296− self.key,
297242 self.tag_name,
298− listeners,
299− attributes,
300− children,
243+ self.listeners,
244+ self.attributes,
245+ self.children,
301246 self.namespace,
302247 )
303248 }
@@ -1010,10 +955,6 @@ builder_constructors! {
1010955 /// [`<rect>`](https://developer.mozilla.org/en-US/docs/Web/SVG/Element/rect)
1011956 /// element.
1012957 rect <> "http://www.w3.org/2000/svg";
1013− /// Build a
1014− /// [`<image>`](https://developer.mozilla.org/en-US/docs/Web/SVG/Element/image)
1015− /// element.
1016− image <> "http://www.w3.org/2000/svg";
1017958}
1018959
1019960/// Construct a text node.
src/cached.rs+22−91
@@ -1,38 +1,19 @@
11use crate::{
2− cached_set::CachedSet,
3− node::{CachedNode, NodeKey},
2+ cached_set::{CacheId, CachedSet},
43 Node, Render, RenderContext,
54};
6−use std::any::TypeId;
75use std::cell::Cell;
86use std::ops::{Deref, DerefMut};
97
108/// A renderable that supports caching for when rendering is expensive but can
119/// generate the same DOM tree.
12−///
13−/// # Example
14−///
15−/// The [TodoMVC
16−/// example](https://github.com/fitzgen/dodrio/blob/master/examples/todomvc/src/todo.rs)
17−/// caches individual todo items.
18−#[derive(Clone, Debug, Default)]
19−pub struct Cached<R>
20−where
21− R: Default,
22−{
10+#[derive(Clone, Debug)]
11+pub struct Cached<R> {
2312 inner: R,
24− cached: Cell<Option<CachedNode>>,
25−}
26−
27−pub_unstable_internal! {
28− #[derive(Clone, Copy, PartialEq, Eq, Debug, Hash)]
29− pub(crate) struct TemplateId(TypeId);
13+ cached: Cell<Option<CacheId>>,
3014}
3115
32−impl<R> Cached<R>
33−where
34− R: Default,
35−{
16+impl<R> Cached<R> {
3617 /// Construct a new `Cached<R>` of an inner `R`.
3718 ///
3819 /// # Example
@@ -40,13 +21,12 @@ where
4021 /// ```
4122 /// use dodrio::{Cached, Node, Render, RenderContext};
4223 ///
43− /// #[derive(Default)]
4424 /// pub struct Counter {
4525 /// count: u32,
4626 /// }
4727 ///
48− /// impl<'a> Render<'a> for Counter {
49− /// fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
28+ /// impl Render for Counter {
29+ /// fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
5030 /// // ...
5131 /// # unimplemented!()
5232 /// }
@@ -80,13 +60,12 @@ where
8060 /// use dodrio::{bumpalo, Cached, Node, Render, RenderContext};
8161 ///
8262 /// /// A component that renders to "<p>Hello, {who}!</p>"
83− /// #[derive(Default)]
8463 /// pub struct Hello {
8564 /// who: String
8665 /// }
8766 ///
88− /// impl<'a> Render<'a> for Hello {
89− /// fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
67+ /// impl Render for Hello {
68+ /// fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
9069 /// use dodrio::builder::*;
9170 /// let greeting = bumpalo::format!(in cx.bump, "Hello, {}!", self.who);
9271 /// p(&cx)
@@ -114,19 +93,7 @@ where
11493 }
11594}
11695
117−impl<R> Cached<R>
118−where
119− R: 'static + Default,
120−{
121− pub(crate) fn template_id() -> TemplateId {
122− TemplateId(TypeId::of::<R>())
123− }
124−}
125−
126−impl<R> Deref for Cached<R>
127−where
128− R: Default,
129−{
96+impl<R> Deref for Cached<R> {
13097 type Target = R;
13198
13299 fn deref(&self) -> &R {
@@ -134,22 +101,18 @@ where
134101 }
135102}
136103
137−impl<R> DerefMut for Cached<R>
138−where
139− R: Default,
140−{
104+impl<R> DerefMut for Cached<R> {
141105 fn deref_mut(&mut self) -> &mut R {
142106 &mut self.inner
143107 }
144108}
145109
146−impl<'a, R> Render<'a> for Cached<R>
110+impl<R> Render for Cached<R>
147111where
148− R: 'static + Default + for<'b> Render<'b>,
112+ R: Render,
149113{
150− fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
151− let template = cx.template::<R>();
152− let cached = match self.cached.get() {
114+ fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
115+ let id = match self.cached.get() {
153116 // This does-the-cache-contain-this-id check is necessary because
154117 // the same `Cached<R>` instance can be rendered into vdom A, which
155118 // will save the results into A's cached set and yield id X. Then,
@@ -177,53 +140,21 @@ where
177140 //
178141 // This is all do-able but is a bit more book keeping than we really
179142 // want to do unless it is well motivated.
180− Some(cached)
143+ Some(id)
181144 if {
182145 let cached_set = cx.cached_set.borrow();
183− cached_set.contains(cached.id)
146+ cached_set.contains(id)
184147 } =>
185148 {
186− cached
149+ id
187150 }
188151 _ => {
189− let mut key = NodeKey::NONE;
190− let id = CachedSet::insert(cx, false, template, |nested_cx| {
191− let node = self.inner.render(nested_cx);
192− key = node.key();
193− node
194− });
195− let cached = CachedNode { id, key };
196− self.cached.set(Some(cached));
197− cached
152+ let id = CachedSet::insert(cx, |nested_cx| self.inner.render(nested_cx));
153+ self.cached.set(Some(id));
154+ id
198155 }
199156 };
200157
201− cached.into()
202− }
203−}
204−
205−#[cfg(feature = "serde")]
206−impl<R> serde::Serialize for Cached<R>
207−where
208− R: Default + serde::Serialize,
209−{
210− fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
211− where
212− S: serde::Serializer,
213− {
214− self.inner.serialize(serializer)
215− }
216−}
217−
218−#[cfg(feature = "serde")]
219−impl<'de, R> serde::Deserialize<'de> for Cached<R>
220−where
221− R: Default + serde::Deserialize<'de>,
222−{
223− fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
224− where
225− D: serde::Deserializer<'de>,
226− {
227− R::deserialize(deserializer).map(Cached::new)
158+ Node::cached(id)
228159 }
229160}
src/cached_set.rs+61−95
@@ -6,7 +6,6 @@ use crate::{
66use bumpalo::Bump;
77use fxhash::{FxHashMap, FxHashSet};
88use std::sync::atomic::{AtomicUsize, Ordering};
9−use std::u32;
109use wasm_bindgen::prelude::*;
1110
1211static ID_COUNTER: AtomicUsize = AtomicUsize::new(0);
@@ -35,57 +34,32 @@ pub(crate) struct CacheEntry {
3534 // once, we don't have to repeat the tracing every time we want to garbage
3635 // collect cache entries.
3736 edges: FxHashSet<CacheId>,
38−
39− // The template for this cached virtual subtree.
40− //
41− // When a cache entry has a template, that means that the `ChangeList` will
42− // lazily build a physical DOM subtree based on the template, and when we
43− // create new versions of this cached result, we clone the template's
44− // physical DOM subtree and then modify it, rather than building the cached
45− // result up from scratch. This is a nice win because we bounce between JS
46− // and DOM methods less often, and get the C++ DOM implementation to do most
47− // of the subtree construction for us.
48− template: Option<CacheId>,
49−
50− // Whether this entry should never be garbage collected. Typically only
51− // templates are pinned.
52− pinned: bool,
53−}
54−
55−impl From<CacheId> for u32 {
56− #[inline]
57− fn from(id: CacheId) -> u32 {
58− id.0
59− }
6037}
6138
6239impl CachedSet {
63− pub(crate) fn new_roots_set(&self) -> FxHashSet<CacheId> {
64− let mut roots = FxHashSet::default();
65− roots.reserve(self.items.len());
66− roots
67− }
68−
69− pub(crate) fn gc(&mut self, registry: &mut EventsRegistry, roots: FxHashSet<CacheId>) {
70− let mut marked = FxHashSet::default();
71− marked.reserve(self.items.len());
40+ pub(crate) fn gc(&mut self, registry: &mut EventsRegistry, roots: &[CacheId]) {
41+ // TODO: We need to port a hash set over in `bumpalo::collections` so
42+ // that we can use a temporary bump arena for this set.
43+ let mut mark_bits = FxHashSet::default();
44+ mark_bits.reserve(self.items.len());
7245
7346 for root in roots {
74− if marked.insert(root) {
47+ if mark_bits.insert(*root) {
7548 let entry = self
7649 .items
77− .get(&root)
50+ .get(root)
7851 .expect_throw("CachedSet::gc: should have root in cached set");
7952
8053 // NB: no need to recurse here because `edges` already contains
8154 // transitive edges!
82− marked.extend(entry.edges.iter().cloned());
55+ mark_bits.extend(entry.edges.iter().cloned());
8356 }
8457 }
8558
8659 self.items.retain(|id, entry| {
87− let keep = entry.pinned || marked.contains(id);
60+ let keep = mark_bits.contains(id);
8861 if !keep {
62+ debug!("CachedSet::gc: removing {:?}", id);
8963 let node: &Node = unsafe { &*entry.node };
9064 registry.remove_subtree(node);
9165 }
@@ -97,74 +71,58 @@ impl CachedSet {
9771 // node has.
9872 fn trace(&self, node: &Node) -> FxHashSet<CacheId> {
9973 let mut edges = FxHashSet::default();
100− self.trace_recursive(&mut edges, node);
101− edges
102− }
10374
104− fn trace_recursive(&self, edges: &mut FxHashSet<CacheId>, node: &Node) {
105− match &node.kind {
106− NodeKind::Text(_) => return,
107− NodeKind::Cached(c) => {
108− debug_assert!(self.items.contains_key(&c.id));
109− edges.insert(c.id);
110− edges.extend(
111− self.items
112− .get(&c.id)
113− .expect_throw("CachedSet::trace: should have c.id in cached set")
114− .edges
115− .iter()
116− .cloned(),
117− );
118− }
119− NodeKind::Element(el) => {
120− for child in el.children {
121− self.trace_recursive(edges, child);
75+ let bump = Bump::new();
76+ let mut stack = bumpalo::collections::Vec::with_capacity_in(64, &bump);
77+ stack.push(node);
78+
79+ while let Some(node) = stack.pop() {
80+ match &node.kind {
81+ NodeKind::Text(_) => continue,
82+ NodeKind::Cached(c) => {
83+ debug_assert!(self.items.contains_key(&c.id));
84+ edges.insert(c.id);
85+ edges.extend(
86+ self.items
87+ .get(&c.id)
88+ .expect_throw("CachedSet::trace: should have c.id in cached set")
89+ .edges
90+ .iter()
91+ .cloned(),
92+ );
93+ }
94+ NodeKind::Element(el) => {
95+ stack.extend(el.children);
12296 }
12397 }
12498 }
99+
100+ edges
125101 }
126102
127103 fn next_id(&mut self) -> CacheId {
128− let next = ID_COUNTER.fetch_add(1, Ordering::AcqRel) as u32;
129− let next = if next == u32::MAX { None } else { Some(next) };
130− CacheId(next.expect_throw("ID_COUNTER overflowed"))
104+ CacheId(ID_COUNTER.fetch_add(1, Ordering::AcqRel) as u32)
131105 }
132106
133− pub(crate) fn insert<F>(
134− cx: &mut RenderContext,
135− pinned: bool,
136− template: Option<CacheId>,
137− f: F,
138− ) -> CacheId
107+ pub(crate) fn insert<F>(cx: &mut RenderContext, f: F) -> CacheId
139108 where
140109 F: for<'a> FnOnce(&mut RenderContext<'a>) -> Node<'a>,
141110 {
142− let set = cx.cached_set;
143111 let bump = Bump::new();
144− let (node, edges) = {
145− let mut nested_cx = RenderContext::new(&bump, cx.cached_set, cx.templates);
146− let node = f(&mut nested_cx);
147− let node = bump.alloc(node);
148− let edges = {
149− let set = set.borrow();
150− set.trace(node)
151− };
152− (
153− node as *mut Node<'_> as usize as *const Node<'static>,
154− edges,
155− )
156− };
157−
158− let entry = CacheEntry {
159− bump,
160− node,
161− edges,
162− template,
163− pinned,
112+ let set = cx.cached_set;
113+ let mut nested_cx = RenderContext::new(&bump, set);
114+ let node = f(&mut nested_cx);
115+ let node = bump.alloc(node);
116+ let edges = {
117+ let set = set.borrow();
118+ set.trace(node)
164119 };
120+ let node = node as *mut Node<'_> as usize as *const Node<'static>;
121+ let entry = CacheEntry { bump, node, edges };
165122
166123 let mut set = set.borrow_mut();
167124 let id = set.next_id();
125+ debug!("CachedSet::insert: id = {:?}; entry = {:?}", id, entry);
168126 set.items.insert(id, entry);
169127 id
170128 }
@@ -174,13 +132,21 @@ impl CachedSet {
174132 self.items.contains_key(&id)
175133 }
176134
177− /// Get the cached node and its template (if any) for the given cache id.
178− pub fn get(&self, id: CacheId) -> (&Node, Option<CacheId>) {
179− let entry = self
180− .items
181− .get(&id)
182− .expect_throw("CachedSet::get: should have id in set");
183− let node: &Node = unsafe { &*entry.node };
184− (node, entry.template)
135+ /// Get the node for the given cache id.
136+ pub fn get(&self, mut id: CacheId) -> Node {
137+ debug!("CachedSet::get: id = {:?}", id);
138+ loop {
139+ let entry = self
140+ .items
141+ .get(&id)
142+ .expect_throw("CachedSet::get: should have id in set");
143+ let node: &Node = unsafe { &*entry.node };
144+ if let NodeKind::Cached(ref c) = node.kind {
145+ id = c.id;
146+ continue;
147+ } else {
148+ return node.clone();
149+ }
150+ }
185151 }
186152}
src/change_list.rsnew file+486
@@ -0,0 +1,486 @@
1+use crate::Listener;
2+use bumpalo::Bump;
3+use fxhash::FxHashMap;
4+use std::fmt;
5+
6+pub mod js {
7+ cfg_if::cfg_if! {
8+ if #[cfg(all(feature = "xxx-unstable-internal-use-only", not(target_arch = "wasm32")))] {
9+ #[derive(Clone, Debug)]
10+ pub struct ChangeList {}
11+ impl ChangeList {
12+ pub fn new(_container: &crate::Element) -> ChangeList {
13+ ChangeList {}
14+ }
15+ pub fn unmount(&self) {}
16+ pub fn add_change_list_range(&self, _start: usize, _len: usize) {}
17+ pub fn init_events_trampoline(&self, _trampoline: &crate::EventsTrampoline) {}
18+ }
19+
20+ pub fn eval_change_list() {}
21+ } else {
22+ use wasm_bindgen::prelude::*;
23+
24+ #[wasm_bindgen]
25+ extern "C" {
26+ #[derive(Clone, Debug)]
27+ pub type ChangeList;
28+
29+ #[wasm_bindgen(constructor)]
30+ pub fn new(container: &web_sys::Element) -> ChangeList;
31+
32+ #[wasm_bindgen(structural, method)]
33+ pub fn unmount(this: &ChangeList);
34+
35+ #[wasm_bindgen(structural, method, js_name = addChangeListRange)]
36+ pub fn add_change_list_range(this: &ChangeList, start: usize, len: usize);
37+
38+ #[wasm_bindgen(structural, method, js_name = applyChanges)]
39+ pub fn apply_changes(this: &ChangeList, memory: JsValue);
40+
41+ #[wasm_bindgen(structural, method, js_name = initEventsTrampoline)]
42+ pub fn init_events_trampoline(
43+ this: &ChangeList,
44+ trampoline: &crate::EventsTrampoline,
45+ );
46+ }
47+
48+ pub fn eval_change_list() {
49+ use std::sync::Once;
50+ // XXX: Because wasm-bindgen-test doesn't support third party JS
51+ // dependencies, we can't use `wasm_bindgen(module = "...")` for our
52+ // `ChangeList` JS import. Instead, this *should* be a local JS snippet,
53+ // but that isn't implemented yet:
54+ // https://github.com/rustwasm/rfcs/pull/6
55+ static EVAL: Once = Once::new();
56+ EVAL.call_once(|| {
57+ js_sys::eval(include_str!("../js/change-list.js"))
58+ .expect_throw("should eval change-list.js OK");
59+ });
60+ }
61+ }
62+ }
63+}
64+
65+struct StringsCacheEntry {
66+ key: u32,
67+ used: bool,
68+}
69+
70+pub(crate) struct ChangeList {
71+ bump: Bump,
72+ strings_cache: FxHashMap<String, StringsCacheEntry>,
73+ next_string_key: u32,
74+ js: js::ChangeList,
75+ events_trampoline: Option<crate::EventsTrampoline>,
76+}
77+
78+impl Drop for ChangeList {
79+ fn drop(&mut self) {
80+ debug!("Dropping ChangeList");
81+ self.js.unmount();
82+ }
83+}
84+
85+impl fmt::Debug for ChangeList {
86+ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
87+ f.debug_struct("ChangeList")
88+ .field("bump", &self.bump)
89+ .field("js", &self.js)
90+ .field("events_trampoline", &"..")
91+ .finish()
92+ }
93+}
94+
95+impl ChangeList {
96+ pub(crate) fn new(container: &crate::Element) -> ChangeList {
97+ js::eval_change_list();
98+ let bump = Bump::new();
99+ let strings_cache = FxHashMap::default();
100+ let js = js::ChangeList::new(container);
101+ ChangeList {
102+ bump,
103+ strings_cache,
104+ next_string_key: 0,
105+ js,
106+ events_trampoline: None,
107+ }
108+ }
109+
110+ pub(crate) fn init_events_trampoline(&mut self, trampoline: crate::EventsTrampoline) {
111+ debug_assert!(self.events_trampoline.is_none());
112+ self.js.init_events_trampoline(&trampoline);
113+ self.events_trampoline = Some(trampoline);
114+ }
115+}
116+
117+cfg_if::cfg_if! {
118+ if #[cfg(all(feature = "xxx-unstable-internal-use-only", not(target_arch = "wasm32")))] {
119+ impl ChangeList {
120+ pub(crate) fn apply_changes(&mut self) {
121+ // Do nothing...
122+ }
123+ }
124+ } else {
125+ impl ChangeList {
126+ pub(crate) fn apply_changes(&mut self) {
127+ let js = &self.js;
128+ unsafe {
129+ self.bump.each_allocated_chunk(|ch| {
130+ js.add_change_list_range(ch.as_ptr() as usize, ch.len());
131+ });
132+ }
133+ js.apply_changes(wasm_bindgen::memory());
134+ self.bump.reset();
135+ }
136+ }
137+ }
138+}
139+
140+#[repr(u32)]
141+#[derive(Clone, Copy, Debug)]
142+enum ChangeDiscriminant {
143+ /// Immediates: `(pointer, length)`
144+ ///
145+ /// Stack: `[... TextNode] -> [... TextNode]`
146+ ///
147+ /// ```text
148+ /// stack.top().textContent = String(pointer, length)
149+ /// ```
150+ SetText = 0,
151+
152+ /// Immediates: `()`
153+ ///
154+ /// Stack: `[... Node] -> [...]`
155+ ///
156+ /// ```text
157+ /// node = stack.pop()
158+ /// while (node.nextSibling) {
159+ /// node.nextSibling.remove();
160+ /// }
161+ /// node.remove()
162+ /// ```
163+ RemoveSelfAndNextSiblings = 1,
164+
165+ /// Immediates: `()`
166+ ///
167+ /// Stack: `[... Node Node] -> [... Node]`
168+ ///
169+ /// ```text
170+ /// new = stack.pop()
171+ /// old = stack.pop()
172+ /// old.replaceWith(new)
173+ /// stack.push(new)
174+ /// ```
175+ ReplaceWith = 2,
176+
177+ /// Immediates: `(id1, id2)`
178+ ///
179+ /// Stack: `[... Node] -> [... Node]`
180+ ///
181+ /// ```text
182+ /// stack.top().setAttribute(String(id1), String(id2))
183+ /// ```
184+ SetAttribute = 3,
185+
186+ /// Immediates: (id)
187+ ///
188+ /// Stack: `[... Node] -> [... Node]`
189+ ///
190+ /// ```text
191+ /// stack.top().removeAttribute(String(id))
192+ /// ```
193+ RemoveAttribute = 4,
194+
195+ /// Immediates: `()`
196+ ///
197+ /// Stack: `[... Node] -> [... Node node]`
198+ ///
199+ /// ```text
200+ /// stack.push(stack.top().firstChild)
201+ /// ```
202+ PushFirstChild = 5,
203+
204+ /// Immediates: `()`
205+ ///
206+ /// Stack: `[... Node] -> [... Node]`
207+ ///
208+ /// ```text
209+ /// stack.push(stack.pop().nextSibling)
210+ /// ```
211+ PopPushNextSibling = 6,
212+
213+ /// Immediates: `()`
214+ ///
215+ /// Stack: `[... T] -> [...]`
216+ ///
217+ /// ```text
218+ /// stack.pop()
219+ /// ```
220+ Pop = 7,
221+
222+ /// Immediates: `()`
223+ ///
224+ /// Stack: `[... Node Node] -> [... Node]`
225+ ///
226+ /// ```text
227+ /// child = stack.pop()
228+ /// stack.top().appendChild(child)
229+ /// ```
230+ AppendChild = 8,
231+
232+ /// Immediates: `(pointer, length)`
233+ ///
234+ /// Stack: `[...] -> [... Node]`
235+ ///
236+ /// ```text
237+ /// stack.push(createTextNode(String(pointer, length)))
238+ /// ```
239+ CreateTextNode = 9,
240+
241+ /// Immediates: `(id)`
242+ ///
243+ /// Stack: `[...] -> [... Node]`
244+ ///
245+ /// ```text
246+ /// stack.push(createElement(String(id))
247+ /// ```
248+ CreateElement = 10,
249+
250+ /// Immediates: `(id, A, B)`
251+ ///
252+ /// Stack: `[... Node] -> [... Node]`
253+ ///
254+ /// ```text
255+ /// event = String(id)
256+ /// callback = ProxyToRustCallback(A, B)
257+ /// stack.top().addEventListener(event, callback)
258+ /// ```
259+ NewEventListener = 11,
260+
261+ /// Immediates: `(id, A, B)`
262+ ///
263+ /// Stack: `[... Node] -> [... Node]`
264+ ///
265+ /// ```text
266+ /// event = String(id)
267+ /// new_callback = ProxyToRustCallback(A, B);
268+ /// stack.top().updateEventlistener(new_callback)
269+ /// ```
270+ UpdateEventListener = 12,
271+
272+ /// Immediates: `(id)`
273+ ///
274+ /// Stack: `[... Node] -> [... Node]`
275+ ///
276+ /// ```text
277+ /// stack.top().removeEventListener(String(id));
278+ /// ```
279+ RemoveEventListener = 13,
280+
281+ /// Immediates: `(pointer, length, id)`
282+ ///
283+ /// Stack: `[...] -> [...]`
284+ ///
285+ /// ```text
286+ /// addString(String(pointer, length), id);
287+ /// ```
288+ AddString = 14,
289+
290+ /// Immediates: `(id)`
291+ ///
292+ /// Stack: `[...] -> [...]`
293+ ///
294+ /// ```text
295+ /// dropString(id);
296+ /// ```
297+ DropString = 15,
298+
299+ /// Immediates: `(id1, id2)`
300+ ///
301+ /// Stack: `[...] -> [... Node]`
302+ ///
303+ /// ```text
304+ /// stack.push(createElementNS(String(id1), String(id2))
305+ /// ```
306+ CreateElementNS = 16,
307+
308+ /// Immediates: `(id1, id2, id3)`
309+ ///
310+ /// Stack: `[... Node] -> [... Node]`
311+ ///
312+ /// ```text
313+ /// stack.top().setAttributeNS(String(id1), String(id2), String(id3))
314+ /// ```
315+ SetAttributeNS = 17,
316+}
317+
318+// Allocation utilities to ensure that we only allocation sequences of `u32`s
319+// into the change list's bump arena without any padding. This helps maintain
320+// the invariants required for `Bump::each_allocated_chunk`'s safety.
321+impl ChangeList {
322+ // Allocate an opcode with zero immediates.
323+ fn op0(&self, discriminant: ChangeDiscriminant) {
324+ self.bump.alloc(discriminant as u32);
325+ }
326+
327+ // Allocate an opcode with one immediate.
328+ fn op1(&self, discriminant: ChangeDiscriminant, a: u32) {
329+ self.bump.alloc([discriminant as u32, a]);
330+ }
331+
332+ // Allocate an opcode with two immediates.
333+ fn op2(&self, discriminant: ChangeDiscriminant, a: u32, b: u32) {
334+ self.bump.alloc([discriminant as u32, a, b]);
335+ }
336+
337+ // Allocate an opcode with three immediates.
338+ fn op3(&self, discriminant: ChangeDiscriminant, a: u32, b: u32, c: u32) {
339+ self.bump.alloc([discriminant as u32, a, b, c]);
340+ }
341+
342+ // Note: no 4-immediate opcodes at this time.
343+}
344+
345+impl ChangeList {
346+ fn ensure_string(&mut self, string: &str) -> u32 {
347+ if let Some(entry) = self.strings_cache.get_mut(string) {
348+ entry.used = true;
349+ entry.key
350+ } else {
351+ let key = self.next_string_key;
352+ self.next_string_key += 1;
353+ let entry = StringsCacheEntry { key, used: true };
354+ self.strings_cache.insert(string.to_string(), entry);
355+ self.op3(
356+ ChangeDiscriminant::AddString,
357+ string.as_ptr() as u32,
358+ string.len() as u32,
359+ key,
360+ );
361+ key
362+ }
363+ }
364+
365+ pub(crate) fn drop_unused_strings(&mut self) {
366+ debug!("drop_unused_strings()");
367+ let mut new_cache = FxHashMap::default();
368+ for (key, val) in self.strings_cache.iter() {
369+ if val.used {
370+ new_cache.insert(
371+ key.clone(),
372+ StringsCacheEntry {
373+ key: val.key,
374+ used: false,
375+ },
376+ );
377+ } else {
378+ self.op1(ChangeDiscriminant::DropString, val.key);
379+ }
380+ }
381+ self.strings_cache = new_cache;
382+ }
383+
384+ pub(crate) fn emit_set_text(&self, text: &str) {
385+ debug!("emit_set_text({:?})", text);
386+ self.op2(
387+ ChangeDiscriminant::SetText,
388+ text.as_ptr() as u32,
389+ text.len() as u32,
390+ );
391+ }
392+
393+ pub(crate) fn emit_remove_self_and_next_siblings(&self) {
394+ debug!("emit_remove_self_and_next_siblings()");
395+ self.op0(ChangeDiscriminant::RemoveSelfAndNextSiblings);
396+ }
397+
398+ pub(crate) fn emit_replace_with(&self) {
399+ debug!("emit_replace_with()");
400+ self.op0(ChangeDiscriminant::ReplaceWith);
401+ }
402+
403+ pub(crate) fn emit_set_attribute(&mut self, name: &str, value: &str) {
404+ debug!("emit_set_attribute({:?}, {:?})", name, value);
405+ let name_id = self.ensure_string(name);
406+ let value_id = self.ensure_string(value);
407+ self.op2(ChangeDiscriminant::SetAttribute, name_id, value_id);
408+ }
409+
410+ pub(crate) fn emit_set_attribute_ns(&mut self, name: &str, value: &str) {
411+ debug!("emit_set_attribute_ns({:?}, {:?}", name, value);
412+ let name_id = self.ensure_string(name);
413+ let value_id = self.ensure_string(value);
414+ self.op2(ChangeDiscriminant::SetAttributeNS, name_id, value_id);
415+ }
416+
417+ pub(crate) fn emit_remove_attribute(&mut self, name: &str) {
418+ debug!("emit_remove_attribute({:?})", name);
419+ let name_id = self.ensure_string(name);
420+ self.op1(ChangeDiscriminant::RemoveAttribute, name_id);
421+ }
422+
423+ pub(crate) fn emit_push_first_child(&self) {
424+ debug!("emit_push_first_child()");
425+ self.op0(ChangeDiscriminant::PushFirstChild);
426+ }
427+
428+ pub(crate) fn emit_pop_push_next_sibling(&self) {
429+ debug!("emit_pop_push_next_sibling()");
430+ self.op0(ChangeDiscriminant::PopPushNextSibling);
431+ }
432+
433+ pub(crate) fn emit_pop(&self) {
434+ debug!("emit_pop()");
435+ self.op0(ChangeDiscriminant::Pop);
436+ }
437+
438+ pub(crate) fn emit_append_child(&self) {
439+ debug!("emit_append_child()");
440+ self.op0(ChangeDiscriminant::AppendChild);
441+ }
442+
443+ pub(crate) fn emit_create_text_node(&self, text: &str) {
444+ debug!("emit_create_text_node({:?})", text);
445+ self.op2(
446+ ChangeDiscriminant::CreateTextNode,
447+ text.as_ptr() as u32,
448+ text.len() as u32,
449+ );
450+ }
451+
452+ pub(crate) fn emit_create_element(&mut self, tag_name: &str) {
453+ debug!("emit_create_element({:?})", tag_name);
454+ let tag_name_id = self.ensure_string(tag_name);
455+ self.op1(ChangeDiscriminant::CreateElement, tag_name_id);
456+ }
457+
458+ pub(crate) fn emit_create_element_ns(&mut self, tag_name: &str, ns: &str) {
459+ debug!("emit_create_element_ns({:?}, {:?})", tag_name, ns);
460+ let tag_name_id = self.ensure_string(tag_name);
461+ let ns_id = self.ensure_string(ns);
462+ self.op2(ChangeDiscriminant::CreateElementNS, tag_name_id, ns_id);
463+ }
464+
465+ pub(crate) fn emit_new_event_listener(&mut self, listener: &Listener) {
466+ debug!("emit_new_event_listener({:?})", listener);
467+ let (a, b) = listener.get_callback_parts();
468+ debug_assert!(a != 0);
469+ let event_id = self.ensure_string(listener.event);
470+ self.op3(ChangeDiscriminant::NewEventListener, event_id, a, b);
471+ }
472+
473+ pub(crate) fn emit_update_event_listener(&mut self, listener: &Listener) {
474+ debug!("emit_update_event_listener({:?})", listener);
475+ let (a, b) = listener.get_callback_parts();
476+ debug_assert!(a != 0);
477+ let event_id = self.ensure_string(listener.event);
478+ self.op3(ChangeDiscriminant::UpdateEventListener, event_id, a, b);
479+ }
480+
481+ pub(crate) fn emit_remove_event_listener(&mut self, event: &str) {
482+ debug!("emit_remove_event_listener({:?})", event);
483+ let event_id = self.ensure_string(event);
484+ self.op1(ChangeDiscriminant::RemoveEventListener, event_id);
485+ }
486+}
src/change_list/emitter.rsdeleted−292
@@ -1,292 +0,0 @@
1−//! The `InstructionEmitter` is responsible for encoding change list
2−//! instructions and ensuring that each instruction has the correct number of
3−//! immediates. It ensures that the resulting change list instruction stream is
4−//! *syntactically* correct (opcodes have the correct arity of immediate
5−//! arguments, etc), while `ChangeListBuilder` wraps an emitter and additionally
6−//! ensures that the resulting change list program is *semantically* correct
7−//! (doesn't reference cached strings before they've been added to the cache,
8−//! etc).
9−//!
10−//! We encode the instructions directly into a dedicated bump arena. We
11−//! eventually pass the bump arena's chunks to the interpreter in JS, so it is
12−//! critical that nothing other than change list instructions are allocated
13−//! inside this bump, and that the instructions themselves do not contain any
14−//! padding or uninitialized memory. See the documentation for the the
15−//! `Bump::each_allocated_chunk` method for details.
16−
17−use bumpalo::Bump;
18−
19−#[derive(Debug)]
20−pub(crate) struct InstructionEmitter {
21− bump: Bump,
22−}
23−
24−impl InstructionEmitter {
25− /// Construct a new `InstructionEmitter` with its own bump arena.
26− pub fn new() -> InstructionEmitter {
27− let bump = Bump::new();
28− InstructionEmitter { bump }
29− }
30−
31− /// Invoke the given function with each of the allocated instruction
32− /// sequences that this emitter has built up.
33− #[cfg_attr(feature = "xxx-unstable-internal-use-only", allow(dead_code))]
34− pub fn each_instruction_sequence<F>(&mut self, f: F)
35− where
36− F: FnMut(&[u8]),
37− {
38− // Note: the safety invariants required for `each_allocated_chunk` are
39− // maintained by the fact that everything we encode as allocations in
40− // the bump arena are in the form of `u32`s, and therefore we don't have
41− // any uninitialized memory padding in the arena.
42− unsafe {
43− self.bump.each_allocated_chunk(f);
44− }
45− }
46−
47− /// Reset to an empty sequence of instructions.
48− pub fn reset(&mut self) {
49− self.bump.reset();
50− }
51−}
52−
53−macro_rules! define_change_list_instructions {
54− ( $(
55− $( #[$attr:meta] )*
56− $name:ident (
57− $($immediate:ident),*
58− ) = $discriminant:expr,
59− )* ) => {
60− impl InstructionEmitter {
61− $(
62− $( #[$attr] )*
63− #[inline]
64− pub fn $name(&self $(, $immediate: u32)*) {
65− self.bump.alloc_with(|| [$discriminant $(, $immediate )* ]);
66− }
67− )*
68− }
69− }
70−}
71−
72−define_change_list_instructions! {
73− /// Stack: `[... TextNode] -> [... TextNode]`
74− ///
75− /// ```text
76− /// stack.top().textContent = readString(pointer, length)
77− /// ```
78− set_text(pointer, length) = 0,
79−
80− /// Stack: `[... Node] -> [...]`
81− ///
82− /// ```text
83− /// node = stack.pop()
84− /// while (node.nextSibling) {
85− /// node.nextSibling.remove();
86− /// }
87− /// node.remove()
88− /// ```
89− remove_self_and_next_siblings() = 1,
90−
91− /// Stack: `[... Node Node] -> [... Node]`
92− ///
93− /// ```text
94− /// new = stack.pop()
95− /// old = stack.pop()
96− /// old.replaceWith(new)
97− /// stack.push(new)
98− /// ```
99− replace_with() = 2,
100−
101− /// Stack: `[... Node] -> [... Node]`
102− ///
103− /// ```text
104− /// stack.top().setAttribute(getCachedString(attribute_key), getCachedString(value_key))
105− /// ```
106− set_attribute(attribute_key, value_key) = 3,
107−
108− /// Stack: `[... Node] -> [... Node]`
109− ///
110− /// ```text
111− /// stack.top().removeAttribute(getCachedString(attribute_key))
112− /// ```
113− remove_attribute(attribute_key) = 4,
114−
115− /// Stack: `[... Node] -> [... Node Node]`
116− ///
117− /// ```text
118− /// parent = stack.top()
119− /// child = parent.childNodes[parent.childNodes.length - n - 1]
120− /// stack.push(child)
121− /// ```
122− push_reverse_child(n) = 5,
123−
124− /// Stack: `[... Node Node] -> [... Node Node]`
125− ///
126− /// ```text
127− /// stack.pop();
128− /// parent = stack.top();
129− /// child = parent.childNodes[n]
130− /// stack.push(child)
131− /// ```
132− pop_push_child(n) = 6,
133−
134− /// Stack: `[... T] -> [...]`
135− ///
136− /// ```text
137− /// stack.pop()
138− /// ```
139− pop() = 7,
140−
141− /// Stack: `[... Node Node] -> [... Node]`
142− ///
143− /// ```text
144− /// child = stack.pop()
145− /// stack.top().appendChild(child)
146− /// ```
147− append_child() = 8,
148−
149− /// Stack: `[...] -> [... Node]`
150− ///
151− /// ```text
152− /// stack.push(document.createTextNode(readString(pointer, length)))
153− /// ```
154− create_text_node(pointer, length) = 9,
155−
156− /// Stack: `[...] -> [... Node]`
157− ///
158− /// ```text
159− /// stack.push(document.createElement(getCachedString(tag_name_key))
160− /// ```
161− create_element(tag_name_key) = 10,
162−
163− /// Stack: `[... Node] -> [... Node]`
164− ///
165− /// ```text
166− /// event = getCachedString(event_key)
167− /// callback = createProxyToRustCallback(a, b)
168− /// stack.top().addEventListener(event, callback)
169− /// ```
170− new_event_listener(event_key, a, b) = 11,
171−
172− /// Stack: `[... Node] -> [... Node]`
173− ///
174− /// ```text
175− /// event = getCachedString(event_key)
176− /// new_callback = createProxyToRustCallback(a, b);
177− /// stack.top().updateEventlistener(new_callback)
178− /// ```
179− update_event_listener(event_key, a, b) = 12,
180−
181− /// Stack: `[... Node] -> [... Node]`
182− ///
183− /// ```text
184− /// stack.top().removeEventListener(getCachedString(event_key));
185− /// ```
186− remove_event_listener(event_key) = 13,
187−
188− /// Stack: `[...] -> [...]`
189− ///
190− /// ```text
191− /// addCachedString(readString(pointer, length), key);
192− /// ```
193− add_cached_string(pointer, length, key) = 14,
194−
195− /// Stack: `[...] -> [...]`
196− ///
197− /// ```text
198− /// dropCachedString(key);
199− /// ```
200− drop_cached_string(key) = 15,
201−
202− /// Stack: `[...] -> [... Node]`
203− ///
204− /// ```text
205− /// tag_name = getCachedString(tag_name_key)
206− /// namespace = getCachedString(tag_name_key)
207− /// stack.push(document.createElementNS(tag_name, namespace))
208− /// ```
209− create_element_ns(tag_name_key, namespace_key) = 16,
210−
211− /// Stack: `[...] -> [...]`
212− ///
213− /// ```text
214− /// parent = stack.top()
215− /// children = parent.childNodes
216− /// temp = temp_base
217− /// for i in start .. end:
218− /// temporaries[temp] = children[i]
219− /// temp += 1
220− /// ```
221− save_children_to_temporaries(temp_base, start, end) = 17,
222−
223− /// Stack: `[... Node] -> [... Node Node]`
224− ///
225− /// ```text
226− /// parent = stack.top()
227− /// child = parent.childNodes[n]
228− /// stack.push(child)
229− /// ```
230− push_child(n) = 18,
231−
232− /// Stack: `[...] -> [... Node]`
233− ///
234− /// ```text
235− /// stack.push(temporaries[temp])
236− /// ```
237− push_temporary(temp) = 19,
238−
239− /// Stack: `[... Node Node] -> [... Node]`
240− ///
241− /// ```text
242− /// before = stack.pop()
243− /// after = stack.pop()
244− /// after.insertBefore(before)
245− /// stack.push(before)
246− /// ```
247− insert_before() = 20,
248−
249− /// Stack: `[... Node Node] -> [... Node Node]`
250− ///
251− /// ```text
252− /// stack.pop()
253− /// parent = stack.top()
254− /// child = parent.childNodes[parent.childNodes.length - n - 1]
255− /// stack.push(child)
256− /// ```
257− pop_push_reverse_child(n) = 21,
258−
259− /// Stack: `[... Node] -> [... Node]`
260− ///
261− /// ```text
262− /// parent = stack.top()
263− /// child = parent.childNodes[n]
264− /// child.remove()
265− /// ```
266− remove_child(n) = 22,
267−
268− /// Stack: `[... Node] -> [... Node]`
269− ///
270− /// ```text
271− /// class = getCachedString(class)
272− /// node = stack.top()
273− /// node.className = class
274− /// ```
275− set_class(class) = 23,
276−
277− /// Stack: `[... Node] -> [... Node]`
278− ///
279− /// ```text
280− /// template = stack.top()
281− /// saveTemplate(id, template)
282− /// ```
283− save_template(id) = 24,
284−
285− /// Stack: `[...] -> [... Node]`
286− ///
287− /// ```text
288− /// template = getTemplate(id)
289− /// stack.push(template.cloneNode(true))
290− /// ```
291− push_template(id) = 25,
292−}
src/change_list/js.rsdeleted−40
@@ -1,40 +0,0 @@
1−cfg_if::cfg_if! {
2− if #[cfg(all(feature = "xxx-unstable-internal-use-only", not(target_arch = "wasm32")))] {
3− #[derive(Clone, Debug)]
4− pub struct ChangeListInterpreter {}
5− impl ChangeListInterpreter {
6− pub fn new(_container: &crate::Element) -> ChangeListInterpreter {
7− ChangeListInterpreter {}
8− }
9− pub fn unmount(&self) {}
10− pub fn add_change_list_range(&self, _start: usize, _len: usize) {}
11− pub fn init_events_trampoline(&self, _trampoline: &crate::EventsTrampoline) {}
12− }
13− } else {
14− use wasm_bindgen::prelude::*;
15−
16− #[wasm_bindgen(module = "/js/change-list-interpreter.js")]
17− extern "C" {
18− #[derive(Clone, Debug)]
19− pub type ChangeListInterpreter;
20−
21− #[wasm_bindgen(constructor)]
22− pub fn new(container: &web_sys::Element) -> ChangeListInterpreter;
23−
24− #[wasm_bindgen(structural, method)]
25− pub fn unmount(this: &ChangeListInterpreter);
26−
27− #[wasm_bindgen(structural, method, js_name = addChangeListRange)]
28− pub fn add_change_list_range(this: &ChangeListInterpreter, start: usize, len: usize);
29−
30− #[wasm_bindgen(structural, method, js_name = applyChanges)]
31− pub fn apply_changes(this: &ChangeListInterpreter, memory: JsValue);
32−
33− #[wasm_bindgen(structural, method, js_name = initEventsTrampoline)]
34− pub fn init_events_trampoline(
35− this: &ChangeListInterpreter,
36− trampoline: &crate::EventsTrampoline,
37− );
38− }
39− }
40−}
src/change_list/mod.rsdeleted−353
@@ -1,353 +0,0 @@
1−pub(crate) mod emitter;
2−pub(crate) mod strings;
3−pub(crate) mod traversal;
4−
5−// Note: has to be `pub` because of `wasm-bindgen` visibility restrictions.
6−pub mod js;
7−
8−use self::emitter::InstructionEmitter;
9−use self::strings::{StringKey, StringsCache};
10−use self::traversal::{MoveTo, Traversal};
11−use crate::{cached_set::CacheId, Listener};
12−use fxhash::FxHashSet;
13−
14−#[derive(Debug)]
15−pub(crate) struct ChangeListPersistentState {
16− strings: StringsCache,
17− emitter: InstructionEmitter,
18− traversal: Traversal,
19− interpreter: js::ChangeListInterpreter,
20− templates: FxHashSet<CacheId>,
21−}
22−
23−pub(crate) struct ChangeListBuilder<'a> {
24− state: &'a mut ChangeListPersistentState,
25− next_temporary: u32,
26− forcing_new_listeners: bool,
27−}
28−
29−impl Drop for ChangeListPersistentState {
30− fn drop(&mut self) {
31− self.interpreter.unmount();
32− }
33−}
34−
35−impl ChangeListPersistentState {
36− pub(crate) fn new(container: &crate::Element) -> ChangeListPersistentState {
37− let strings = StringsCache::new();
38− let emitter = InstructionEmitter::new();
39− let traversal = Traversal::new();
40− let interpreter = js::ChangeListInterpreter::new(container);
41− let templates = Default::default();
42− ChangeListPersistentState {
43− strings,
44− emitter,
45− traversal,
46− interpreter,
47− templates,
48− }
49− }
50−
51− pub(crate) fn init_events_trampoline(&mut self, trampoline: &crate::EventsTrampoline) {
52− self.interpreter.init_events_trampoline(trampoline);
53− }
54−
55− pub(crate) fn builder<'a>(&'a mut self) -> ChangeListBuilder<'a> {
56− ChangeListBuilder {
57− state: self,
58− next_temporary: 0,
59− forcing_new_listeners: false,
60− }
61− }
62−}
63−
64−cfg_if::cfg_if! {
65− if #[cfg(all(feature = "xxx-unstable-internal-use-only", not(target_arch = "wasm32")))] {
66− impl ChangeListBuilder<'_> {
67− pub(crate) fn finish(self) {
68− self.state.strings.drop_unused_strings(&self.state.emitter);
69−
70− // Nothing to actually apply the changes to.
71−
72− self.state.emitter.reset();
73− self.state.traversal.reset();
74− }
75− }
76− } else {
77− impl ChangeListBuilder<'_> {
78− pub(crate) fn finish(self) {
79− self.state.strings.drop_unused_strings(&self.state.emitter);
80−
81− // Apply the changes.
82− let interpreter = &self.state.interpreter;
83− self.state.emitter.each_instruction_sequence(|seq| {
84− interpreter.add_change_list_range(seq.as_ptr() as usize, seq.len());
85− });
86− interpreter.apply_changes(wasm_bindgen::memory());
87−
88− self.state.emitter.reset();
89− self.state.traversal.reset();
90− }
91− }
92− }
93−}
94−
95−/// Traversal methods.
96−impl ChangeListBuilder<'_> {
97− pub fn go_down(&mut self) {
98− self.state.traversal.down();
99− }
100−
101− pub fn go_down_to_child(&mut self, index: usize) {
102− self.state.traversal.down();
103− self.state.traversal.sibling(index);
104− }
105−
106− pub fn go_down_to_reverse_child(&mut self, index: usize) {
107− self.state.traversal.down();
108− self.state.traversal.reverse_sibling(index);
109− }
110−
111− pub fn go_up(&mut self) {
112− self.state.traversal.up();
113− }
114−
115− pub fn go_to_sibling(&mut self, index: usize) {
116− self.state.traversal.sibling(index);
117− }
118−
119− pub fn go_to_temp_sibling(&mut self, temp: u32) {
120− self.state.traversal.up();
121− self.state.traversal.down_to_temp(temp);
122− }
123−
124− pub fn go_down_to_temp_child(&mut self, temp: u32) {
125− self.state.traversal.down_to_temp(temp);
126− }
127−
128− pub fn commit_traversal(&mut self) {
129− if self.state.traversal.is_committed() {
130− return;
131− }
132−
133− for mv in self.state.traversal.commit() {
134− match mv {
135− MoveTo::Parent => {
136− debug!("emit: pop");
137− self.state.emitter.pop();
138− }
139− MoveTo::Child(n) => {
140− debug!("emit: push_child({})", n);
141− self.state.emitter.push_child(n);
142− }
143− MoveTo::ReverseChild(n) => {
144− debug!("emit: push_reverse_child({})", n);
145− self.state.emitter.push_reverse_child(n);
146− }
147− MoveTo::Sibling(n) => {
148− debug!("emit: pop_push_child({})", n);
149− self.state.emitter.pop_push_child(n);
150− }
151− MoveTo::ReverseSibling(n) => {
152− debug!("emit: pop_push_reverse_child({})", n);
153− self.state.emitter.pop_push_reverse_child(n);
154− }
155− MoveTo::TempChild(temp) => {
156− debug!("emit: push_temporary({})", temp);
157− self.state.emitter.push_temporary(temp);
158− }
159− }
160− }
161− }
162−
163− pub fn traversal_is_committed(&self) -> bool {
164− self.state.traversal.is_committed()
165− }
166−}
167−
168−impl ChangeListBuilder<'_> {
169− pub fn next_temporary(&self) -> u32 {
170− self.next_temporary
171− }
172−
173− pub fn set_next_temporary(&mut self, next_temporary: u32) {
174− self.next_temporary = next_temporary;
175− }
176−
177− pub fn save_children_to_temporaries(&mut self, start: usize, end: usize) -> u32 {
178− debug_assert!(self.traversal_is_committed());
179− debug_assert!(start < end);
180− let temp_base = self.next_temporary;
181− debug!(
182− "emit: save_children_to_temporaries({}, {}, {})",
183− temp_base, start, end
184− );
185− self.next_temporary = temp_base + (end - start) as u32;
186− self.state
187− .emitter
188− .save_children_to_temporaries(temp_base, start as u32, end as u32);
189− temp_base
190− }
191−
192− pub fn push_temporary(&self, temp: u32) {
193− debug_assert!(self.traversal_is_committed());
194− debug!("emit: push_temporary({})", temp);
195− self.state.emitter.push_temporary(temp);
196− }
197−
198− pub fn remove_child(&self, child: usize) {
199− debug_assert!(self.traversal_is_committed());
200− debug!("emit: remove_child({})", child);
201− self.state.emitter.remove_child(child as u32);
202− }
203−
204− pub fn insert_before(&self) {
205− debug_assert!(self.traversal_is_committed());
206− debug!("emit: insert_before()");
207− self.state.emitter.insert_before();
208− }
209−
210− pub fn ensure_string(&mut self, string: &str) -> StringKey {
211− self.state
212− .strings
213− .ensure_string(string, &self.state.emitter)
214− }
215−
216− pub fn set_text(&self, text: &str) {
217− debug_assert!(self.traversal_is_committed());
218− debug!("emit: set_text({:?})", text);
219− self.state
220− .emitter
221− .set_text(text.as_ptr() as u32, text.len() as u32);
222− }
223−
224− pub fn remove_self_and_next_siblings(&self) {
225− debug_assert!(self.traversal_is_committed());
226− debug!("emit: remove_self_and_next_siblings()");
227− self.state.emitter.remove_self_and_next_siblings();
228− }
229−
230− pub fn replace_with(&self) {
231− debug_assert!(self.traversal_is_committed());
232− debug!("emit: replace_with()");
233− self.state.emitter.replace_with();
234− }
235−
236− pub fn set_attribute(&mut self, name: &str, value: &str, is_namespaced: bool) {
237− debug_assert!(self.traversal_is_committed());
238− if name == "class" && !is_namespaced {
239− let class_id = self.ensure_string(value);
240− debug!("emit: set_class({:?})", value);
241− self.state.emitter.set_class(class_id.into());
242− } else {
243− let name_id = self.ensure_string(name);
244− let value_id = self.ensure_string(value);
245− debug!("emit: set_attribute({:?}, {:?})", name, value);
246− self.state
247− .emitter
248− .set_attribute(name_id.into(), value_id.into());
249− }
250− }
251−
252− pub fn remove_attribute(&mut self, name: &str) {
253− debug_assert!(self.traversal_is_committed());
254− debug!("emit: remove_attribute({:?})", name);
255− let name_id = self.ensure_string(name);
256− self.state.emitter.remove_attribute(name_id.into());
257− }
258−
259− pub fn append_child(&self) {
260− debug_assert!(self.traversal_is_committed());
261− debug!("emit: append_child()");
262− self.state.emitter.append_child();
263− }
264−
265− pub fn create_text_node(&self, text: &str) {
266− debug_assert!(self.traversal_is_committed());
267− debug!("emit: create_text_node({:?})", text);
268− self.state
269− .emitter
270− .create_text_node(text.as_ptr() as u32, text.len() as u32);
271− }
272−
273− pub fn create_element(&mut self, tag_name: &str) {
274− debug_assert!(self.traversal_is_committed());
275− debug!("emit: create_element({:?})", tag_name);
276− let tag_name_id = self.ensure_string(tag_name);
277− self.state.emitter.create_element(tag_name_id.into());
278− }
279−
280− pub fn create_element_ns(&mut self, tag_name: &str, ns: &str) {
281− debug_assert!(self.traversal_is_committed());
282− debug!("emit: create_element_ns({:?}, {:?})", tag_name, ns);
283− let tag_name_id = self.ensure_string(tag_name);
284− let ns_id = self.ensure_string(ns);
285− self.state
286− .emitter
287− .create_element_ns(tag_name_id.into(), ns_id.into());
288− }
289−
290− pub fn push_force_new_listeners(&mut self) -> bool {
291− let old = self.forcing_new_listeners;
292− self.forcing_new_listeners = true;
293− old
294− }
295−
296− pub fn pop_force_new_listeners(&mut self, previous: bool) {
297− debug_assert!(self.forcing_new_listeners);
298− self.forcing_new_listeners = previous;
299− }
300−
301− pub fn new_event_listener(&mut self, listener: &Listener) {
302− debug_assert!(self.traversal_is_committed());
303− debug!("emit: new_event_listener({:?})", listener);
304− let (a, b) = listener.get_callback_parts();
305− debug_assert!(a != 0);
306− let event_id = self.ensure_string(listener.event);
307− self.state.emitter.new_event_listener(event_id.into(), a, b);
308− }
309−
310− pub fn update_event_listener(&mut self, listener: &Listener) {
311− debug_assert!(self.traversal_is_committed());
312−
313− if self.forcing_new_listeners {
314− self.new_event_listener(listener);
315− return;
316− }
317−
318− debug!("emit: update_event_listener({:?})", listener);
319− let (a, b) = listener.get_callback_parts();
320− debug_assert!(a != 0);
321− let event_id = self.ensure_string(listener.event);
322− self.state
323− .emitter
324− .update_event_listener(event_id.into(), a, b);
325− }
326−
327− pub fn remove_event_listener(&mut self, event: &str) {
328− debug_assert!(self.traversal_is_committed());
329− debug!("emit: remove_event_listener({:?})", event);
330− let event_id = self.ensure_string(event);
331− self.state.emitter.remove_event_listener(event_id.into());
332− }
333−
334− #[inline]
335− pub fn has_template(&mut self, id: CacheId) -> bool {
336− self.state.templates.contains(&id)
337− }
338−
339− pub fn save_template(&mut self, id: CacheId) {
340− debug_assert!(self.traversal_is_committed());
341− debug_assert!(!self.has_template(id));
342− debug!("emit: save_template({:?})", id);
343− self.state.templates.insert(id);
344− self.state.emitter.save_template(id.into());
345− }
346−
347− pub fn push_template(&mut self, id: CacheId) {
348− debug_assert!(self.traversal_is_committed());
349− debug_assert!(self.has_template(id));
350− debug!("emit: push_template({:?})", id);
351− self.state.emitter.push_template(id.into());
352− }
353−}
src/change_list/strings.rsdeleted−66
@@ -1,66 +0,0 @@
1−use crate::change_list::emitter::InstructionEmitter;
2−use fxhash::FxHashMap;
3−
4−#[derive(Clone, Copy, Debug, PartialEq, Eq)]
5−pub struct StringKey(u32);
6−
7−impl From<StringKey> for u32 {
8− #[inline]
9− fn from(key: StringKey) -> u32 {
10− key.0
11− }
12−}
13−
14−#[derive(Debug)]
15−struct StringsCacheEntry {
16− key: StringKey,
17− used: bool,
18−}
19−
20−#[derive(Debug, Default)]
21−pub(crate) struct StringsCache {
22− entries: FxHashMap<String, StringsCacheEntry>,
23− next_string_key: u32,
24−}
25−
26−impl StringsCache {
27− /// Create a new, empty strings cache.
28− pub fn new() -> StringsCache {
29− Default::default()
30− }
31−
32− /// Ensure that the given string is cached, and get its key.
33− pub fn ensure_string(&mut self, string: &str, emitter: &InstructionEmitter) -> StringKey {
34− if let Some(entry) = self.entries.get_mut(string) {
35− entry.used = true;
36− entry.key
37− } else {
38− let key = StringKey(self.next_string_key);
39− self.next_string_key += 1;
40− let entry = StringsCacheEntry { key, used: true };
41− self.entries.insert(string.to_string(), entry);
42− emitter.add_cached_string(string.as_ptr() as u32, string.len() as u32, key.into());
43− key
44− }
45− }
46−
47− pub fn drop_unused_strings(&mut self, emitter: &InstructionEmitter) {
48− self.entries.retain(|string, entry| {
49− if entry.used {
50− // Since this entry was used during while rendering this frame,
51− // it is likely going to be used for the next frame as well. So
52− // we keep it in the cache so that we don't have to repopulate
53− // and resync the cache next frame (assuming it is reused), but
54− // we set the `used` flag to false so that if it is not used
55− // next frame, it will be cleaned up.
56− entry.used = false;
57− true
58− } else {
59− let key = entry.key.into();
60− debug!("emit: drop_cached_string({}) = {:?}", key, string);
61− emitter.drop_cached_string(key);
62− false
63− }
64− });
65− }
66−}
src/change_list/traversal.rsdeleted−344
@@ -1,344 +0,0 @@
1−//! Keeps track of where we are moving in a DOM tree, and shortens traversal
2−//! paths between mutations to their minimal number of operations.
3−
4−#[derive(Clone, Copy, Debug, PartialEq, Eq)]
5−pub enum MoveTo {
6− /// Move from the current node up to its parent.
7− Parent,
8−
9− /// Move to the current node's n^th child.
10− Child(u32),
11−
12− /// Move to the current node's n^th from last child.
13− ReverseChild(u32),
14−
15− /// Move to the n^th sibling. Not relative from the current
16− /// location. Absolute indexed within all of the current siblings.
17− Sibling(u32),
18−
19− /// Move to the n^th from last sibling. Not relative from the current
20− /// location. Absolute indexed within all of the current siblings.
21− ReverseSibling(u32),
22−
23− /// Move down to the given saved temporary child.
24− TempChild(u32),
25−}
26−
27−#[derive(Debug)]
28−pub struct Traversal {
29− uncommitted: Vec<MoveTo>,
30−}
31−
32−impl Traversal {
33− /// Construct a new `Traversal` with its internal storage backed by the
34− /// given bump arena.
35− pub fn new() -> Traversal {
36− Traversal {
37− uncommitted: Vec::with_capacity(32),
38− }
39− }
40−
41− /// Move the traversal up in the tree.
42− pub fn up(&mut self) {
43− match self.uncommitted.last() {
44− Some(MoveTo::Sibling(_)) | Some(MoveTo::ReverseSibling(_)) => {
45− self.uncommitted.pop();
46− self.uncommitted.push(MoveTo::Parent);
47− }
48− Some(MoveTo::TempChild(_)) | Some(MoveTo::Child(_)) | Some(MoveTo::ReverseChild(_)) => {
49− self.uncommitted.pop();
50− // And we're back at the parent.
51− }
52− _ => {
53− self.uncommitted.push(MoveTo::Parent);
54− }
55− }
56− }
57−
58− /// Move the traversal down in the tree to the first child of the current
59− /// node.
60− pub fn down(&mut self) {
61− if let Some(&MoveTo::Parent) = self.uncommitted.last() {
62− self.uncommitted.pop();
63− self.sibling(0);
64− } else {
65− self.uncommitted.push(MoveTo::Child(0));
66− }
67− }
68−
69− /// Move the traversal to the n^th sibling.
70− pub fn sibling(&mut self, index: usize) {
71− let index = index as u32;
72− match self.uncommitted.last_mut() {
73− Some(MoveTo::Sibling(ref mut n)) | Some(MoveTo::Child(ref mut n)) => {
74− *n = index;
75− }
76− Some(MoveTo::ReverseSibling(_)) => {
77− self.uncommitted.pop();
78− self.uncommitted.push(MoveTo::Sibling(index));
79− }
80− Some(MoveTo::TempChild(_)) | Some(MoveTo::ReverseChild(_)) => {
81− self.uncommitted.pop();
82− self.uncommitted.push(MoveTo::Child(index))
83− }
84− _ => {
85− self.uncommitted.push(MoveTo::Sibling(index));
86− }
87− }
88− }
89−
90− /// Move the the n^th from last sibling.
91− pub fn reverse_sibling(&mut self, index: usize) {
92− let index = index as u32;
93− match self.uncommitted.last_mut() {
94− Some(MoveTo::ReverseSibling(ref mut n)) | Some(MoveTo::ReverseChild(ref mut n)) => {
95− *n = index;
96− }
97− Some(MoveTo::Sibling(_)) => {
98− self.uncommitted.pop();
99− self.uncommitted.push(MoveTo::ReverseSibling(index));
100− }
101− Some(MoveTo::TempChild(_)) | Some(MoveTo::Child(_)) => {
102− self.uncommitted.pop();
103− self.uncommitted.push(MoveTo::ReverseChild(index))
104− }
105− _ => {
106− self.uncommitted.push(MoveTo::ReverseSibling(index));
107− }
108− }
109− }
110−
111− /// Go to the given saved temporary.
112− pub fn down_to_temp(&mut self, temp: u32) {
113− match self.uncommitted.last() {
114− Some(MoveTo::Sibling(_)) | Some(MoveTo::ReverseSibling(_)) => {
115− self.uncommitted.pop();
116− }
117− Some(MoveTo::Parent)
118− | Some(MoveTo::TempChild(_))
119− | Some(MoveTo::Child(_))
120− | Some(MoveTo::ReverseChild(_))
121− | None => {
122− // Can't remove moves to parents since we rely on their stack
123− // pops.
124− }
125− }
126− self.uncommitted.push(MoveTo::TempChild(temp));
127− }
128−
129− /// Are all the traversal's moves committed? That is, are there no moves
130− /// that have *not* been committed yet?
131− #[inline]
132− pub fn is_committed(&self) -> bool {
133− self.uncommitted.is_empty()
134− }
135−
136− /// Commit this traversals moves and return the optimized path from the last
137− /// commit.
138− #[inline]
139− pub fn commit(&mut self) -> Moves {
140− Moves {
141− inner: self.uncommitted.drain(..),
142− }
143− }
144−
145− #[inline]
146− pub fn reset(&mut self) {
147− self.uncommitted.clear();
148− }
149−}
150−
151−pub struct Moves<'a> {
152− inner: std::vec::Drain<'a, MoveTo>,
153−}
154−
155−impl Iterator for Moves<'_> {
156− type Item = MoveTo;
157−
158− #[inline]
159− fn next(&mut self) -> Option<MoveTo> {
160− self.inner.next()
161− }
162−}
163−
164−#[cfg(test)]
165−mod tests {
166− use super::*;
167−
168− #[test]
169− fn test_traversal() {
170− fn t<F>(f: F) -> Box<dyn FnMut(&mut Traversal)>
171− where
172− F: 'static + FnMut(&mut Traversal),
173− {
174− Box::new(f) as _
175− }
176−
177− for (mut traverse, expected_moves) in vec![
178− (
179− t(|t| {
180− t.down();
181− }),
182− vec![MoveTo::Child(0)],
183− ),
184− (
185− t(|t| {
186− t.up();
187− }),
188− vec![MoveTo::Parent],
189− ),
190− (
191− t(|t| {
192− t.sibling(42);
193− }),
194− vec![MoveTo::Sibling(42)],
195− ),
196− (
197− t(|t| {
198− t.down();
199− t.up();
200− }),
201− vec![],
202− ),
203− (
204− t(|t| {
205− t.down();
206− t.sibling(2);
207− t.up();
208− }),
209− vec![],
210− ),
211− (
212− t(|t| {
213− t.down();
214− t.sibling(3);
215− }),
216− vec![MoveTo::Child(3)],
217− ),
218− (
219− t(|t| {
220− t.down();
221− t.sibling(4);
222− t.sibling(8);
223− }),
224− vec![MoveTo::Child(8)],
225− ),
226− (
227− t(|t| {
228− t.sibling(1);
229− t.sibling(1);
230− }),
231− vec![MoveTo::Sibling(1)],
232− ),
233− (
234− t(|t| {
235− t.reverse_sibling(3);
236− }),
237− vec![MoveTo::ReverseSibling(3)],
238− ),
239− (
240− t(|t| {
241− t.down();
242− t.reverse_sibling(3);
243− }),
244− vec![MoveTo::ReverseChild(3)],
245− ),
246− (
247− t(|t| {
248− t.down();
249− t.reverse_sibling(3);
250− t.up();
251− }),
252− vec![],
253− ),
254− (
255− t(|t| {
256− t.down();
257− t.reverse_sibling(3);
258− t.reverse_sibling(6);
259− }),
260− vec![MoveTo::ReverseChild(6)],
261− ),
262− (
263− t(|t| {
264− t.up();
265− t.reverse_sibling(3);
266− t.reverse_sibling(6);
267− }),
268− vec![MoveTo::Parent, MoveTo::ReverseSibling(6)],
269− ),
270− (
271− t(|t| {
272− t.up();
273− t.sibling(3);
274− t.sibling(6);
275− }),
276− vec![MoveTo::Parent, MoveTo::Sibling(6)],
277− ),
278− (
279− t(|t| {
280− t.sibling(3);
281− t.sibling(6);
282− t.up();
283− }),
284− vec![MoveTo::Parent],
285− ),
286− (
287− t(|t| {
288− t.reverse_sibling(3);
289− t.reverse_sibling(6);
290− t.up();
291− }),
292− vec![MoveTo::Parent],
293− ),
294− (
295− t(|t| {
296− t.down();
297− t.down_to_temp(3);
298− }),
299− vec![MoveTo::Child(0), MoveTo::TempChild(3)],
300− ),
301− (
302− t(|t| {
303− t.down_to_temp(3);
304− t.sibling(5);
305− }),
306− vec![MoveTo::Child(5)],
307− ),
308− (
309− t(|t| {
310− t.down_to_temp(3);
311− t.reverse_sibling(5);
312− }),
313− vec![MoveTo::ReverseChild(5)],
314− ),
315− (
316− t(|t| {
317− t.down_to_temp(3);
318− t.up();
319− }),
320− vec![],
321− ),
322− (
323− t(|t| {
324− t.sibling(2);
325− t.up();
326− t.down_to_temp(3);
327− }),
328− vec![MoveTo::Parent, MoveTo::TempChild(3)],
329− ),
330− (
331− t(|t| {
332− t.up();
333− t.down_to_temp(3);
334− }),
335− vec![MoveTo::Parent, MoveTo::TempChild(3)],
336− ),
337− ] {
338− let mut traversal = Traversal::new();
339− traverse(&mut traversal);
340− let actual_moves: Vec<_> = traversal.commit().collect();
341− assert_eq!(actual_moves, expected_moves);
342− }
343− }
344−}
src/diff.rs+101−916
@@ -1,60 +1,48 @@
11use crate::{
22 cached_set::{CacheId, CachedSet},
3− change_list::ChangeListBuilder,
3+ change_list::ChangeList,
44 events::EventsRegistry,
55 node::{Attribute, ElementNode, Listener, Node, NodeKind, TextNode},
66};
7−use fxhash::{FxHashMap, FxHashSet};
8−use std::cmp::Ordering;
9−use std::u32;
10−use wasm_bindgen::UnwrapThrowExt;
7+use std::cmp;
118
12−// Diff the `old` node with the `new` node. Emits instructions to modify a
13−// physical DOM node that reflects `old` into something that reflects `new`.
14−//
15−// Upon entry to this function, the physical DOM node must be on the top of the
16−// change list stack:
17−//
18−// [... node]
19−//
20−// The change list stack is in the same state when this function exits.
219pub(crate) fn diff(
2210 cached_set: &CachedSet,
23− change_list: &mut ChangeListBuilder,
11+ change_list: &mut ChangeList,
2412 registry: &mut EventsRegistry,
25− old: &Node,
26− new: &Node,
27− cached_roots: &mut FxHashSet<CacheId>,
13+ old: Node,
14+ new: Node,
15+ cached_roots: &mut bumpalo::collections::Vec<CacheId>,
2816) {
2917 match (&new.kind, &old.kind) {
3018 (
3119 &NodeKind::Text(TextNode { text: new_text }),
3220 &NodeKind::Text(TextNode { text: old_text }),
3321 ) => {
22+ debug!(" both are text nodes");
3423 if new_text != old_text {
35− change_list.commit_traversal();
36− change_list.set_text(new_text);
24+ debug!(" text needs updating");
25+ change_list.emit_set_text(new_text);
3726 }
3827 }
3928
4029 (&NodeKind::Text(_), &NodeKind::Element(_)) => {
41− change_list.commit_traversal();
30+ debug!(" replacing a text node with an element");
4231 create(cached_set, change_list, registry, new, cached_roots);
4332 registry.remove_subtree(&old);
44− change_list.replace_with();
33+ change_list.emit_replace_with();
4534 }
4635
4736 (&NodeKind::Element(_), &NodeKind::Text(_)) => {
48− change_list.commit_traversal();
37+ debug!(" replacing an element with a text node");
4938 create(cached_set, change_list, registry, new, cached_roots);
5039 // Note: text nodes cannot have event listeners, so we don't need to
5140 // remove the old node's listeners from our registry her.
52− change_list.replace_with();
41+ change_list.emit_replace_with();
5342 }
5443
5544 (
5645 &NodeKind::Element(ElementNode {
57− key: _,
5846 tag_name: new_tag_name,
5947 listeners: new_listeners,
6048 attributes: new_attributes,
@@ -62,7 +50,6 @@ pub(crate) fn diff(
6250 namespace: new_namespace,
6351 }),
6452 &NodeKind::Element(ElementNode {
65− key: _,
6653 tag_name: old_tag_name,
6754 listeners: old_listeners,
6855 attributes: old_attributes,
@@ -70,15 +57,16 @@ pub(crate) fn diff(
7057 namespace: old_namespace,
7158 }),
7259 ) => {
60+ debug!(" updating an element");
7361 if new_tag_name != old_tag_name || new_namespace != old_namespace {
74− change_list.commit_traversal();
62+ debug!(" different tag names or namespaces; creating new element and replacing old element");
7563 create(cached_set, change_list, registry, new, cached_roots);
7664 registry.remove_subtree(&old);
77− change_list.replace_with();
65+ change_list.emit_replace_with();
7866 return;
7967 }
8068 diff_listeners(change_list, registry, old_listeners, new_listeners);
81− diff_attributes(change_list, old_attributes, new_attributes, new_namespace.is_some());
69+ diff_attributes(change_list, old_attributes, new_attributes);
8270 diff_children(
8371 cached_set,
8472 change_list,
@@ -91,81 +79,46 @@ pub(crate) fn diff(
9179
9280 // Both the new and old nodes are cached.
9381 (&NodeKind::Cached(ref new), &NodeKind::Cached(ref old)) => {
94− cached_roots.insert(new.id);
82+ cached_roots.push(new.id);
9583
9684 if new.id == old.id {
9785 // This is the same cached node, so nothing has changed!
9886 return;
9987 }
10088
101− let (new, new_template) = cached_set.get(new.id);
102− let (old, old_template) = cached_set.get(old.id);
103− if new_template == old_template {
104− // If they are both using the same template, then just diff the
105− // subtrees.
106− diff(cached_set, change_list, registry, old, new, cached_roots);
107− } else {
108− // Otherwise, they are probably different enough that
109− // re-constructing the subtree from scratch should be faster.
110− // This doubly holds true if we have a new template.
111− change_list.commit_traversal();
112− create_and_replace(
113− cached_set,
114− change_list,
115− registry,
116− new_template,
117− old,
118− new,
119− cached_roots,
120− );
121− }
89+ let new = cached_set.get(new.id);
90+ let old = cached_set.get(old.id);
91+ diff(cached_set, change_list, registry, old, new, cached_roots);
12292 }
12393
12494 // New cached node when the old node was not cached. In this scenario,
12595 // we assume that they are pretty different, and it isn't worth diffing
12696 // the subtrees, so we just create the new cached node afresh.
12797 (&NodeKind::Cached(ref c), _) => {
128− change_list.commit_traversal();
129− cached_roots.insert(c.id);
130− let (new, new_template) = cached_set.get(c.id);
131− create_and_replace(
132− cached_set,
133− change_list,
134− registry,
135− new_template,
136− old,
137− new,
138− cached_roots,
139− );
98+ cached_roots.push(c.id);
99+ let new = cached_set.get(c.id);
100+ create(cached_set, change_list, registry, new, cached_roots);
101+ registry.remove_subtree(&old);
102+ change_list.emit_replace_with();
140103 }
141104
142105 // Old cached node and new non-cached node. Again, assume that they are
143106 // probably pretty different and create the new non-cached node afresh.
144107 (_, &NodeKind::Cached(_)) => {
145− change_list.commit_traversal();
146108 create(cached_set, change_list, registry, new, cached_roots);
147109 registry.remove_subtree(&old);
148− change_list.replace_with();
110+ change_list.emit_replace_with();
149111 }
150112 }
151113}
152114
153−// Diff event listeners between `old` and `new`.
154−//
155−// The listeners' node must be on top of the change list stack:
156−//
157−// [... node]
158−//
159−// The change list stack is left unchanged.
160115fn diff_listeners(
161− change_list: &mut ChangeListBuilder,
116+ change_list: &mut ChangeList,
162117 registry: &mut EventsRegistry,
163118 old: &[Listener],
164119 new: &[Listener],
165120) {
166− if !old.is_empty() || !new.is_empty() {
167− change_list.commit_traversal();
168− }
121+ debug!(" updating event listeners");
169122
170123 'outer1: for new_l in new {
171124 unsafe {
@@ -177,12 +130,12 @@ fn diff_listeners(
177130
178131 for old_l in old {
179132 if new_l.event == old_l.event {
180− change_list.update_event_listener(new_l);
133+ change_list.emit_update_event_listener(new_l);
181134 continue 'outer1;
182135 }
183136 }
184137
185− change_list.new_event_listener(new_l);
138+ change_list.emit_new_event_listener(new_l);
186139 }
187140
188141 'outer2: for old_l in old {
@@ -193,37 +146,28 @@ fn diff_listeners(
193146 continue 'outer2;
194147 }
195148 }
196− change_list.remove_event_listener(old_l.event);
149+ change_list.emit_remove_event_listener(old_l.event);
197150 }
198151}
199152
200−// Diff a node's attributes.
201−//
202−// The attributes' node must be on top of the change list stack:
203−//
204−// [... node]
205−//
206−// The change list stack is left unchanged.
207−fn diff_attributes(change_list: &mut ChangeListBuilder, old: &[Attribute], new: &[Attribute], is_namespaced: bool) {
153+fn diff_attributes(change_list: &mut ChangeList, old: &[Attribute], new: &[Attribute]) {
154+ debug!(" updating attributes");
155+
208156 // Do O(n^2) passes to add/update and remove attributes, since
209157 // there are almost always very few attributes.
210158 'outer: for new_attr in new {
211159 if new_attr.is_volatile() {
212− change_list.commit_traversal();
213− change_list.set_attribute(new_attr.name, new_attr.value, is_namespaced);
160+ change_list.emit_set_attribute(new_attr.name, new_attr.value);
214161 } else {
215162 for old_attr in old {
216163 if old_attr.name == new_attr.name {
217164 if old_attr.value != new_attr.value {
218− change_list.commit_traversal();
219− change_list.set_attribute(new_attr.name, new_attr.value, is_namespaced);
165+ change_list.emit_set_attribute(new_attr.name, new_attr.value);
220166 }
221167 continue 'outer;
222168 }
223169 }
224−
225− change_list.commit_traversal();
226− change_list.set_attribute(new_attr.name, new_attr.value, is_namespaced);
170+ change_list.emit_set_attribute(new_attr.name, new_attr.value);
227171 }
228172 }
229173
@@ -233,706 +177,95 @@ fn diff_attributes(change_list: &mut ChangeListBuilder, old: &[Attribute], new:
233177 continue 'outer2;
234178 }
235179 }
236−
237− change_list.commit_traversal();
238− change_list.remove_attribute(old_attr.name);
180+ change_list.emit_remove_attribute(old_attr.name);
239181 }
240182}
241183
242−// Diff the given set of old and new children.
243−//
244−// The parent must be on top of the change list stack when this function is
245−// entered:
246−//
247−// [... parent]
248−//
249−// the change list stack is in the same state when this function returns.
250184fn diff_children(
251185 cached_set: &CachedSet,
252− change_list: &mut ChangeListBuilder,
186+ change_list: &mut ChangeList,
253187 registry: &mut EventsRegistry,
254188 old: &[Node],
255189 new: &[Node],
256− cached_roots: &mut FxHashSet<CacheId>,
190+ cached_roots: &mut bumpalo::collections::Vec<CacheId>,
257191) {
258− if new.is_empty() {
259− if !old.is_empty() {
260− change_list.commit_traversal();
261− remove_all_children(change_list, registry, old);
262− }
263− return;
264− }
265−
266− if new.len() == 1 {
267− match (old.first(), &new[0]) {
268− (
269− Some(&Node {
270− kind: NodeKind::Text(TextNode { text: old_text }),
271− }),
272− &Node {
273− kind: NodeKind::Text(TextNode { text: new_text }),
274− },
275− ) if old_text == new_text => {
276− // Don't take this fast path...
277− }
278− (
279− _,
280− &Node {
281− kind: NodeKind::Text(TextNode { text }),
282− },
283− ) => {
284− change_list.commit_traversal();
285− change_list.set_text(text);
286− for o in old {
287− registry.remove_subtree(o);
288− }
289− return;
290− }
291− (_, _) => {}
292− }
293− }
294−
295− if old.is_empty() {
296− if !new.is_empty() {
297− change_list.commit_traversal();
298− create_and_append_children(cached_set, change_list, registry, new, cached_roots);
299− }
300− return;
301− }
302−
303− let new_is_keyed = new[0].key().is_some();
304− let old_is_keyed = old[0].key().is_some();
305−
306− debug_assert!(
307− new.iter().all(|n| n.key().is_some() == new_is_keyed),
308− "all siblings must be keyed or all siblings must be non-keyed"
309− );
310− debug_assert!(
311− old.iter().all(|o| o.key().is_some() == old_is_keyed),
312− "all siblings must be keyed or all siblings must be non-keyed"
313− );
314−
315− if new_is_keyed && old_is_keyed {
316− let t = change_list.next_temporary();
317− diff_keyed_children(cached_set, change_list, registry, old, new, cached_roots);
318− change_list.set_next_temporary(t);
319− } else {
320− diff_non_keyed_children(cached_set, change_list, registry, old, new, cached_roots);
321− }
322−}
323−
324−// Diffing "keyed" children.
325−//
326−// With keyed children, we care about whether we delete, move, or create nodes
327−// versus mutate existing nodes in place. Presumably there is some sort of CSS
328−// transition animation that makes the virtual DOM diffing algorithm
329−// observable. By specifying keys for nodes, we know which virtual DOM nodes
330−// must reuse (or not reuse) the same physical DOM nodes.
331−//
332−// This is loosely based on Inferno's keyed patching implementation. However, we
333−// have to modify the algorithm since we are compiling the diff down into change
334−// list instructions that will be executed later, rather than applying the
335−// changes to the DOM directly as we compare virtual DOMs.
336−//
337−// https://github.com/infernojs/inferno/blob/36fd96/packages/inferno/src/DOM/patching.ts#L530-L739
338−//
339−// When entering this function, the parent must be on top of the change list
340−// stack:
341−//
342−// [... parent]
343−//
344−// Upon exiting, the change list stack is in the same state.
345−fn diff_keyed_children(
346− cached_set: &CachedSet,
347− change_list: &mut ChangeListBuilder,
348− registry: &mut EventsRegistry,
349− old: &[Node],
350− new: &[Node],
351− cached_roots: &mut FxHashSet<CacheId>,
352−) {
353− if cfg!(debug_assertions) {
354− let mut keys = FxHashSet::default();
355− let mut assert_unique_keys = |children: &[Node]| {
356− keys.clear();
357− for child in children {
358− let key = child.key();
359− debug_assert!(
360− key.is_some(),
361− "if any sibling is keyed, all siblings must be keyed"
362− );
363− keys.insert(key);
364− }
365− debug_assert_eq!(
366− children.len(),
367− keys.len(),
368− "keyed siblings must each have a unique key"
369− );
370− };
371− assert_unique_keys(old);
372− assert_unique_keys(new);
373− }
374−
375− // First up, we diff all the nodes with the same key at the beginning of the
376− // children.
377− //
378− // `shared_prefix_count` is the count of how many nodes at the start of
379− // `new` and `old` share the same keys.
380− let shared_prefix_count =
381− match diff_keyed_prefix(cached_set, change_list, registry, old, new, cached_roots) {
382− KeyedPrefixResult::Finished => return,
383− KeyedPrefixResult::MoreWorkToDo(count) => count,
384− };
385−
386− // Next, we find out how many of the nodes at the end of the children have
387− // the same key. We do _not_ diff them yet, since we want to emit the change
388− // list instructions such that they can be applied in a single pass over the
389− // DOM. Instead, we just save this information for later.
390− //
391− // `shared_suffix_count` is the count of how many nodes at the end of `new`
392− // and `old` share the same keys.
393− let shared_suffix_count = old[shared_prefix_count..]
394− .iter()
395− .rev()
396− .zip(new[shared_prefix_count..].iter().rev())
397− .take_while(|&(old, new)| old.key() == new.key())
398− .count();
399−
400− let old_shared_suffix_start = old.len() - shared_suffix_count;
401− let new_shared_suffix_start = new.len() - shared_suffix_count;
402−
403− // Ok, we now hopefully have a smaller range of children in the middle
404− // within which to re-order nodes with the same keys, remove old nodes with
405− // now-unused keys, and create new nodes with fresh keys.
406− diff_keyed_middle(
407− cached_set,
408− change_list,
409− registry,
410− &old[shared_prefix_count..old_shared_suffix_start],
411− &new[shared_prefix_count..new_shared_suffix_start],
412− cached_roots,
413− shared_prefix_count,
414− shared_suffix_count,
415− old_shared_suffix_start,
416− );
417−
418− // Finally, diff the nodes at the end of `old` and `new` that share keys.
419− let old_suffix = &old[old_shared_suffix_start..];
420− let new_suffix = &new[new_shared_suffix_start..];
421− debug_assert_eq!(old_suffix.len(), new_suffix.len());
422− if !old_suffix.is_empty() {
423− diff_keyed_suffix(
424− cached_set,
425− change_list,
426− registry,
427− old_suffix,
428− new_suffix,
429− cached_roots,
430− new_shared_suffix_start,
431− );
432− }
433−}
434−
435−enum KeyedPrefixResult {
436− // Fast path: we finished diffing all the children just by looking at the
437− // prefix of shared keys!
438− Finished,
439− // There is more diffing work to do. Here is a count of how many children at
440− // the beginning of `new` and `old` we already processed.
441− MoreWorkToDo(usize),
442−}
443−
444−// Diff the prefix of children in `new` and `old` that share the same keys in
445−// the same order.
446−//
447−// Upon entry of this function, the change list stack must be:
448−//
449−// [... parent]
450−//
451−// Upon exit, the change list stack is the same.
452−fn diff_keyed_prefix(
453− cached_set: &CachedSet,
454− change_list: &mut ChangeListBuilder,
455− registry: &mut EventsRegistry,
456− old: &[Node],
457− new: &[Node],
458− cached_roots: &mut FxHashSet<CacheId>,
459−) -> KeyedPrefixResult {
460− change_list.go_down();
461− let mut shared_prefix_count = 0;
462−
463− for (i, (old, new)) in old.iter().zip(new.iter()).enumerate() {
464− if old.key() != new.key() {
465− break;
192+ debug!(" updating children shared by old and new");
193+
194+ let num_children_to_diff = cmp::min(new.len(), old.len());
195+ let mut new_children = new.iter();
196+ let mut old_children = old.iter();
197+ let mut pushed = false;
198+
199+ for (i, (new_child, old_child)) in new_children
200+ .by_ref()
201+ .zip(old_children.by_ref())
202+ .take(num_children_to_diff)
203+ .enumerate()
204+ {
205+ if i == 0 {
206+ change_list.emit_push_first_child();
207+ pushed = true;
208+ } else {
209+ debug_assert!(pushed);
210+ change_list.emit_pop_push_next_sibling();
466211 }
467212
468− change_list.go_to_sibling(i);
469− diff(cached_set, change_list, registry, old, new, cached_roots);
470− shared_prefix_count += 1;
471− }
472−
473− // If that was all of the old children, then create and append the remaining
474− // new children and we're finished.
475− if shared_prefix_count == old.len() {
476− change_list.go_up();
477− change_list.commit_traversal();
478− create_and_append_children(
213+ diff(
479214 cached_set,
480215 change_list,
481216 registry,
482− &new[shared_prefix_count..],
217+ old_child.clone(),
218+ new_child.clone(),
483219 cached_roots,
484220 );
485− return KeyedPrefixResult::Finished;
486− }
487−
488− // And if that was all of the new children, then remove all of the remaining
489− // old children and we're finished.
490− if shared_prefix_count == new.len() {
491− change_list.go_to_sibling(shared_prefix_count);
492− change_list.commit_traversal();
493− remove_self_and_next_siblings(change_list, registry, &old[shared_prefix_count..]);
494− return KeyedPrefixResult::Finished;
495− }
496−
497− change_list.go_up();
498− KeyedPrefixResult::MoreWorkToDo(shared_prefix_count)
499−}
500−
501−// The most-general, expensive code path for keyed children diffing.
502−//
503−// We find the longest subsequence within `old` of children that are relatively
504−// ordered the same way in `new` (via finding a longest-increasing-subsequence
505−// of the old child's index within `new`). The children that are elements of
506−// this subsequence will remain in place, minimizing the number of DOM moves we
507−// will have to do.
508−//
509−// Upon entry to this function, the change list stack must be:
510−//
511−// [... parent]
512−//
513−// Upon exit from this function, it will be restored to that same state.
514−fn diff_keyed_middle(
515− cached_set: &CachedSet,
516− change_list: &mut ChangeListBuilder,
517− registry: &mut EventsRegistry,
518− old: &[Node],
519− mut new: &[Node],
520− cached_roots: &mut FxHashSet<CacheId>,
521− shared_prefix_count: usize,
522− shared_suffix_count: usize,
523− old_shared_suffix_start: usize,
524−) {
525− // Should have already diffed the shared-key prefixes and suffixes.
526− debug_assert_ne!(new.first().map(|n| n.key()), old.first().map(|o| o.key()));
527− debug_assert_ne!(new.last().map(|n| n.key()), old.last().map(|o| o.key()));
528−
529− // The algorithm below relies upon using `u32::MAX` as a sentinel
530− // value, so if we have that many new nodes, it won't work. This
531− // check is a bit academic (hence only enabled in debug), since
532− // wasm32 doesn't have enough address space to hold that many nodes
533− // in memory.
534− debug_assert!(new.len() < u32::MAX as usize);
535−
536− // Map from each `old` node's key to its index within `old`.
537− let mut old_key_to_old_index = FxHashMap::default();
538− old_key_to_old_index.reserve(old.len());
539− old_key_to_old_index.extend(old.iter().enumerate().map(|(i, o)| (o.key(), i)));
540−
541− // The set of shared keys between `new` and `old`.
542− let mut shared_keys = FxHashSet::default();
543− // Map from each index in `new` to the index of the node in `old` that
544− // has the same key.
545− let mut new_index_to_old_index = Vec::with_capacity(new.len());
546− new_index_to_old_index.extend(new.iter().map(|n| {
547− let key = n.key();
548− if let Some(&i) = old_key_to_old_index.get(&key) {
549− shared_keys.insert(key);
550− i
551− } else {
552− u32::MAX as usize
553− }
554− }));
555−
556− // If none of the old keys are reused by the new children, then we
557− // remove all the remaining old children and create the new children
558− // afresh.
559− if shared_suffix_count == 0 && shared_keys.is_empty() {
560− if shared_prefix_count == 0 {
561− change_list.commit_traversal();
562− remove_all_children(change_list, registry, old);
563− } else {
564− change_list.go_down_to_child(shared_prefix_count);
565− change_list.commit_traversal();
566− remove_self_and_next_siblings(change_list, registry, &old[shared_prefix_count..]);
567− }
568− create_and_append_children(cached_set, change_list, registry, new, cached_roots);
569− return;
570221 }
571222
572− // Save each of the old children whose keys are reused in the new
573− // children.
574− let mut old_index_to_temp = vec![u32::MAX; old.len()];
575− let mut start = 0;
576− loop {
577− let end = (start..old.len())
578− .find(|&i| {
579− let key = old[i].key();
580− !shared_keys.contains(&key)
581− })
582− .unwrap_or(old.len());
583−
584− if end - start > 0 {
585− change_list.commit_traversal();
586− let mut t = change_list.save_children_to_temporaries(
587− shared_prefix_count + start,
588− shared_prefix_count + end,
589− );
590− for i in start..end {
591− old_index_to_temp[i] = t;
592− t += 1;
593− }
594− }
595−
596− debug_assert!(end <= old.len());
597− if end == old.len() {
598− break;
223+ if old_children.next().is_some() {
224+ debug!(" removing extra old children");
225+ debug_assert!(new_children.next().is_none());
226+ if !pushed {
227+ change_list.emit_push_first_child();
599228 } else {
600− start = end + 1;
229+ change_list.emit_pop_push_next_sibling();
601230 }
602− }
603−
604− // Remove any old children whose keys were not reused in the new
605− // children. Remove from the end first so that we don't mess up indices.
606− let mut removed_count = 0;
607− for (i, old_child) in old.iter().enumerate().rev() {
608− if !shared_keys.contains(&old_child.key()) {
609− registry.remove_subtree(old_child);
610− change_list.commit_traversal();
611− change_list.remove_child(i + shared_prefix_count);
612− removed_count += 1;
613− }
614− }
615−
616− // If there aren't any more new children, then we are done!
617− if new.is_empty() {
618− return;
619− }
620−
621− // The longest increasing subsequence within `new_index_to_old_index`. This
622− // is the longest sequence on DOM nodes in `old` that are relatively ordered
623− // correctly within `new`. We will leave these nodes in place in the DOM,
624− // and only move nodes that are not part of the LIS. This results in the
625− // maximum number of DOM nodes left in place, AKA the minimum number of DOM
626− // nodes moved.
627− let mut new_index_is_in_lis = FxHashSet::default();
628− new_index_is_in_lis.reserve(new_index_to_old_index.len());
629− let mut predecessors = vec![0; new_index_to_old_index.len()];
630− let mut starts = vec![0; new_index_to_old_index.len()];
631− longest_increasing_subsequence::lis_with(
632− &new_index_to_old_index,
633− &mut new_index_is_in_lis,
634− |a, b| a < b,
635− &mut predecessors,
636− &mut starts,
637− );
638−
639− // Now we will iterate from the end of the new children back to the
640− // beginning, diffing old children we are reusing and if they aren't in the
641− // LIS moving them to their new destination, or creating new children. Note
642− // that iterating in reverse order lets us use `Node.prototype.insertBefore`
643− // to move/insert children.
644− //
645− // But first, we ensure that we have a child on the change list stack that
646− // we can `insertBefore`. We handle this once before looping over `new`
647− // children, so that we don't have to keep checking on every loop iteration.
648− if shared_suffix_count > 0 {
649− // There is a shared suffix after these middle children. We will be
650− // inserting before that shared suffix, so add the first child of that
651− // shared suffix to the change list stack.
652− //
653− // [... parent]
654− change_list.go_down_to_child(old_shared_suffix_start - removed_count);
655− // [... parent first_child_of_shared_suffix]
231+ change_list.emit_remove_self_and_next_siblings();
232+ pushed = false;
656233 } else {
657− // There is no shared suffix coming after these middle children.
658− // Therefore we have to process the last child in `new` and move it to
659− // the end of the parent's children if it isn't already there.
660− let last_index = new.len() - 1;
661− let last = new.last().unwrap_throw();
662− new = &new[..new.len() - 1];
663− if shared_keys.contains(&last.key()) {
664− let old_index = new_index_to_old_index[last_index];
665− let temp = old_index_to_temp[old_index];
666− // [... parent]
667− change_list.go_down_to_temp_child(temp);
668− // [... parent last]
669− diff(
670− cached_set,
671− change_list,
672− registry,
673− &old[old_index],
674− last,
675− cached_roots,
676− );
677− if new_index_is_in_lis.contains(&last_index) {
678− // Don't move it, since it is already where it needs to be.
679− } else {
680− change_list.commit_traversal();
681− // [... parent last]
682− change_list.append_child();
683− // [... parent]
684− change_list.go_down_to_temp_child(temp);
685− // [... parent last]
234+ debug!(" creating new children");
235+ for (i, new_child) in new_children.enumerate() {
236+ if i == 0 && pushed {
237+ change_list.emit_pop();
238+ pushed = false;
686239 }
687− } else {
688− change_list.commit_traversal();
689− // [... parent]
690− create(cached_set, change_list, registry, last, cached_roots);
691− // [... parent last]
692− change_list.append_child();
693− // [... parent]
694− change_list.go_down_to_reverse_child(0);
695− // [... parent last]
696− }
697− }
698−
699− for (new_index, new_child) in new.iter().enumerate().rev() {
700− let old_index = new_index_to_old_index[new_index];
701− if old_index == u32::MAX as usize {
702− debug_assert!(!shared_keys.contains(&new_child.key()));
703− change_list.commit_traversal();
704− // [... parent successor]
705− create(cached_set, change_list, registry, new_child, cached_roots);
706− // [... parent successor new_child]
707− change_list.insert_before();
708− // [... parent new_child]
709− } else {
710− debug_assert!(shared_keys.contains(&new_child.key()));
711− let temp = old_index_to_temp[old_index];
712− debug_assert_ne!(temp, u32::MAX);
713−
714− if new_index_is_in_lis.contains(&new_index) {
715− // [... parent successor]
716− change_list.go_to_temp_sibling(temp);
717− // [... parent new_child]
718− } else {
719− change_list.commit_traversal();
720− // [... parent successor]
721− change_list.push_temporary(temp);
722− // [... parent successor new_child]
723− change_list.insert_before();
724− // [... parent new_child]
725− }
726−
727− diff(
728− cached_set,
729− change_list,
730− registry,
731− &old[old_index],
732− new_child,
733− cached_roots,
734− );
735− }
736− }
737−
738− // [... parent child]
739− change_list.go_up();
740− // [... parent]
741−}
742−
743−// Diff the suffix of keyed children that share the same keys in the same order.
744−//
745−// The parent must be on the change list stack when we enter this function:
746−//
747−// [... parent]
748−//
749−// When this function exits, the change list stack remains the same.
750−fn diff_keyed_suffix(
751− cached_set: &CachedSet,
752− change_list: &mut ChangeListBuilder,
753− registry: &mut EventsRegistry,
754− old: &[Node],
755− new: &[Node],
756− cached_roots: &mut FxHashSet<CacheId>,
757− new_shared_suffix_start: usize,
758−) {
759− debug_assert_eq!(old.len(), new.len());
760− debug_assert!(!old.is_empty());
761−
762− // [... parent]
763− change_list.go_down();
764− // [... parent new_child]
765−
766− for (i, (old_child, new_child)) in old.iter().zip(new.iter()).enumerate() {
767− change_list.go_to_sibling(new_shared_suffix_start + i);
768− diff(
769− cached_set,
770− change_list,
771− registry,
772− old_child,
773− new_child,
774− cached_roots,
775− );
776− }
777−
778− // [... parent]
779− change_list.go_up();
780−}
781−
782−// Diff children that are not keyed.
783−//
784−// The parent must be on the top of the change list stack when entering this
785−// function:
786−//
787−// [... parent]
788−//
789−// the change list stack is in the same state when this function returns.
790−fn diff_non_keyed_children(
791− cached_set: &CachedSet,
792− change_list: &mut ChangeListBuilder,
793− registry: &mut EventsRegistry,
794− old: &[Node],
795− new: &[Node],
796− cached_roots: &mut FxHashSet<CacheId>,
797−) {
798− // Handled these cases in `diff_children` before calling this function.
799− debug_assert!(!new.is_empty());
800− debug_assert!(!old.is_empty());
801−
802− // [... parent]
803− change_list.go_down();
804− // [... parent child]
805−
806− for (i, (new_child, old_child)) in new.iter().zip(old.iter()).enumerate() {
807− // [... parent prev_child]
808− change_list.go_to_sibling(i);
809− // [... parent this_child]
810− diff(
811− cached_set,
812− change_list,
813− registry,
814− old_child,
815− new_child,
816− cached_roots,
817− );
818− }
819−
820− match old.len().cmp(&new.len()) {
821− Ordering::Greater => {
822− // [... parent prev_child]
823− change_list.go_to_sibling(new.len());
824− // [... parent first_child_to_remove]
825− change_list.commit_traversal();
826− remove_self_and_next_siblings(change_list, registry, &old[new.len()..]);
827− // [... parent]
828− }
829− Ordering::Less => {
830− // [... parent last_child]
831− change_list.go_up();
832− // [... parent]
833− change_list.commit_traversal();
834− create_and_append_children(
240+ create(
835241 cached_set,
836242 change_list,
837243 registry,
838− &new[old.len()..],
244+ new_child.clone(),
839245 cached_roots,
840246 );
247+ change_list.emit_append_child();
841248 }
842− Ordering::Equal => {
843− // [... parent child]
844− change_list.go_up();
845− // [... parent]
846− }
847− }
848−}
849−
850−// Create the given children and append them to the parent node.
851−//
852−// The parent node must currently be on top of the change list stack:
853−//
854−// [... parent]
855−//
856−// When this function returns, the change list stack is in the same state.
857−fn create_and_append_children(
858− cached_set: &CachedSet,
859− change_list: &mut ChangeListBuilder,
860− registry: &mut EventsRegistry,
861− new: &[Node],
862− cached_roots: &mut FxHashSet<CacheId>,
863−) {
864− debug_assert!(change_list.traversal_is_committed());
865− for child in new {
866− create(cached_set, change_list, registry, child, cached_roots);
867− change_list.append_child();
868− }
869−}
870−
871−// Remove all of a node's children.
872−//
873−// The change list stack must have this shape upon entry to this function:
874−//
875−// [... parent]
876−//
877−// When this function returns, the change list stack is in the same state.
878−fn remove_all_children(
879− change_list: &mut ChangeListBuilder,
880− registry: &mut EventsRegistry,
881− old: &[Node],
882−) {
883− debug_assert!(change_list.traversal_is_committed());
884− for child in old {
885− registry.remove_subtree(child);
886249 }
887− // Fast way to remove all children: set the node's textContent to an empty
888− // string.
889− change_list.set_text("");
890−}
891250
892−// Remove the current child and all of its following siblings.
893−//
894−// The change list stack must have this shape upon entry to this function:
895−//
896−// [... parent child]
897−//
898−// After the function returns, the child is no longer on the change list stack:
899−//
900−// [... parent]
901−fn remove_self_and_next_siblings(
902− change_list: &mut ChangeListBuilder,
903− registry: &mut EventsRegistry,
904− old: &[Node],
905−) {
906− debug_assert!(change_list.traversal_is_committed());
907− for child in old {
908− registry.remove_subtree(child);
251+ debug!(" done updating children");
252+ if pushed {
253+ change_list.emit_pop();
909254 }
910− change_list.remove_self_and_next_siblings();
911255}
912256
913−// Emit instructions to create the given virtual node.
914−//
915−// The change list stack may have any shape upon entering this function:
916−//
917−// [...]
918−//
919−// When this function returns, the new node is on top of the change list stack:
920−//
921−// [... node]
922257fn create(
923258 cached_set: &CachedSet,
924− change_list: &mut ChangeListBuilder,
259+ change_list: &mut ChangeList,
925260 registry: &mut EventsRegistry,
926− node: &Node,
927− cached_roots: &mut FxHashSet<CacheId>,
261+ node: Node,
262+ cached_roots: &mut bumpalo::collections::Vec<CacheId>,
928263) {
929− debug_assert!(change_list.traversal_is_committed());
930264 match node.kind {
931265 NodeKind::Text(TextNode { text }) => {
932− change_list.create_text_node(text);
266+ change_list.emit_create_text_node(text);
933267 }
934− NodeKind::Element(&ElementNode {
935− key: _,
268+ NodeKind::Element(ElementNode {
936269 tag_name,
937270 listeners,
938271 attributes,
@@ -940,186 +273,38 @@ fn create(
940273 namespace,
941274 }) => {
942275 if let Some(namespace) = namespace {
943− change_list.create_element_ns(tag_name, namespace);
276+ change_list.emit_create_element_ns(tag_name, namespace);
944277 } else {
945− change_list.create_element(tag_name);
278+ change_list.emit_create_element(tag_name);
946279 }
947−
948280 for l in listeners {
949281 unsafe {
950282 registry.add(l);
951283 }
952− change_list.new_event_listener(l);
284+ change_list.emit_new_event_listener(l);
953285 }
954−
955286 for attr in attributes {
956− change_list.set_attribute(&attr.name, &attr.value, namespace.is_some());
957− }
958−
959− // Fast path: if there is a single text child, it is faster to
960− // create-and-append the text node all at once via setting the
961− // parent's `textContent` in a single change list instruction than
962− // to emit three instructions to (1) create a text node, (2) set its
963− // text content, and finally (3) append the text node to this
964− // parent.
965− if children.len() == 1 {
966− if let Node {
967− kind: NodeKind::Text(TextNode { text }),
968− } = children[0]
969− {
970− change_list.set_text(text);
971− return;
287+ if namespace.is_none() || attr.name.starts_with("xmlns") {
288+ change_list.emit_set_attribute(&attr.name, &attr.value);
289+ } else {
290+ change_list.emit_set_attribute_ns(&attr.name, &attr.value);
972291 }
973292 }
974−
975293 for child in children {
976− create(cached_set, change_list, registry, child, cached_roots);
977− change_list.append_child();
978− }
979− }
980− NodeKind::Cached(ref c) => {
981− cached_roots.insert(c.id);
982− let (node, template) = cached_set.get(c.id);
983− if let Some(template) = template {
984− create_with_template(
294+ create(
985295 cached_set,
986296 change_list,
987297 registry,
988− template,
989− node,
298+ child.clone(),
990299 cached_roots,
991300 );
992− } else {
993− create(cached_set, change_list, registry, node, cached_roots);
301+ change_list.emit_append_child();
994302 }
995303 }
996− }
997−}
998−
999−// Get or create the template.
1000−//
1001−// Upon entering this function the change list stack may be in any shape:
1002−//
1003−// [...]
1004−//
1005−// When this function returns, it leaves a freshly cloned copy of the template
1006−// on the top of the change list stack:
1007−//
1008−// [... template]
1009−#[inline]
1010−fn get_or_create_template<'a>(
1011− cached_set: &'a CachedSet,
1012− change_list: &mut ChangeListBuilder,
1013− registry: &mut EventsRegistry,
1014− cached_roots: &mut FxHashSet<CacheId>,
1015− template_id: CacheId,
1016−) -> (&'a Node<'a>, bool) {
1017− let (template, template_template) = cached_set.get(template_id);
1018− debug_assert!(
1019− template_template.is_none(),
1020− "templates should not be templated themselves"
1021− );
1022−
1023− // If we haven't already created and saved the physical DOM subtree for this
1024− // template, do that now.
1025− if change_list.has_template(template_id) {
1026− // Clone the template and push it onto the stack.
1027− //
1028− // [...]
1029− change_list.push_template(template_id);
1030− // [... template]
1031−
1032− (template, true)
1033− } else {
1034− // [...]
1035− create(cached_set, change_list, registry, template, cached_roots);
1036− // [... template]
1037− change_list.save_template(template_id);
1038− // [... template]
1039−
1040− (template, false)
1041− }
1042−}
1043−
1044−fn create_and_replace(
1045− cached_set: &CachedSet,
1046− change_list: &mut ChangeListBuilder,
1047− registry: &mut EventsRegistry,
1048− new_template: Option<CacheId>,
1049− old: &Node,
1050− new: &Node,
1051− cached_roots: &mut FxHashSet<CacheId>,
1052−) {
1053− debug_assert!(change_list.traversal_is_committed());
1054−
1055− if let Some(template_id) = new_template {
1056− let (template, needs_listeners) =
1057− get_or_create_template(cached_set, change_list, registry, cached_roots, template_id);
1058− change_list.replace_with();
1059−
1060− let mut old_forcing = None;
1061− if needs_listeners {
1062− old_forcing = Some(change_list.push_force_new_listeners());
1063− }
1064−
1065− diff(
1066− cached_set,
1067− change_list,
1068− registry,
1069− template,
1070− new,
1071− cached_roots,
1072− );
1073−
1074− if let Some(old) = old_forcing {
1075− change_list.pop_force_new_listeners(old);
304+ NodeKind::Cached(c) => {
305+ cached_roots.push(c.id);
306+ let node = cached_set.get(c.id);
307+ create(cached_set, change_list, registry, node, cached_roots)
1076308 }
1077−
1078− change_list.commit_traversal();
1079− } else {
1080− create(cached_set, change_list, registry, new, cached_roots);
1081− change_list.replace_with();
1082− }
1083− registry.remove_subtree(old);
1084−}
1085−
1086−fn create_with_template(
1087− cached_set: &CachedSet,
1088− change_list: &mut ChangeListBuilder,
1089− registry: &mut EventsRegistry,
1090− template_id: CacheId,
1091− node: &Node,
1092− cached_roots: &mut FxHashSet<CacheId>,
1093−) {
1094− debug_assert!(change_list.traversal_is_committed());
1095−
1096− // [...]
1097− let (template, needs_listeners) =
1098− get_or_create_template(cached_set, change_list, registry, cached_roots, template_id);
1099− // [... template]
1100−
1101− // Now diff the node with its template.
1102− //
1103− // We must force adding new listeners instead of updating existing ones,
1104− // since listeners don't get cloned in `cloneNode`.
1105− let mut old_forcing = None;
1106− if needs_listeners {
1107− old_forcing = Some(change_list.push_force_new_listeners());
1108309 }
1109−
1110− diff(
1111− cached_set,
1112− change_list,
1113− registry,
1114− template,
1115− node,
1116− cached_roots,
1117− );
1118−
1119− if let Some(old) = old_forcing {
1120− change_list.pop_force_new_listeners(old);
1121− }
1122−
1123− // Make sure that we come back up to the level we were at originally.
1124− change_list.commit_traversal();
1125310}
src/events.rs+18−9
@@ -19,6 +19,7 @@ cfg_if::cfg_if! {
1919 pub(crate) fn clear_active_listeners(&mut self) {}
2020 }
2121 } else {
22+ use bumpalo::Bump;
2223 use crate::{
2324 node::{ElementNode, ListenerCallback, NodeKind},
2425 vdom::VdomWeak,
@@ -63,6 +64,7 @@ cfg_if::cfg_if! {
6364
6465 let weak_registry = Rc::downgrade(&registry);
6566 let closure = Closure::wrap(Box::new(move |event, a, b| {
67+ debug!("Events trampoline invoked with (0x{:x}, 0x{:x})", a, b);
6668 debug_assert!(a != 0);
6769
6870 // if the VdomInnerExclusive is keeping this closure alive, then the
@@ -86,26 +88,31 @@ cfg_if::cfg_if! {
8688 callback(component, vdom_weak, event);
8789 }
8890 }
89− }) as Box<dyn Fn(web_sys::Event, u32, u32)>);
91+ }) as Box<Fn(web_sys::Event, u32, u32)>);
9092
9193 (registry, closure)
9294 }
9395
9496 pub(crate) fn remove(&mut self, listener: &Listener) {
9597 let id = listener.get_callback_parts();
98+ debug!("EventsRegistry::remove(0x{:x}, 0x{:x})", id.0, id.1);
9699 debug_assert!(id.0 != 0);
97100 self.active.remove(&id);
98101 }
99102
100103 pub(crate) fn remove_subtree(&mut self, node: &Node) {
101− match node.kind {
102− NodeKind::Cached(_) | NodeKind::Text(_) => {},
103− NodeKind::Element(&ElementNode {listeners, children, ..}) => {
104− for l in listeners {
105− self.remove(l);
106− }
107− for child in children {
108− self.remove_subtree(child)
104+ let bump = Bump::new();
105+ let mut stack = bumpalo::collections::Vec::with_capacity_in(64, &bump);
106+ stack.push(node);
107+
108+ while let Some(node) = stack.pop() {
109+ match node.kind {
110+ NodeKind::Cached(_) | NodeKind::Text(_) => continue,
111+ NodeKind::Element(ElementNode {listeners, children, ..}) => {
112+ for l in listeners {
113+ self.remove(l);
114+ }
115+ stack.extend(children);
109116 }
110117 }
111118 }
@@ -121,6 +128,7 @@ cfg_if::cfg_if! {
121128 /// diffing.
122129 pub(crate) unsafe fn add<'a>(&mut self, listener: &'a Listener<'a>) {
123130 let id = listener.get_callback_parts();
131+ debug!("EventsRegistry::add(0x{:x}, 0x{:x})", id.0, id.1);
124132 debug_assert!(id.0 != 0);
125133
126134 let callback =
@@ -131,6 +139,7 @@ cfg_if::cfg_if! {
131139
132140 /// Clear all event listeners from the registry.
133141 pub(crate) fn clear_active_listeners(&mut self) {
142+ debug!("EventsRegistry::clear_active_listeners()");
134143 self.active.clear();
135144 }
136145 }
src/lib.rs+4−5
@@ -18,8 +18,8 @@
1818//! }
1919//! }
2020//!
21−//! impl<'a, 'who> Render<'a> for Hello<'who> {
22−//! fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
21+//! impl<'who> Render for Hello<'who> {
22+//! fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
2323//! use dodrio::builder::*;
2424//!
2525//! let id = bumpalo::format!(in cx.bump, "hello-{}", self.who);
@@ -92,14 +92,13 @@ mod events;
9292mod node;
9393mod render;
9494mod render_context;
95−mod strace;
9695mod vdom;
9796
9897pub mod builder;
9998
10099// Re-export items at the top level.
101100pub use self::cached::Cached;
102−pub use self::node::{Attribute, Listener, Node, NodeKey};
101+pub use self::node::{Attribute, Listener, Node};
103102pub use self::render::{Render, RootRender};
104103pub use self::render_context::RenderContext;
105104pub use self::vdom::{Vdom, VdomWeak};
@@ -123,7 +122,7 @@ cfg_if::cfg_if! {
123122 /// An element node in the physical DOM.
124123 pub type Element = web_sys::Element;
125124
126− pub(crate) type EventsTrampoline = wasm_bindgen::closure::Closure<dyn Fn(web_sys::Event, u32, u32)>;
125+ pub(crate) type EventsTrampoline = wasm_bindgen::closure::Closure<Fn(web_sys::Event, u32, u32)>;
127126 }
128127}
129128
src/node.rs+39−83
@@ -2,8 +2,8 @@ use crate::{cached_set::CacheId, RootRender, VdomWeak};
22use bumpalo::Bump;
33use std::fmt;
44use std::iter;
5+use std::marker::PhantomData;
56use std::mem;
6−use std::u32;
77
88/// A virtual DOM node.
99#[derive(Debug, Clone)]
@@ -24,11 +24,11 @@ pub_unstable_internal! {
2424 Text(TextNode<'a>),
2525
2626 /// An element potentially with attributes and children.
27− Element(&'a ElementNode<'a>),
27+ Element(ElementNode<'a>),
2828
2929 /// A node in the vdom's `CachedSet`. This allows us to avoid
3030 /// re-rendering and re-diffing subtrees.
31− Cached(CachedNode),
31+ Cached(CachedNode<'a>),
3232 }
3333}
3434
@@ -46,7 +46,6 @@ pub_unstable_internal! {
4646 /// children.
4747 #[derive(Debug, Clone)]
4848 pub(crate) struct ElementNode<'a> {
49− pub key: NodeKey,
5049 pub tag_name: &'a str,
5150 pub listeners: &'a [Listener<'a>],
5251 pub attributes: &'a [Attribute<'a>],
@@ -60,51 +59,10 @@ pub_unstable_internal! {
6059 /// allows us to avoid both re-rendering a sub-tree and re-diffing
6160 /// it. `CachedNode`s cannot contain cycles, since they can only contain
6261 /// other `CachedNode`s that already exist when they are being constructed.
63− #[derive(Debug, Clone, Copy)]
64− pub(crate) struct CachedNode {
62+ #[derive(Debug, Clone)]
63+ pub(crate) struct CachedNode<'a> {
6564 pub id: CacheId,
66− // Always a copy of the inner cached node's key.
67− pub key: NodeKey,
68− }
69−}
70−
71−/// The key for keyed children.
72−///
73−/// Keys must be unique among siblings.
74−///
75−/// If any sibling is keyed, then they all must be keyed.
76−#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
77−pub struct NodeKey(pub(crate) u32);
78−
79−impl Default for NodeKey {
80− fn default() -> NodeKey {
81− NodeKey::NONE
82− }
83−}
84−
85−impl NodeKey {
86− /// The default, lack of a key.
87− pub const NONE: NodeKey = NodeKey(u32::MAX);
88−
89− /// Is this key `NodeKey::NONE`?
90− #[inline]
91− pub fn is_none(&self) -> bool {
92− *self == Self::NONE
93− }
94−
95− /// Is this key not `NodeKey::NONE`?
96− #[inline]
97− pub fn is_some(&self) -> bool {
98− !self.is_none()
99− }
100−
101− /// Create a new `NodeKey`.
102− ///
103− /// `key` must not be `u32::MAX`.
104− #[inline]
105− pub fn new(key: u32) -> Self {
106− debug_assert_ne!(key, u32::MAX);
107− NodeKey(key)
65+ pub _phantom: PhantomData<&'a Node<'a>>,
10866 }
10967}
11068
@@ -134,15 +92,6 @@ pub struct Attribute<'a> {
13492 pub(crate) value: &'a str,
13593}
13694
137−impl<'a> From<CachedNode> for Node<'a> {
138− #[inline]
139− fn from(c: CachedNode) -> Self {
140− Node {
141− kind: NodeKind::Cached(c),
142− }
143− }
144−}
145−
14695impl fmt::Debug for Listener<'_> {
14796 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
14897 let (a, b) = self.get_callback_parts();
@@ -182,33 +131,38 @@ impl<'a> Attribute<'a> {
182131}
183132
184133impl<'a> Node<'a> {
185− /// Low-level constructor for making a new `Node` of type element with given
186− /// parts.
187− ///
188− /// This is primarily intended for JSX and templating proc-macros to compile
189− /// down into. If you are building nodes by-hand, prefer using the
190− /// `dodrio::builder::*` APIs.
134+ /// Construct a new Node of type element with given tag name and children
191135 #[inline]
192− pub fn element(
136+ pub(crate) fn element<Listeners, Attributes, Children>(
193137 bump: &'a Bump,
194− key: NodeKey,
195138 tag_name: &'a str,
196− listeners: &'a [Listener<'a>],
197− attributes: &'a [Attribute<'a>],
198− children: &'a [Node<'a>],
139+ listeners: Listeners,
140+ attributes: Attributes,
141+ children: Children,
199142 namespace: Option<&'a str>,
200− ) -> Node<'a> {
201− let element = bump.alloc_with(|| ElementNode {
202− key,
203− tag_name,
204− listeners,
205− attributes,
206− children,
207− namespace,
208− });
143+ ) -> Node<'a>
144+ where
145+ Listeners: 'a + AsRef<[Listener<'a>]>,
146+ Attributes: 'a + AsRef<[Attribute<'a>]>,
147+ Children: 'a + AsRef<[Node<'a>]>,
148+ {
149+ let children: &'a Children = bump.alloc(children);
150+ let children: &'a [Node<'a>] = children.as_ref();
151+
152+ let listeners: &'a Listeners = bump.alloc(listeners);
153+ let listeners: &'a [Listener<'a>] = listeners.as_ref();
154+
155+ let attributes: &'a Attributes = bump.alloc(attributes);
156+ let attributes: &'a [Attribute<'a>] = attributes.as_ref();
209157
210158 Node {
211− kind: NodeKind::Element(element),
159+ kind: NodeKind::Element(ElementNode {
160+ tag_name,
161+ listeners,
162+ attributes,
163+ children,
164+ namespace,
165+ }),
212166 }
213167 }
214168
@@ -220,12 +174,14 @@ impl<'a> Node<'a> {
220174 }
221175 }
222176
177+ /// Construct a new cached node with the given id.
223178 #[inline]
224− pub(crate) fn key(&self) -> NodeKey {
225− match &self.kind {
226− NodeKind::Text(_) => NodeKey::NONE,
227− NodeKind::Element(e) => e.key,
228− NodeKind::Cached(c) => c.key,
179+ pub(crate) fn cached(id: CacheId) -> Node<'a> {
180+ Node {
181+ kind: NodeKind::Cached(CachedNode {
182+ id,
183+ _phantom: PhantomData,
184+ }),
229185 }
230186 }
231187}
src/render.rs+16−43
@@ -21,8 +21,8 @@ use wasm_bindgen::UnwrapThrowExt;
2121///
2222/// pub struct MyComponent;
2323///
24−/// impl<'a> Render<'a> for MyComponent {
25−/// fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
24+/// impl Render for MyComponent {
25+/// fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
2626/// use dodrio::builder::*;
2727///
2828/// p(&cx)
@@ -35,26 +35,26 @@ use wasm_bindgen::UnwrapThrowExt;
3535/// }
3636/// }
3737/// ```
38−pub trait Render<'a> {
38+pub trait Render {
3939 /// Render `self` as a virtual DOM. Use the given context's `Bump` for
4040 /// temporary allocations.
41− fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a>;
41+ fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a>;
4242}
4343
44−impl<'a, 'r, R> Render<'a> for &'r R
44+impl<'r, R> Render for &'r R
4545where
46− R: Render<'a>,
46+ R: Render,
4747{
48− fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
48+ fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
4949 (**self).render(cx)
5050 }
5151}
5252
53−impl<'a, R> Render<'a> for Rc<R>
53+impl<R> Render for Rc<R>
5454where
55− R: Render<'a>,
55+ R: Render,
5656{
57− fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
57+ fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
5858 (**self).render(cx)
5959 }
6060}
@@ -69,24 +69,24 @@ where
6969/// You do not need to implement this trait by hand: there is a blanket
7070/// implementation for all `Render` types that fulfill the `RootRender`
7171/// requirements.
72−pub trait RootRender: Any + for<'a> Render<'a> {
72+pub trait RootRender: Any + Render {
7373 /// Get this `&RootRender` trait object as an `&Any` trait object reference.
74− fn as_any(&self) -> &dyn Any;
74+ fn as_any(&self) -> &Any;
7575
7676 /// Get this `&mut RootRender` trait object as an `&mut Any` trait object
7777 /// reference.
78− fn as_any_mut(&mut self) -> &mut dyn Any;
78+ fn as_any_mut(&mut self) -> &mut Any;
7979}
8080
8181impl<T> RootRender for T
8282where
83− T: Any + for<'a> Render<'a>,
83+ T: Any + Render,
8484{
85− fn as_any(&self) -> &dyn Any {
85+ fn as_any(&self) -> &Any {
8686 self
8787 }
8888
89− fn as_any_mut(&mut self) -> &mut dyn Any {
89+ fn as_any_mut(&mut self) -> &mut Any {
9090 self
9191 }
9292}
@@ -138,31 +138,4 @@ mod tests {
138138 #[allow(dead_code)]
139139 fn takes_dyn_render(_: &dyn super::RootRender) {}
140140 }
141−
142− #[test]
143− fn render_bump_scoped_child() {
144− use crate::{builder::*, bumpalo::collections::String, Node, Render, RenderContext};
145−
146− struct Child<'a> {
147− name: &'a str,
148− }
149−
150− impl<'a> Render<'a> for Child<'a> {
151− fn render(&self, _cx: &mut RenderContext<'a>) -> Node<'a> {
152− text(self.name)
153− }
154− }
155−
156− struct Parent;
157−
158− impl<'a> Render<'a> for Parent {
159− fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
160− let child_name = String::from_str_in("child", cx.bump).into_bump_str();
161−
162− div(&cx)
163− .children([Child { name: child_name }.render(cx)])
164− .finish()
165− }
166− }
167− }
168141}
src/render_context.rs+2−43
@@ -1,10 +1,5 @@
1−use crate::{
2− cached::{Cached, TemplateId},
3− cached_set::{CacheId, CachedSet},
4− Node, Render,
5−};
1+use crate::cached_set::CachedSet;
62use bumpalo::Bump;
7−use fxhash::FxHashMap;
83use std::fmt;
94
105/// Common context available to all `Render` implementations.
@@ -28,8 +23,6 @@ pub struct RenderContext<'a> {
2823
2924 pub(crate) cached_set: &'a crate::RefCell<CachedSet>,
3025
31− pub(crate) templates: &'a mut FxHashMap<TemplateId, Option<CacheId>>,
32−
3326 // Prevent exhaustive matching on the rendering context, so we can always
3427 // add more members in a semver-compatible way.
3528 _non_exhaustive: (),
@@ -45,48 +38,14 @@ impl fmt::Debug for RenderContext<'_> {
4538
4639impl<'a> RenderContext<'a> {
4740 pub_unstable_internal! {
48− pub(crate) fn new(
49− bump: &'a Bump,
50− cached_set: &'a crate::RefCell<CachedSet>,
51− templates: &'a mut FxHashMap<TemplateId, Option<CacheId>>
52− ) -> Self {
41+ pub(crate) fn new(bump: &'a Bump, cached_set: &'a crate::RefCell<CachedSet>) -> Self {
5342 RenderContext {
5443 bump,
5544 cached_set,
56− templates,
5745 _non_exhaustive: (),
5846 }
5947 }
6048 }
61−
62− pub(crate) fn cache<F>(&mut self, pinned: bool, template: Option<CacheId>, f: F) -> CacheId
63− where
64− F: for<'b> FnOnce(&mut RenderContext<'b>) -> Node<'b>,
65− {
66− CachedSet::insert(self, pinned, template, f)
67− }
68−
69− /// Get or create the cached template for `Cached<R>`.
70− pub(crate) fn template<R>(&mut self) -> Option<CacheId>
71− where
72− R: 'static + Default + for<'b> Render<'b>,
73− {
74− let template_id = Cached::<R>::template_id();
75− if let Some(cache_id) = self.templates.get(&template_id).cloned() {
76− return cache_id;
77− }
78−
79− // Prevent re-entrancy from infinite looping. Any attempts to get `R`'s
80− // template while constructing the template will simply fail to use the
81− // templated fast path.
82− self.templates.insert(template_id, None);
83−
84− // Render the default `R` and save that as the template for all
85− // `Cached<R>`s.
86− let cache_id = self.cache(true, None, |nested_cx| R::default().render(nested_cx));
87− self.templates.insert(template_id, Some(cache_id));
88− Some(cache_id)
89− }
9049}
9150
9251impl<'a, 'b> From<&'b RenderContext<'a>> for &'a Bump {
src/strace.rsdeleted−22
@@ -1,22 +0,0 @@
1−cfg_if::cfg_if! {
2− if #[cfg(feature = "xxx-unstable-strace")] {
3− use wasm_bindgen::prelude::*;
4−
5− #[wasm_bindgen(module = "/js/strace.js")]
6− extern "C" {
7− #[wasm_bindgen(js_name = initStrace)]
8− fn really_init_strace();
9− }
10−
11− pub fn init_strace() {
12− use std::sync::Once;
13− static STRACE: Once = Once::new();
14− STRACE.call_once(|| {
15− really_init_strace();
16− });
17− }
18− } else {
19− #[inline]
20− pub fn init_strace() {}
21− }
22−}
src/vdom.rs+98−113
@@ -1,16 +1,14 @@
1−use super::change_list::ChangeListPersistentState;
1+use super::change_list::ChangeList;
22use super::RootRender;
3−use crate::cached::TemplateId;
4−use crate::cached_set::{CacheId, CachedSet};
3+use crate::cached_set::CachedSet;
54use crate::events::EventsRegistry;
6−use crate::node::{Node, NodeKey};
5+use crate::node::Node;
76use crate::RenderContext;
87use bumpalo::Bump;
9−use fxhash::FxHashMap;
8+use futures::future::Future;
109use std::cell::Cell;
1110use std::cell::RefCell;
1211use std::fmt;
13−use std::future::Future;
1412use std::mem;
1513use std::mem::ManuallyDrop;
1614use std::rc::{Rc, Weak};
@@ -55,15 +53,13 @@ pub(crate) struct VdomInnerExclusive {
5553 // Always `Some` except just before we drop. Just an option so that
5654 // `unmount` can take the component out but we can still have a Drop
5755 // implementation.
58− component: Option<Box<dyn RootRender>>,
56+ component: Option<Box<RootRender>>,
5957
6058 dom_buffers: Option<[Bump; 2]>,
61− change_list: ManuallyDrop<ChangeListPersistentState>,
59+ change_list: ManuallyDrop<ChangeList>,
6260 container: crate::Element,
6361 events_registry: Option<Rc<RefCell<EventsRegistry>>>,
64− events_trampoline: Option<crate::EventsTrampoline>,
6562 cached_set: crate::RefCell<CachedSet>,
66− templates: FxHashMap<TemplateId, Option<CacheId>>,
6763
6864 // Actually a reference into `self.dom_buffers[0]` or if `self.component` is
6965 // caching renders, into `self.component`'s bump.
@@ -96,7 +92,6 @@ impl fmt::Debug for VdomInnerExclusive {
9692 .field("change_list", &self.change_list)
9793 .field("container", &self.container)
9894 .field("events_registry", &self.events_registry)
99− .field("events_trampoline", &"..")
10095 .field("current_root", &self.current_root)
10196 .finish()
10297 }
@@ -158,24 +153,18 @@ impl Vdom {
158153 where
159154 R: RootRender,
160155 {
161− Self::with_boxed_root_render(container, Box::new(component) as Box<dyn RootRender>)
156+ Self::with_boxed_root_render(container, Box::new(component) as Box<RootRender>)
162157 }
163158
164159 /// Construct a `Vdom` with the already-boxed-as-a-trait-object root
165160 /// rendering component.
166− pub fn with_boxed_root_render(
167− container: &crate::Element,
168− component: Box<dyn RootRender>,
169− ) -> Vdom {
170− crate::strace::init_strace();
171−
161+ pub fn with_boxed_root_render(container: &crate::Element, component: Box<RootRender>) -> Vdom {
172162 let dom_buffers = [Bump::new(), Bump::new()];
173− let change_list = ManuallyDrop::new(ChangeListPersistentState::new(container));
163+ let change_list = ManuallyDrop::new(ChangeList::new(container));
174164
175165 // Create a dummy `<div/>` in our container.
176166 initialize_container(container);
177− let current_root =
178− Node::element(&dom_buffers[0], NodeKey::NONE, "div", &[], &[], &[], None);
167+ let current_root = Node::element(&dom_buffers[0], "div", [], [], [], None);
179168 let current_root = Some(unsafe { extend_node_lifetime(current_root) });
180169
181170 let container = container.clone();
@@ -190,9 +179,7 @@ impl Vdom {
190179 container,
191180 current_root,
192181 events_registry: None,
193− events_trampoline: None,
194182 cached_set: crate::RefCell::new(Default::default()),
195− templates: Default::default(),
196183 }),
197184 });
198185
@@ -201,9 +188,7 @@ impl Vdom {
201188 {
202189 let mut inner = inner.exclusive.borrow_mut();
203190 inner.events_registry = Some(events_registry);
204− inner.change_list.init_events_trampoline(&events_trampoline);
205− debug_assert!(inner.events_trampoline.is_none());
206− inner.events_trampoline = Some(events_trampoline);
191+ inner.change_list.init_events_trampoline(events_trampoline);
207192
208193 // Diff and apply the `contents` against our dummy `<div/>`.
209194 inner.render();
@@ -220,7 +205,7 @@ impl Vdom {
220205 R: RootRender,
221206 {
222207 let mut exclusive = self.inner.exclusive.borrow_mut();
223− let component = Box::new(component) as Box<dyn RootRender>;
208+ let component = Box::new(component) as Box<RootRender>;
224209 exclusive.component = Some(component);
225210 exclusive.render();
226211 }
@@ -240,7 +225,7 @@ impl Vdom {
240225 /// Unmount this virtual DOM, unregister its event listeners, and return its
241226 /// root render component.
242227 #[inline]
243− pub fn unmount(self) -> Box<dyn RootRender> {
228+ pub fn unmount(self) -> Box<RootRender> {
244229 Rc::try_unwrap(self.inner.clone())
245230 .map_err(|_| ())
246231 .unwrap_throw()
@@ -272,35 +257,29 @@ impl VdomInnerExclusive {
272257 dom_buffers[1].reset();
273258
274259 // Render the new current contents into the inactive bump arena.
275− let mut cx =
276− RenderContext::new(&dom_buffers[1], &self.cached_set, &mut self.templates);
260+ let mut cx = RenderContext::new(&dom_buffers[1], &self.cached_set);
277261 let new_contents = self.component.as_ref().unwrap_throw().render(&mut cx);
278262 let new_contents = extend_node_lifetime(new_contents);
279263
280264 // Diff the old contents with the new contents.
281265 let old_contents = self.current_root.take().unwrap();
282− let mut cache_roots;
266+ let mut cache_roots = bumpalo::collections::Vec::new_in(&dom_buffers[1]);
283267 {
284268 let cached_set = self.cached_set.borrow();
285− cache_roots = cached_set.new_roots_set();
286− let mut change_list = self.change_list.builder();
287269 crate::diff::diff(
288270 &cached_set,
289− &mut change_list,
271+ &mut self.change_list,
290272 &mut registry,
291− &old_contents,
292− &new_contents,
273+ old_contents,
274+ new_contents.clone(),
293275 &mut cache_roots,
294276 );
295−
296− // Tell JS to apply our diff-generated changes to the physical DOM!
297− change_list.finish();
298277 }
299278
300279 {
301280 // Clean up unused cached renders.
302281 let mut cached_set = self.cached_set.borrow_mut();
303− cached_set.gc(&mut registry, cache_roots);
282+ cached_set.gc(&mut registry, &cache_roots);
304283 }
305284
306285 // Swap the buffers to make the bump arena with the new contents the
@@ -310,6 +289,12 @@ impl VdomInnerExclusive {
310289 }
311290
312291 self.events_registry = Some(events_registry);
292+
293+ // Find and drop cached strings that aren't in use anymore.
294+ self.change_list.drop_unused_strings();
295+
296+ // Tell JS to apply our diff-generated changes to the physical DOM!
297+ self.change_list.apply_changes();
313298 }
314299 }
315300
@@ -326,7 +311,7 @@ impl VdomInnerExclusive {
326311 }
327312}
328313
329−fn request_animation_frame(f: &Closure<dyn FnMut()>) {
314+fn request_animation_frame(f: &Closure<FnMut()>) {
330315 web_sys::window()
331316 .expect_throw("should have a window")
332317 .request_animation_frame(f.as_ref().unchecked_ref())
@@ -343,7 +328,7 @@ where
343328 let f = Closure::wrap(Box::new(move || {
344329 *g.borrow_mut() = None;
345330 f();
346− }) as Box<dyn FnMut()>);
331+ }) as Box<FnMut()>);
347332 request_animation_frame(&f);
348333
349334 *h.borrow_mut() = Some(f);
@@ -374,23 +359,25 @@ impl VdomWeak {
374359 /// Replace the root rendering component with the new `root`.
375360 ///
376361 /// Returns a future that resolves to the *old* root component.
377− pub async fn set_component(
362+ pub fn set_component(
378363 self,
379364 root: Box<dyn RootRender>,
380− ) -> Result<Box<dyn RootRender + 'static>, VdomDroppedError> {
381− let inner = self.inner.upgrade().ok_or(VdomDroppedError {})?;
382−
383− // Wait for a new tick of the micro-task queue
384− let _ = JsFuture::from(js_sys::Promise::resolve(&JsValue::null())).await;
385−
386− let old = {
387− let mut exclusive = inner.exclusive.borrow_mut();
388− mem::replace(&mut *exclusive.component.as_mut().unwrap_throw(), root)
389− };
390−
391− VdomWeak::new(&inner).render().await?;
392−
393− Ok(old)
365+ ) -> impl Future<Item = Box<dyn RootRender + 'static>, Error = VdomDroppedError> {
366+ futures::future::ok(self.inner.upgrade())
367+ .and_then(|inner| inner.ok_or(()))
368+ .map_err(|_| VdomDroppedError {})
369+ .and_then(|inner| {
370+ let promise = js_sys::Promise::resolve(&JsValue::null());
371+ JsFuture::from(promise)
372+ .map_err(|_| VdomDroppedError {})
373+ .and_then(move |_| {
374+ let old = {
375+ let mut exclusive = inner.exclusive.borrow_mut();
376+ mem::replace(&mut *exclusive.component.as_mut().unwrap_throw(), root)
377+ };
378+ VdomWeak::new(&inner).render().map(|_| old)
379+ })
380+ })
394381 }
395382
396383 /// Execute `f` with a reference to this virtual DOM's root rendering
@@ -398,18 +385,24 @@ impl VdomWeak {
398385 ///
399386 /// To ensure exclusive access to the root rendering component, the
400387 /// invocation takes place on a new tick of the micro-task queue.
401− pub async fn with_component<F, T>(&self, f: F) -> Result<T, VdomDroppedError>
388+ pub fn with_component<F, T>(&self, f: F) -> impl Future<Item = T, Error = VdomDroppedError>
402389 where
403390 F: 'static + FnOnce(&mut dyn RootRender) -> T,
404391 {
405− let inner = self.inner.upgrade().ok_or(VdomDroppedError {})?;
406−
407− // Wait for a new tick of the micro-task queue
408− let _ = JsFuture::from(js_sys::Promise::resolve(&JsValue::null())).await;
409−
410− let mut exclusive = inner.exclusive.borrow_mut();
411−
412− Ok(f(exclusive.component_raw_mut()))
392+ futures::future::ok(self.inner.upgrade())
393+ .and_then(|inner| inner.ok_or(()))
394+ .map_err(|_| VdomDroppedError {})
395+ .and_then(|inner| {
396+ let mut f = Some(f);
397+ let promise = js_sys::Promise::resolve(&JsValue::null());
398+ JsFuture::from(promise)
399+ .map_err(|_| VdomDroppedError {})
400+ .map(move |_| {
401+ let f = f.take().unwrap_throw();
402+ let mut exclusive = inner.exclusive.borrow_mut();
403+ f(exclusive.component_raw_mut())
404+ })
405+ })
413406 }
414407
415408 /// Schedule a render to occur during the next animation frame.
@@ -418,12 +411,7 @@ impl VdomWeak {
418411 /// `render` instead.
419412 pub fn schedule_render(&self) {
420413 debug!("VdomWeak::schedule_render");
421−
422− let future = self.render();
423−
424− wasm_bindgen_futures::spawn_local(async move {
425− let _ = future.await;
426− });
414+ wasm_bindgen_futures::spawn_local(self.render().map_err(|_| ()));
427415 }
428416
429417 /// Schedule a render to occur during the next animation frame and return a
@@ -431,46 +419,43 @@ impl VdomWeak {
431419 ///
432420 /// If you don't want to do more things after the render completes, then use
433421 /// `schedule_render` instead of `render`.
434− pub fn render(&self) -> impl Future<Output = Result<(), VdomDroppedError>> {
435− let inner = self.inner.upgrade();
436−
437− async move {
438− let inner = inner.ok_or(VdomDroppedError {})?;
439−
440− let promise = inner.shared.render_scheduled.take().unwrap_or_else(|| {
441− js_sys::Promise::new(&mut |resolve, reject| {
442− let vdom = VdomWeak {
443− inner: Rc::downgrade(&inner),
444− };
445−
446− with_animation_frame(move || match vdom.inner.upgrade() {
447− None => {
448− warn!("VdomWeak::render: vdom unmounted before we could render");
449− let r = reject.call0(&JsValue::null());
450− debug_assert!(r.is_ok());
451− }
452− Some(inner) => {
453− let mut exclusive = inner.exclusive.borrow_mut();
454− exclusive.render();
455−
456− // We did the render, so take the promise away
457− // and let future `render` calls request new
458− // animation frames.
459− let _ = inner.shared.render_scheduled.take();
460−
461− let r = resolve.call0(&JsValue::null());
462− debug_assert!(r.is_ok());
463− }
464− });
465− })
466− });
467−
468− inner.shared.render_scheduled.set(Some(promise.clone()));
469−
470− JsFuture::from(promise)
471− .await
472− .map(drop)
473− .map_err(|_| VdomDroppedError {})
474− }
422+ pub fn render(&self) -> impl Future<Item = (), Error = VdomDroppedError> {
423+ debug!("VdomWeak::render: initiating render in new animation frame");
424+ futures::future::ok(self.inner.upgrade())
425+ .and_then(|inner| inner.ok_or(()))
426+ .map_err(|_| VdomDroppedError {})
427+ .and_then(|inner| {
428+ let promise = inner.shared.render_scheduled.take().unwrap_or_else(|| {
429+ js_sys::Promise::new(&mut |resolve, reject| {
430+ let vdom = VdomWeak {
431+ inner: Rc::downgrade(&inner),
432+ };
433+ with_animation_frame(move || match vdom.inner.upgrade() {
434+ None => {
435+ warn!("VdomWeak::render: vdom unmounted before we could render");
436+ let r = reject.call0(&JsValue::null());
437+ debug_assert!(r.is_ok());
438+ }
439+ Some(inner) => {
440+ let mut exclusive = inner.exclusive.borrow_mut();
441+ exclusive.render();
442+
443+ // We did the render, so take the promise away
444+ // and let future `render` calls request new
445+ // animation frames.
446+ let _ = inner.shared.render_scheduled.take();
447+
448+ debug!("VdomWeak::render: finished rendering");
449+ let r = resolve.call0(&JsValue::null());
450+ debug_assert!(r.is_ok());
451+ }
452+ });
453+ })
454+ });
455+ inner.shared.render_scheduled.set(Some(promise.clone()));
456+ JsFuture::from(promise)
457+ .map(|_| ())
458+ .map_err(|_| VdomDroppedError {})
459+ })
475460 }
476461}
tests/web/cached.jsdeleted−11
@@ -1,11 +0,0 @@
1−let cloneNodeCount = 0;
2−
3−const origCloneNode = Node.prototype.cloneNode;
4−Node.prototype.cloneNode = function (...args) {
5− cloneNodeCount += 1;
6− return origCloneNode.apply(this, args);
7−};
8−
9−export function getCloneNodeCount() {
10− return cloneNodeCount;
11−}
tests/web/cached.rs+48−103
@@ -1,11 +1,11 @@
11use super::{assert_rendered, before_after, create_element, RenderFn};
2−use dodrio::{builder::*, bumpalo, Cached, Node, Render, RenderContext, RootRender, Vdom};
2+use dodrio::{builder::*, bumpalo, Cached, Node, Render, RenderContext, Vdom};
3+use futures::prelude::*;
34use std::cell::Cell;
45use std::rc::Rc;
5−use wasm_bindgen::prelude::*;
6+use wasm_bindgen::*;
67use wasm_bindgen_test::*;
78
8−#[derive(Default)]
99pub struct CountRenders {
1010 render_count: Cell<usize>,
1111}
@@ -18,8 +18,8 @@ impl CountRenders {
1818 }
1919}
2020
21−impl<'a> Render<'a> for CountRenders {
22− fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
21+impl Render for CountRenders {
22+ fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
2323 let count = self.render_count.get() + 1;
2424 self.render_count.set(count);
2525
@@ -28,8 +28,8 @@ impl<'a> Render<'a> for CountRenders {
2828 }
2929}
3030
31−#[wasm_bindgen_test]
32−async fn uses_cached_render() {
31+#[wasm_bindgen_test(async)]
32+fn uses_cached_render() -> impl Future<Item = (), Error = JsValue> {
3333 use dodrio::builder::*;
3434
3535 let cached = Cached::new(CountRenders::new());
@@ -49,112 +49,57 @@ async fn uses_cached_render() {
4949 let vdom6 = vdom0.clone();
5050 let vdom7 = vdom0.clone();
5151
52− // We render, populate the cache, and get "1".
53− vdom0.weak().render().await.unwrap();
5452 vdom0
5553 .weak()
56− .with_component(move |comp| {
57− let comp = comp.unwrap_mut::<Cached<CountRenders>>();
58− assert_eq!(comp.render_count.get(), 1);
59− assert_rendered(&container1, &RenderFn(|_| text("1")));
54+ // We render, populate the cache, and get "1".
55+ .render()
56+ .and_then(move |_| {
57+ vdom0.weak().with_component(move |comp| {
58+ let comp = comp.unwrap_mut::<Cached<CountRenders>>();
59+ assert_eq!(comp.render_count.get(), 1);
60+ assert_rendered(&container1, &RenderFn(|_| text("1")));
61+ })
6062 })
61− .await
62− .unwrap();
63−
64− // We re-render, re-use the cached node, and get "1" again.
65− vdom1.weak().render().await.unwrap();
66− vdom2
67− .weak()
68− .with_component(move |comp| {
69− let comp = comp.unwrap_mut::<Cached<CountRenders>>();
70− assert_eq!(comp.render_count.get(), 1);
71− assert_rendered(&container2, &RenderFn(|_| text("1")));
63+ // We re-render, re-use the cached node, and get "1" again.
64+ .and_then(move |_| vdom1.weak().render())
65+ .and_then(move |_| {
66+ vdom2.weak().with_component(move |comp| {
67+ let comp = comp.unwrap_mut::<Cached<CountRenders>>();
68+ assert_eq!(comp.render_count.get(), 1);
69+ assert_rendered(&container2, &RenderFn(|_| text("1")));
70+ })
7271 })
73− .await
74− .unwrap();
75−
76− // We invalidate the cache, re-render, re-populate the cache, and should now have "2".
77− vdom3
78− .weak()
79− .with_component(move |comp| {
80− let comp = comp.unwrap_mut::<Cached<CountRenders>>();
81− Cached::invalidate(comp);
72+ // We invalidate the cache, re-render, re-populate the cache, and should
73+ // now have "2".
74+ .and_then(move |_| {
75+ vdom3.weak().with_component(move |comp| {
76+ let comp = comp.unwrap_mut::<Cached<CountRenders>>();
77+ Cached::invalidate(comp);
78+ })
8279 })
83− .await
84− .unwrap();
85− vdom4.weak().render().await.unwrap();
86− vdom5
87− .weak()
88− .with_component(move |comp| {
89− let comp = comp.unwrap_mut::<Cached<CountRenders>>();
90− assert_eq!(comp.render_count.get(), 2);
91− assert_rendered(&container3, &RenderFn(|_| text("2")));
80+ .and_then(move |_| vdom4.weak().render())
81+ .and_then(move |_| {
82+ vdom5.weak().with_component(move |comp| {
83+ let comp = comp.unwrap_mut::<Cached<CountRenders>>();
84+ assert_eq!(comp.render_count.get(), 2);
85+ assert_rendered(&container3, &RenderFn(|_| text("2")));
86+ })
9287 })
93− .await
94− .unwrap();
95−
96− // We re-render, re-use the cached node, and get "2" again.
97− vdom6.weak().render().await.unwrap();
98− vdom7
99− .weak()
100− .with_component(move |comp| {
101− let comp = comp.unwrap_mut::<Cached<CountRenders>>();
102− assert_eq!(comp.render_count.get(), 2);
103− assert_rendered(&container4, &RenderFn(|_| text("2")));
88+ // We re-render, re-use the cached node, and get "2" again.
89+ .and_then(move |_| vdom6.weak().render())
90+ .and_then(move |_| {
91+ vdom7.weak().with_component(move |comp| {
92+ let comp = comp.unwrap_mut::<Cached<CountRenders>>();
93+ assert_eq!(comp.render_count.get(), 2);
94+ assert_rendered(&container4, &RenderFn(|_| text("2")));
95+ })
10496 })
105− .await
106− .unwrap();
107−}
108−
109−#[wasm_bindgen(module = "/tests/web/cached.js")]
110−extern "C" {
111− #[wasm_bindgen(js_name = getCloneNodeCount)]
112− fn get_clone_node_count() -> u32;
113−}
114−
115−#[wasm_bindgen_test]
116−async fn creating_cached_nodes_uses_clone_node() {
117− use dodrio::builder::*;
118−
119− let container = create_element("div");
120−
121− // The initial vdom render should populate the cache and save a template.
122− let vdom0 = Rc::new(Vdom::new(&container, Cached::new(CountRenders::new())));
123− let vdom1 = vdom0.clone();
124− let _vdom2 = vdom0.clone();
125−
126− let clone_node_count_before = get_clone_node_count();
127−
128− // Render something entirely different...
129− vdom0
130− .weak()
131− .set_component(Box::new(RenderFn(|_| text("hi"))) as Box<dyn RootRender>)
132− .await
133− .unwrap();
134−
135− // Re-render our cached node. Since we are creating it from scratch,
136− // and already have a template from the earlier render, we should
137− // call `cloneNode` here.
138− vdom1
139− .weak()
140− .set_component(Box::new(Cached::new(CountRenders::new())) as Box<dyn RootRender>)
141− .await
142− .unwrap();
143−
144− let clone_node_count_after = get_clone_node_count();
145− assert_eq!(clone_node_count_after, clone_node_count_before + 1);
97+ .map_err(|e| JsValue::from(e.to_string()))
14698}
14799
148100struct Id(&'static str);
149−
150−impl Default for Id {
151− fn default() -> Id {
152− Id("")
153− }
154−}
155−
156−impl<'a> Render<'a> for Id {
157− fn render(&self, _cx: &mut RenderContext<'a>) -> Node<'a> {
101+impl Render for Id {
102+ fn render<'a>(&self, _cx: &mut RenderContext<'a>) -> Node<'a> {
158103 text(self.0)
159104 }
160105}
tests/web/events.rs+73−56
@@ -1,6 +1,6 @@
11use super::create_element;
22use dodrio::{Node, Render, RenderContext, Vdom};
3−use futures::future::{select, Either};
3+use futures::Future;
44use std::cell::{Cell, RefCell};
55use std::rc::Rc;
66use wasm_bindgen::prelude::*;
@@ -9,7 +9,7 @@ use wasm_bindgen_test::*;
99
1010struct EventContainer {
1111 event: &'static str,
12− on_event: Box<dyn FnMut()>,
12+ on_event: Box<FnMut()>,
1313}
1414
1515impl EventContainer {
@@ -24,8 +24,8 @@ impl EventContainer {
2424 }
2525}
2626
27−impl<'a> Render<'a> for EventContainer {
28− fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
27+impl Render for EventContainer {
28+ fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
2929 use dodrio::builder::*;
3030 div(&cx)
3131 .attr("id", "target")
@@ -44,14 +44,14 @@ fn target(container: &web_sys::Element) -> web_sys::HtmlElement {
4444 .unchecked_into()
4545}
4646
47−#[wasm_bindgen_test]
48−async fn click() {
47+#[wasm_bindgen_test(async)]
48+fn click() -> impl Future<Item = (), Error = JsValue> {
4949 let container = create_element("div");
5050
51− let (sender, receiver) = futures::channel::oneshot::channel();
51+ let (sender, receiver) = futures::sync::oneshot::channel();
5252 let mut sender = Some(sender);
5353
54− let _vdom = Vdom::new(
54+ let vdom = Vdom::new(
5555 &container,
5656 EventContainer::new("click", move || {
5757 sender
@@ -64,14 +64,18 @@ async fn click() {
6464
6565 target(&container).click();
6666
67− receiver.await.unwrap();
67+ receiver
68+ .map(|_| {
69+ drop(vdom);
70+ })
71+ .map_err(|e| JsValue::from(e.to_string()))
6872}
6973
70−#[wasm_bindgen_test]
71−async fn updated_listener_is_called() {
74+#[wasm_bindgen_test(async)]
75+fn updated_listener_is_called() -> impl Future<Item = (), Error = JsValue> {
7276 let container = create_element("div");
7377
74− let (first_sender, first_receiver) = futures::channel::oneshot::channel();
78+ let (first_sender, first_receiver) = futures::sync::oneshot::channel();
7579 let mut first_sender = Some(first_sender);
7680
7781 let vdom = Vdom::new(
@@ -85,7 +89,7 @@ async fn updated_listener_is_called() {
8589 }),
8690 );
8791
88− let (second_sender, second_receiver) = futures::channel::oneshot::channel();
92+ let (second_sender, second_receiver) = futures::sync::oneshot::channel();
8993 let mut second_sender = Some(second_sender);
9094
9195 vdom.weak()
@@ -96,22 +100,25 @@ async fn updated_listener_is_called() {
96100 .send("second")
97101 .expect_throw("should not have dropped the receiver");
98102 })))
99− .await
100− .unwrap();
101−
102− target(&container).click();
103−
104− match select(first_receiver, second_receiver).await {
105− Either::Left((Ok(_), _)) => panic!(),
106− Either::Left((Err(_), second)) => assert_eq!(second.await, Ok("second")),
107− Either::Right((Ok(msg), _)) => assert_eq!(msg, "second"),
108− Either::Right((Err(_), _)) => panic!(),
109− }
103+ .map_err(|e| JsValue::from(e.to_string()))
104+ .and_then(move |_| {
105+ target(&container).click();
106+
107+ first_receiver
108+ .select(second_receiver)
109+ .map(|(which, _other)| which)
110+ .or_else(|(_error, other)| other)
111+ .map(|which| {
112+ assert_eq!(which, "second");
113+ drop(vdom);
114+ })
115+ .map_err(|e| JsValue::from(e.to_string()))
116+ })
110117}
111118
112119struct ListensOnlyOnFirstRender {
113120 count: Cell<usize>,
114− callback: Box<dyn FnMut()>,
121+ callback: Box<FnMut()>,
115122}
116123
117124impl ListensOnlyOnFirstRender {
@@ -126,8 +133,8 @@ impl ListensOnlyOnFirstRender {
126133 }
127134}
128135
129−impl<'a> Render<'a> for ListensOnlyOnFirstRender {
130− fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
136+impl Render for ListensOnlyOnFirstRender {
137+ fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
131138 use dodrio::builder::*;
132139
133140 let count = self.count.get();
@@ -143,11 +150,11 @@ impl<'a> Render<'a> for ListensOnlyOnFirstRender {
143150 }
144151}
145152
146−#[wasm_bindgen_test]
147−async fn removed_listener_is_not_called() {
153+#[wasm_bindgen_test(async)]
154+fn removed_listener_is_not_called() -> impl Future<Item = (), Error = JsValue> {
148155 let container = create_element("div");
149156
150− let (outer_sender, outer_receiver) = futures::channel::oneshot::channel();
157+ let (outer_sender, outer_receiver) = futures::sync::oneshot::channel();
151158 let outer_sender = Rc::new(RefCell::new(Some(outer_sender)));
152159 let outer_listener = Closure::wrap(Box::new(move |_| {
153160 outer_sender
@@ -156,13 +163,13 @@ async fn removed_listener_is_not_called() {
156163 .expect_throw("should only invoke outer_listener once")
157164 .send("outer")
158165 .expect_throw("should not have dropped receiver");
159− }) as Box<dyn FnMut(web_sys::Event)>);
166+ }) as Box<FnMut(web_sys::Event)>);
160167
161168 container
162169 .add_event_listener_with_callback("click", outer_listener.as_ref().unchecked_ref())
163170 .unwrap();
164171
165− let (vdom_sender, vdom_receiver) = futures::channel::oneshot::channel();
172+ let (vdom_sender, vdom_receiver) = futures::sync::oneshot::channel();
166173 let mut vdom_sender = Some(vdom_sender);
167174
168175 // Render a vdom with a listener into container.
@@ -177,26 +184,33 @@ async fn removed_listener_is_not_called() {
177184 }),
178185 );
179186
180− // Re-render, so we aren't listening anymore.
181− vdom.weak().render().await.unwrap();
182−
183− target(&container).click();
184−
185− // We should get our container's event handler fired, and not the unmounted
186− // vdom's event handler.
187− match select(outer_receiver, vdom_receiver).await {
188− Either::Left((Ok(msg), _)) => assert_eq!(msg, ("outer")),
189− Either::Left((Err(_), _)) => panic!(),
190− Either::Right((Ok(_), _)) => panic!(),
191− Either::Right((Err(_), outer)) => assert_eq!(outer.await, Ok("outer")),
192− }
187+ vdom.weak()
188+ // Re-render, so we aren't listening anymore.
189+ .render()
190+ .map_err(|e| JsValue::from(e.to_string()))
191+ .and_then(move |_| {
192+ target(&container).click();
193+
194+ // We should get our container's event handler fired, and not the unmounted
195+ // vdom's event handler.
196+ outer_receiver
197+ .select(vdom_receiver)
198+ .map(|(which, _other)| which)
199+ .or_else(|(_error, other)| other)
200+ .map(|which| {
201+ assert_eq!(which, "outer");
202+ drop(outer_listener);
203+ drop(vdom)
204+ })
205+ .map_err(|e| JsValue::from(e.to_string()))
206+ })
193207}
194208
195−#[wasm_bindgen_test]
196−async fn event_does_not_fire_after_unmounting() {
209+#[wasm_bindgen_test(async)]
210+fn event_does_not_fire_after_unmounting() -> impl Future<Item = (), Error = JsValue> {
197211 let container = create_element("div");
198212
199− let (outer_sender, outer_receiver) = futures::channel::oneshot::channel();
213+ let (outer_sender, outer_receiver) = futures::sync::oneshot::channel();
200214 let outer_sender = Rc::new(RefCell::new(Some(outer_sender)));
201215 let outer_listener = Closure::wrap(Box::new(move |_| {
202216 outer_sender
@@ -205,13 +219,13 @@ async fn event_does_not_fire_after_unmounting() {
205219 .expect_throw("should only invoke outer_listener once")
206220 .send("outer")
207221 .expect_throw("should not have dropped receiver");
208− }) as Box<dyn FnMut(web_sys::Event)>);
222+ }) as Box<FnMut(web_sys::Event)>);
209223
210224 container
211225 .add_event_listener_with_callback("click", outer_listener.as_ref().unchecked_ref())
212226 .unwrap();
213227
214− let (vdom_sender, vdom_receiver) = futures::channel::oneshot::channel();
228+ let (vdom_sender, vdom_receiver) = futures::sync::oneshot::channel();
215229 let mut vdom_sender = Some(vdom_sender);
216230
217231 // Render a vdom with a listener into container.
@@ -241,10 +255,13 @@ async fn event_does_not_fire_after_unmounting() {
241255
242256 // We should get our container's event handler fired, and not the unmounted
243257 // vdom's event handler.
244− match select(outer_receiver, vdom_receiver).await {
245− Either::Left((Ok(msg), _)) => assert_eq!(msg, ("outer")),
246− Either::Left((Err(_), _)) => panic!(),
247− Either::Right((Ok(_), _)) => panic!(),
248− Either::Right((Err(_), outer)) => assert_eq!(outer.await, Ok("outer")),
249− }
258+ outer_receiver
259+ .select(vdom_receiver)
260+ .map(|(which, _other)| which)
261+ .or_else(|(_error, other)| other)
262+ .map(|which| {
263+ assert_eq!(which, "outer");
264+ drop(outer_listener);
265+ })
266+ .map_err(|e| JsValue::from(e.to_string()))
250267}
tests/web/js_api.rs+37−30
@@ -1,7 +1,8 @@
11use super::{assert_rendered, create_element, RenderFn};
22use dodrio::{builder::*, Node, Render, RenderContext, Vdom};
33use dodrio_js_api::JsRender;
4−use futures::channel::oneshot;
4+use futures::prelude::*;
5+use futures::sync::oneshot;
56use js_sys::Object;
67use std::rc::Rc;
78use wasm_bindgen::prelude::*;
@@ -13,7 +14,7 @@ pub struct WrapJs {
1314}
1415
1516impl WrapJs {
16− pub fn new() -> (WrapJs, oneshot::Receiver<()>, Closure<dyn FnMut()>) {
17+ pub fn new() -> (WrapJs, oneshot::Receiver<()>, Closure<FnMut()>) {
1718 let (sender, receiver) = oneshot::channel();
1819
1920 let on_after_render = Closure::wrap(Box::new({
@@ -25,7 +26,7 @@ impl WrapJs {
2526 .send(())
2627 .expect_throw("receiver should not have been dropped");
2728 }
28− }) as Box<dyn FnMut()>);
29+ }) as Box<FnMut()>);
2930
3031 let component = WrapJs {
3132 inner: JsRender::new(JsComponent::new(&on_after_render)),
@@ -35,8 +36,8 @@ impl WrapJs {
3536 }
3637}
3738
38−impl<'a> Render<'a> for WrapJs {
39− fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
39+impl Render for WrapJs {
40+ fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
4041 div(&cx)
4142 .attr("class", "wrap-js")
4243 .children([self.inner.render(cx)])
@@ -51,7 +52,7 @@ extern "C" {
5152 type JsComponent;
5253
5354 #[wasm_bindgen(constructor)]
54− fn new(on_after_render: &Closure<dyn FnMut()>) -> JsComponent;
55+ fn new(on_after_render: &Closure<FnMut()>) -> JsComponent;
5556}
5657
5758fn eval_js_rendering_component() {
@@ -95,14 +96,14 @@ fn eval_js_rendering_component() {
9596 });
9697}
9798
98−#[wasm_bindgen_test]
99−async fn can_use_js_rendering_components() {
99+#[wasm_bindgen_test(async)]
100+fn can_use_js_rendering_components() -> impl Future<Item = (), Error = JsValue> {
100101 eval_js_rendering_component();
101102
102103 let container = create_element("div");
103− let (component, receiver, _closure) = WrapJs::new();
104− let _vdom = Rc::new(Vdom::new(&container, component));
104+ let (component, receiver, closure) = WrapJs::new();
105105
106+ let vdom = Rc::new(Vdom::new(&container, component));
106107 assert_rendered(
107108 &container,
108109 &RenderFn(|cx| {
@@ -130,24 +131,30 @@ async fn can_use_js_rendering_components() {
130131 .expect_throw("should be an `HTMLElement` object")
131132 .click();
132133
133− receiver.await.unwrap();
134−
135− assert_rendered(
136− &container,
137− &RenderFn(|cx| {
138− div(&cx)
139− .attr("class", "wrap-js")
140− .children([span(&cx)
141− .attr("class", "js-component")
142− .children([
143− text("Here is some plain text"),
144− b(&cx)
145− .children([text("...and here is some bold text")])
146− .finish(),
147− text("1"),
148− ])
149− .finish()])
150− .finish()
151− }),
152− );
134+ receiver
135+ .map(move |_| {
136+ assert_rendered(
137+ &container,
138+ &RenderFn(|cx| {
139+ div(&cx)
140+ .attr("class", "wrap-js")
141+ .children([span(&cx)
142+ .attr("class", "js-component")
143+ .children([
144+ text("Here is some plain text"),
145+ b(&cx)
146+ .children([text("...and here is some bold text")])
147+ .finish(),
148+ text("1"),
149+ ])
150+ .finish()])
151+ .finish()
152+ }),
153+ );
154+
155+ drop(vdom);
156+ drop(container);
157+ drop(closure);
158+ })
159+ .map_err(|e| e.to_string().into())
153160}
tests/web/keyed.jsdeleted−25
@@ -1,25 +0,0 @@
1−export function saveKeyedElements(container) {
2− const saved = new Map;
3− const children = container.querySelectorAll(".keyed");
4− for (const child of children) {
5− saved.set(child.id, child);
6− }
7− return saved;
8−}
9−
10−function assertEq(a, b, msg) {
11− if (a !== b) {
12− throw new Error(`assertEq failed: ${a} !== ${b}; ${msg}`);
13− }
14−}
15−
16−export function checkKeyedElements(container, saved) {
17− const children = container.querySelectorAll(".keyed");
18− for (const child of children) {
19− console.log(`checking child=${child.outerHTML}`);
20− const original = saved.get(child.id);
21− if (original) {
22− assertEq(original, child, `did not preserve child with key=${child.id}`);
23− }
24− }
25−}
tests/web/keyed.rsdeleted−269
@@ -1,269 +0,0 @@
1−use crate::{assert_rendered, create_element};
2−use dodrio::{builder::*, bumpalo, Node, Render, RenderContext, Vdom};
3−use log::*;
4−use std::rc::Rc;
5−use wasm_bindgen::prelude::*;
6−use wasm_bindgen_test::*;
7−
8−struct Keyed(u16);
9−
10−impl<'a> Render<'a> for Keyed {
11− fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
12− let key = bumpalo::format!(in cx.bump, "{}", self.0).into_bump_str();
13− div(&cx)
14− .attr("class", "keyed")
15− .attr("id", key)
16− .key(self.0 as u32)
17− .finish()
18− }
19−}
20−
21−fn keyed<'a, Keys>(cx: &mut RenderContext<'a>, keys: Keys) -> Node<'a>
22−where
23− Keys: AsRef<[u16]>,
24−{
25− let mut parent = div(&cx).attr("class", "parent");
26−
27− for &k in keys.as_ref() {
28− parent = parent.child(Keyed(k).render(cx));
29− }
30−
31− parent.finish()
32−}
33−
34−async fn assert_keyed<Before, After>(before: Before, after: After) -> Result<(), JsValue>
35−where
36− Before: 'static + for<'a> Render<'a>,
37− After: 'static + for<'a> Render<'a>,
38−{
39− #[wasm_bindgen(module = "/tests/web/keyed.js")]
40− extern "C" {
41− #[wasm_bindgen(js_name = saveKeyedElements)]
42− fn save_keyed_elements(container: &web_sys::Element) -> JsValue;
43−
44− #[wasm_bindgen(js_name = checkKeyedElements)]
45− fn check_keyed_elements(container: &web_sys::Element, saved: JsValue);
46− }
47−
48− let container = create_element("div");
49−
50− let before = Rc::new(before);
51− let after = Rc::new(after);
52−
53− debug!("====== Rendering the *before* DOM into the physical DOM ======");
54− let vdom1 = Rc::new(Vdom::new(&container, before.clone()));
55− let _vdom2 = vdom1.clone();
56− let saved = save_keyed_elements(&container);
57−
58− debug!("====== Checking the *before* DOM against the physical DOM ======");
59− assert_rendered(&container, &before);
60−
61− debug!("====== Rendering the *after* DOM into the physical DOM ======");
62− let weak = vdom1.weak();
63− weak.set_component(Box::new(after.clone()))
64− .await
65− .map_err(|e| e.to_string())?;
66−
67− debug!("====== Checking the *after* DOM against the physical DOM ======");
68− assert_rendered(&container, &after);
69− check_keyed_elements(&container, saved);
70−
71− Ok(())
72−}
73−
74−macro_rules! keyed_tests {
75− ( $(
76− $name:ident {
77− before($before_cx:ident) {
78− $( $before:tt )*
79− }
80− after($after_cx:ident) {
81− $( $after:tt )*
82− }
83− }
84− )* ) => {
85− $(
86− #[wasm_bindgen_test]
87− async fn $name() {
88− use crate::RenderFn;
89− log::debug!("############### {} ###############", stringify!($name));
90− assert_keyed(
91− RenderFn(|$before_cx| { $( $before )* }),
92− RenderFn(|$after_cx| { $( $after )* }),
93− )
94− .await
95− .unwrap()
96− }
97− )*
98− }
99−}
100−
101−keyed_tests! {
102− same_order {
103− before(cx) {
104− keyed(cx, [1, 2, 3])
105− }
106− after(cx) {
107− keyed(cx, [1, 2, 3])
108− }
109− }
110−
111− same_order_append {
112− before(cx) {
113− keyed(cx, [1])
114− }
115− after(cx) {
116− keyed(cx, [1, 2])
117− }
118− }
119−
120− same_order_delete {
121− before(cx) {
122− keyed(cx, [1, 2, 3])
123− }
124− after(cx) {
125− keyed(cx, [1, 2])
126− }
127− }
128−
129− same_suffix {
130− before(cx) {
131− keyed(cx, [1, 2, 3])
132− }
133− after(cx) {
134− keyed(cx, [4, 2, 3])
135− }
136− }
137−
138− same_prefix_and_suffix_reorder_middle {
139− before(cx) {
140− keyed(cx, [1, 2, 3, 4])
141− }
142− after(cx) {
143− keyed(cx, [1, 3, 2, 4])
144− }
145− }
146−
147− same_prefix_and_suffix_new_middle {
148− before(cx) {
149− keyed(cx, [2, 3, 4, 5])
150− }
151− after(cx) {
152− keyed(cx, [2, 7, 8, 5])
153− }
154− }
155−
156− reverse_order {
157− before(cx) {
158− keyed(cx, [1, 2, 3])
159− }
160− after(cx) {
161− keyed(cx, [3, 2, 1])
162− }
163− }
164−
165− no_shared_keys {
166− before(cx) {
167− keyed(cx, [1, 2])
168− }
169− after(cx) {
170− keyed(cx, [3, 4])
171− }
172− }
173−
174− new_keys_in_middle {
175− before(cx) {
176− keyed(cx, [1, 2])
177− }
178− after(cx) {
179− keyed(cx, [1, 3, 4, 2])
180− }
181− }
182−
183− new_keys_at_start_and_end {
184− before(cx) {
185− keyed(cx, [1, 2, 3])
186− }
187− after(cx) {
188− keyed(cx, [4, 1, 2, 3, 5])
189− }
190− }
191−
192− delete_prefix {
193− before(cx) {
194− keyed(cx, [1, 2, 3])
195− }
196− after(cx) {
197− keyed(cx, [2, 3])
198− }
199− }
200−
201− delete_suffix {
202− before(cx) {
203− keyed(cx, [1, 2, 3])
204− }
205− after(cx) {
206− keyed(cx, [1, 2])
207− }
208− }
209−
210− delete_middle {
211− before(cx) {
212− keyed(cx, [1, 2, 3])
213− }
214− after(cx) {
215− keyed(cx, [1, 3])
216− }
217− }
218−
219− nested_keyed_children {
220− before(cx) {
221− ul(&cx)
222− .children([
223− li(&cx)
224− .key(1)
225− .children([
226− keyed(cx, [2, 3, 4])
227− ])
228− .finish(),
229− li(&cx)
230− .key(5)
231− .children([
232− keyed(cx, [6, 7, 8])
233− ])
234− .finish(),
235− li(&cx)
236− .key(9)
237− .children([
238− keyed(cx, [10, 11, 12])
239− ])
240− .finish(),
241− ])
242− .finish()
243− }
244− after(cx) {
245− ul(&cx)
246− .children([
247− li(&cx)
248− .key(9)
249− .children([
250− keyed(cx, [12, 11, 10])
251− ])
252− .finish(),
253− li(&cx)
254− .key(5)
255− .children([
256− keyed(cx, [8, 7, 6])
257− ])
258− .finish(),
259− li(&cx)
260− .key(1)
261− .children([
262− keyed(cx, [4, 3, 2])
263− ])
264− .finish(),
265− ])
266− .finish()
267− }
268− }
269−}
tests/web/main.rs+20−26
@@ -6,7 +6,7 @@ use bumpalo::Bump;
66use dodrio::{
77 Attribute, CachedSet, ElementNode, Node, NodeKind, Render, RenderContext, TextNode, Vdom,
88};
9−use fxhash::FxHashMap;
9+use futures::prelude::*;
1010use log::*;
1111use std::cell::RefCell;
1212use std::rc::Rc;
@@ -19,7 +19,6 @@ wasm_bindgen_test_configure!(run_in_browser);
1919pub mod cached;
2020pub mod events;
2121pub mod js_api;
22−pub mod keyed;
2322pub mod render;
2423
2524pub fn window() -> web_sys::Window {
@@ -50,13 +49,12 @@ pub fn init_logging() {
5049
5150/// Assert that the `container` contains the physical DOM tree that matches
5251/// `r`'s rendered virtual DOM.
53−pub fn assert_rendered<R: for<'a> Render<'a>>(container: &web_sys::Element, r: &R) {
52+pub fn assert_rendered<R: Render>(container: &web_sys::Element, r: &R) {
5453 init_logging();
5554
5655 let cached_set = &RefCell::new(CachedSet::default());
5756 let bump = &Bump::new();
58− let templates = &mut FxHashMap::default();
59− let cx = &mut RenderContext::new(bump, cached_set, templates);
57+ let cx = &mut RenderContext::new(bump, cached_set);
6058 let node = r.render(cx);
6159 let child = container
6260 .first_child()
@@ -90,7 +88,7 @@ pub fn assert_rendered<R: for<'a> Render<'a>>(container: &web_sys::Element, r: &
9088 "actual.text_content() == expected.text()"
9189 );
9290 }
93− NodeKind::Element(&ElementNode {
91+ NodeKind::Element(ElementNode {
9492 tag_name,
9593 attributes,
9694 children,
@@ -112,7 +110,7 @@ pub fn assert_rendered<R: for<'a> Render<'a>>(container: &web_sys::Element, r: &
112110 }
113111 }
114112 NodeKind::Cached(ref c) => {
115− let (expected, _template) = cached_set.get(c.id);
113+ let expected = cached_set.get(c.id);
116114 check_node(cached_set, actual, &expected);
117115 }
118116 }
@@ -155,11 +153,11 @@ pub struct RenderFn<F>(F)
155153where
156154 F: for<'a> Fn(&mut RenderContext<'a>) -> Node<'a>;
157155
158−impl<'a, F> Render<'a> for RenderFn<F>
156+impl<F> Render for RenderFn<F>
159157where
160− F: for<'b> Fn(&mut RenderContext<'b>) -> Node<'b>,
158+ F: for<'a> Fn(&mut RenderContext<'a>) -> Node<'a>,
161159{
162− fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
160+ fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
163161 (self.0)(cx)
164162 }
165163}
@@ -167,10 +165,10 @@ where
167165/// Assert that if we start by rendering the `before` virtual DOM tree into a
168166/// physical DOM tree, and then diff it with the `after` virtual DOM tree, then
169167/// the physical DOM tree correctly matches `after`.
170−pub async fn assert_before_after<R, S>(before: R, after: S) -> Result<(), JsValue>
168+pub fn assert_before_after<R, S>(before: R, after: S) -> impl Future<Item = (), Error = JsValue>
171169where
172− R: 'static + for<'a> Render<'a>,
173− S: 'static + for<'a> Render<'a>,
170+ R: 'static + Render,
171+ S: 'static + Render,
174172{
175173 let container = create_element("div");
176174
@@ -179,7 +177,7 @@ where
179177
180178 debug!("====== Rendering the *before* DOM into the physical DOM ======");
181179 let vdom1 = Rc::new(Vdom::new(&container, before.clone()));
182− let _vdom2 = vdom1.clone();
180+ let vdom2 = vdom1.clone();
183181
184182 debug!("====== Checking the *before* DOM against the physical DOM ======");
185183 assert_rendered(&container, &before);
@@ -187,13 +185,12 @@ where
187185 debug!("====== Rendering the *after* DOM into the physical DOM ======");
188186 let weak = vdom1.weak();
189187 weak.set_component(Box::new(after.clone()))
190− .await
191− .map_err(|e| e.to_string())?;
192−
193− debug!("====== Checking the *after* DOM against the physical DOM ======");
194− assert_rendered(&container, &after);
195−
196− Ok(())
188+ .map(move |_| {
189+ debug!("====== Checking the *after* DOM against the physical DOM ======");
190+ assert_rendered(&container, &after);
191+ drop(vdom2);
192+ })
193+ .map_err(|e| JsValue::from(e.to_string()))
197194}
198195
199196/// A helper macro for declaring a bunch of `assert_before_after` tests.
@@ -210,16 +207,13 @@ macro_rules! before_after {
210207 }
211208 )* ) => {
212209 $(
213− #[wasm_bindgen_test]
214− async fn $name() {
210+ #[wasm_bindgen_test(async)]
211+ fn $name() -> impl Future<Item = (), Error = wasm_bindgen::JsValue> {
215212 use crate::{assert_before_after, RenderFn};
216− log::debug!("############### {} ###############", stringify!($name));
217213 assert_before_after(
218214 RenderFn(|$before_bump| { $( $before )* }),
219215 RenderFn(|$after_bump| { $( $after )* })
220216 )
221− .await
222− .unwrap()
223217 }
224218 )*
225219 }
tests/web/render.rs+2−89
@@ -1,7 +1,7 @@
11use super::{assert_rendered, before_after, create_element, RenderFn};
2−use dodrio::{builder::*, bumpalo::collections::String, Node, Render, RenderContext, Vdom};
2+use dodrio::{builder::*, Vdom};
3+use futures::prelude::*;
34use std::rc::Rc;
4−use wasm_bindgen::{ JsCast};
55use wasm_bindgen_test::*;
66
77#[wasm_bindgen_test]
@@ -35,93 +35,6 @@ fn container_is_emptied_upon_drop() {
3535 assert!(container.first_child().is_none());
3636}
3737
38−/// Renders a child with a lifetime scoped to the RenderContext bump arena.
39−#[wasm_bindgen_test]
40−fn render_bump_scoped_node() {
41− struct Child<'a> {
42− name: &'a str,
43− }
44−
45− impl<'a> Render<'a> for Child<'a> {
46− fn render(&self, _cx: &mut RenderContext<'a>) -> Node<'a> {
47− text(self.name)
48− }
49− }
50−
51− struct Parent;
52−
53− impl<'a> Render<'a> for Parent {
54− fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
55− let child_name = String::from_str_in("child", cx.bump).into_bump_str();
56−
57− div(&cx)
58− .children([Child { name: child_name }.render(cx)])
59− .finish()
60− }
61− }
62−
63− let parent = Rc::new(RenderFn(|cx| {
64− Parent.render(cx)
65− }));
66−
67− let container = create_element("div");
68− let _vdom = Vdom::new(&container, parent.clone());
69−
70− assert_rendered(&container, &parent);
71−}
72−
73−/// Originally, dodrio would use the className property for SVGs.
74−///
75−/// This is problematic because when SVG elements are created, the className is flagged as a read
76−/// only property, so setting it causes an exception to be thrown. Here's an example of how this
77−/// happens:
78−///
79−/// let elem = web_sys::window()
80−/// .unwrap()
81−/// .document()
82−/// .unwrap()
83−/// .create_element_ns(Some("http://www.w3.org/2000/svg"), "svg")
84−/// .unwrap();
85−///
86−/// elem.set_class_name("does-not-work");
87−///
88−/// -----------------------------------------------------------------------------------------------
89−///
90−/// wasm-bindgen: imported JS function that was not marked as `catch` threw an error:
91−/// setting getter-only property "className"
92−///
93−/// -----------------------------------------------------------------------------------------------
94−///
95−/// Now, dodrio passes the 'class' attribute of all namespaced elements into set_attribute. This
96−/// satisfies the restrictions on SVG and keeps the optimized path for non-namespaced elements
97−#[wasm_bindgen_test(async)]
98−async fn test_svg_set_class() {
99− let container = create_element("div");
100−
101−
102− let valid_svg = Rc::new(RenderFn(|cx| {
103− ElementBuilder::new(cx.bump, "svg")
104− .namespace(Some("http://www.w3.org/2000/svg"))
105− .attr("class", "works")
106− .finish()
107− }));
108−
109− let vdom = Vdom::new(&container, valid_svg.clone());
110− let weak = vdom.weak();
111−
112− weak.render().await.unwrap();
113−
114− assert_eq!(
115− "works",
116− container.first_child()
117− .expect("unable to get svg")
118− .dyn_ref::<web_sys::Element>()
119− .expect("svg should be an element")
120− .get_attribute("class")
121− .expect("unable to get 'class' of svg")
122− );
123−}
124−
12538before_after! {
12639 same_text {
12740 before(_cx) {