on master help sign in
30 files changed+386−220
since splitsnapshots
unifiedsplit
.travis.yml+11−7 Cargo.lock+165−118 Cargo.toml+8−8 benches/benches.rs+4−4 crates/js-api/Cargo.toml+2−2 crates/js-api/src/lib.rs+4−4 examples/counter/Cargo.toml+2−2 examples/counter/src/lib.rs+2−2 examples/game-of-life/src/lib.rs+2−2 examples/hello-world/src/lib.rs+2−2 examples/input-form/src/lib.rs+2−2 examples/js-component/src/lib.rs+2−2 examples/moire/Cargo.toml+2−2 examples/moire/src/lib.rs+2−2 examples/sierpinski-triangle/src/lib.rs+2−2 examples/todomvc/Cargo.toml+4−4 examples/todomvc/src/todo.rs+2−2 examples/todomvc/src/todos.rs+2−2 src/cached.rs+7−7 src/change_list/mod.rs+2−2 src/diff.rs+6−6 src/lib.rs+2−2 src/render.rs+39−12 src/render_context.rs+1−1 tests/web/cached.rs+4−4 tests/web/events.rs+4−4 tests/web/js_api.rs+2−2 tests/web/keyed.rs+4−4 tests/web/main.rs+6−6 tests/web/render.rs+89−1
.travis.yml+11−7
@@ -25,9 +25,6 @@ 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
3128 - name: "headless browser tests (firefox)"
3229 rust: stable
3330 addons:
@@ -37,10 +34,17 @@ matrix:
3734 rust: stable
3835 install: echo "no install"
3936 script: cargo test --all
40− - name: "check native benches"
41− rust: nightly
42− install: echo "no install"
43− script: cargo check --benches --features xxx-unstable-internal-use-only
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+
4448 # TODO: `chromedriver` is complaining about ports or something. Temporarily
4549 # disable in CI until we figure it out.
4650 # - name: "headless browser tests (chrome)"
Cargo.lock+165−118
@@ -32,7 +32,7 @@ dependencies = [
3232 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
3333 "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
3434 "regex-automata 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
35− "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
35+ "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",
3636]
3737
3838[[package]]
@@ -79,44 +79,45 @@ dependencies = [
7979
8080[[package]]
8181name = "console_log"
82−version = "0.1.2"
82+version = "0.2.0"
8383source = "registry+https://github.com/rust-lang/crates.io-index"
8484dependencies = [
85− "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
85+ "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
8686 "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
8787]
8888
8989[[package]]
9090name = "criterion"
91−version = "0.3.1"
91+version = "0.3.3"
9292source = "registry+https://github.com/rust-lang/crates.io-index"
9393dependencies = [
9494 "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
9595 "cast 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
9696 "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
97− "criterion-plot 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
97+ "criterion-plot 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
9898 "csv 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
99− "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
99+ "itertools 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
100100 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
101101 "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
102102 "oorandom 11.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
103103 "plotters 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
104104 "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
105105 "regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
106− "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
107− "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
108− "serde_json 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
109− "tinytemplate 1.0.2 (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)",
110111 "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
111112]
112113
113114[[package]]
114115name = "criterion-plot"
115−version = "0.4.1"
116+version = "0.4.3"
116117source = "registry+https://github.com/rust-lang/crates.io-index"
117118dependencies = [
118119 "cast 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
119− "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
120+ "itertools 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
120121]
121122
122123[[package]]
@@ -168,7 +169,7 @@ dependencies = [
168169 "csv-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
169170 "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
170171 "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
171− "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
172+ "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",
172173]
173174
174175[[package]]
@@ -181,19 +182,19 @@ dependencies = [
181182
182183[[package]]
183184name = "dodrio"
184−version = "0.1.0"
185+version = "0.2.0"
185186dependencies = [
186187 "bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
187188 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
188− "console_log 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
189− "criterion 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
190− "dodrio-js-api 0.1.0",
191− "futures 0.3.1 (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)",
192193 "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
193194 "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
194− "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
195+ "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
195196 "longest-increasing-subsequence 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
196− "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
197+ "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",
197198 "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
198199 "wasm-bindgen-futures 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
199200 "wasm-bindgen-test 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -205,9 +206,9 @@ name = "dodrio-counter"
205206version = "0.1.0"
206207dependencies = [
207208 "console_error_panic_hook 0.1.6 (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− "dodrio 0.1.0",
210− "log 0.4.8 (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)",
211212 "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
212213 "wasm-bindgen-test 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
213214 "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -218,7 +219,7 @@ name = "dodrio-game-of-life"
218219version = "0.1.0"
219220dependencies = [
220221 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
221− "dodrio 0.1.0",
222+ "dodrio 0.2.0",
222223 "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
223224 "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
224225 "wasm-bindgen-futures 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -231,7 +232,7 @@ name = "dodrio-hello-world"
231232version = "0.1.0"
232233dependencies = [
233234 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
234− "dodrio 0.1.0",
235+ "dodrio 0.2.0",
235236 "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
236237 "wasm-bindgen-test 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
237238 "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -242,7 +243,7 @@ name = "dodrio-input-form"
242243version = "0.1.0"
243244dependencies = [
244245 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
245− "dodrio 0.1.0",
246+ "dodrio 0.2.0",
246247 "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
247248 "wasm-bindgen-test 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
248249 "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -250,9 +251,9 @@ dependencies = [
250251
251252[[package]]
252253name = "dodrio-js-api"
253−version = "0.1.0"
254+version = "0.2.0"
254255dependencies = [
255− "dodrio 0.1.0",
256+ "dodrio 0.2.0",
256257 "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
257258 "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
258259 "wasm-bindgen-futures 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -264,8 +265,8 @@ name = "dodrio-js-component"
264265version = "0.1.0"
265266dependencies = [
266267 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
267− "dodrio 0.1.0",
268− "dodrio-js-api 0.1.0",
268+ "dodrio 0.2.0",
269+ "dodrio-js-api 0.2.0",
269270 "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
270271 "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
271272 "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -277,10 +278,10 @@ version = "0.1.0"
277278dependencies = [
278279 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
279280 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
280− "console_log 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
281− "dodrio 0.1.0",
281+ "console_log 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
282+ "dodrio 0.2.0",
282283 "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
283− "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
284+ "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
284285 "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
285286 "wasm-bindgen-futures 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
286287 "wasm-bindgen-test 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -292,7 +293,7 @@ name = "dodrio-sierpinski"
292293version = "0.1.0"
293294dependencies = [
294295 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
295− "dodrio 0.1.0",
296+ "dodrio 0.2.0",
296297 "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
297298 "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
298299 "wasm-bindgen-futures 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -306,12 +307,12 @@ version = "0.1.0"
306307dependencies = [
307308 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
308309 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
309− "console_log 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
310− "dodrio 0.1.0",
310+ "console_log 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
311+ "dodrio 0.2.0",
311312 "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
312− "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
313− "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
314− "serde_json 1.0.47 (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)",
315316 "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
316317 "wasm-bindgen-futures 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
317318 "wasm-bindgen-test 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -325,81 +326,85 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
325326
326327[[package]]
327328name = "futures"
328−version = "0.3.1"
329+version = "0.3.5"
329330source = "registry+https://github.com/rust-lang/crates.io-index"
330331dependencies = [
331− "futures-channel 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
332− "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
333− "futures-executor 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
334− "futures-io 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
335− "futures-sink 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
336− "futures-task 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
337− "futures-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
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)",
338339]
339340
340341[[package]]
341342name = "futures-channel"
342−version = "0.3.1"
343+version = "0.3.5"
343344source = "registry+https://github.com/rust-lang/crates.io-index"
344345dependencies = [
345− "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
346− "futures-sink 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
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)",
347348]
348349
349350[[package]]
350351name = "futures-core"
351−version = "0.3.1"
352+version = "0.3.5"
352353source = "registry+https://github.com/rust-lang/crates.io-index"
353354
354355[[package]]
355356name = "futures-executor"
356−version = "0.3.1"
357+version = "0.3.5"
357358source = "registry+https://github.com/rust-lang/crates.io-index"
358359dependencies = [
359− "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
360− "futures-task 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
361− "futures-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
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)",
362363]
363364
364365[[package]]
365366name = "futures-io"
366−version = "0.3.1"
367+version = "0.3.5"
367368source = "registry+https://github.com/rust-lang/crates.io-index"
368369
369370[[package]]
370371name = "futures-macro"
371−version = "0.3.1"
372+version = "0.3.5"
372373source = "registry+https://github.com/rust-lang/crates.io-index"
373374dependencies = [
374375 "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
375− "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
376+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
376377 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
377− "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
378+ "syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
378379]
379380
380381[[package]]
381382name = "futures-sink"
382−version = "0.3.1"
383+version = "0.3.5"
383384source = "registry+https://github.com/rust-lang/crates.io-index"
384385
385386[[package]]
386387name = "futures-task"
387−version = "0.3.1"
388+version = "0.3.5"
388389source = "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+]
389393
390394[[package]]
391395name = "futures-util"
392−version = "0.3.1"
396+version = "0.3.5"
393397source = "registry+https://github.com/rust-lang/crates.io-index"
394398dependencies = [
395− "futures-channel 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
396− "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
397− "futures-io 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
398− "futures-macro 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
399− "futures-sink 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
400− "futures-task 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
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)",
401405 "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
402− "pin-utils 0.1.0-alpha.4 (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)",
403408 "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
404409 "proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
405410 "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -413,6 +418,11 @@ dependencies = [
413418 "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
414419]
415420
421+[[package]]
422+name = "half"
423+version = "1.6.0"
424+source = "registry+https://github.com/rust-lang/crates.io-index"
425+
416426[[package]]
417427name = "heck"
418428version = "0.3.1"
@@ -431,7 +441,7 @@ dependencies = [
431441
432442[[package]]
433443name = "itertools"
434−version = "0.8.2"
444+version = "0.9.0"
435445source = "registry+https://github.com/rust-lang/crates.io-index"
436446dependencies = [
437447 "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -462,7 +472,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
462472
463473[[package]]
464474name = "log"
465−version = "0.4.8"
475+version = "0.4.11"
466476source = "registry+https://github.com/rust-lang/crates.io-index"
467477dependencies = [
468478 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -515,14 +525,37 @@ dependencies = [
515525 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
516526]
517527
528+[[package]]
529+name = "once_cell"
530+version = "1.3.1"
531+source = "registry+https://github.com/rust-lang/crates.io-index"
532+
518533[[package]]
519534name = "oorandom"
520535version = "11.1.0"
521536source = "registry+https://github.com/rust-lang/crates.io-index"
522537
538+[[package]]
539+name = "pin-project"
540+version = "0.4.16"
541+source = "registry+https://github.com/rust-lang/crates.io-index"
542+dependencies = [
543+ "pin-project-internal 0.4.16 (registry+https://github.com/rust-lang/crates.io-index)",
544+]
545+
546+[[package]]
547+name = "pin-project-internal"
548+version = "0.4.16"
549+source = "registry+https://github.com/rust-lang/crates.io-index"
550+dependencies = [
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)",
554+]
555+
523556[[package]]
524557name = "pin-utils"
525−version = "0.1.0-alpha.4"
558+version = "0.1.0"
526559source = "registry+https://github.com/rust-lang/crates.io-index"
527560
528561[[package]]
@@ -541,9 +574,9 @@ name = "proc-macro-hack"
541574version = "0.5.11"
542575source = "registry+https://github.com/rust-lang/crates.io-index"
543576dependencies = [
544− "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
577+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
545578 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
546− "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
579+ "syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
547580]
548581
549582[[package]]
@@ -553,7 +586,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
553586
554587[[package]]
555588name = "proc-macro2"
556−version = "1.0.6"
589+version = "1.0.18"
557590source = "registry+https://github.com/rust-lang/crates.io-index"
558591dependencies = [
559592 "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -564,7 +597,7 @@ name = "quote"
564597version = "1.0.2"
565598source = "registry+https://github.com/rust-lang/crates.io-index"
566599dependencies = [
567− "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
600+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
568601]
569602
570603[[package]]
@@ -656,30 +689,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
656689
657690[[package]]
658691name = "serde"
659−version = "1.0.104"
692+version = "1.0.114"
660693source = "registry+https://github.com/rust-lang/crates.io-index"
661694dependencies = [
662− "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
695+ "serde_derive 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",
696+]
697+
698+[[package]]
699+name = "serde_cbor"
700+version = "0.11.1"
701+source = "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)",
663705]
664706
665707[[package]]
666708name = "serde_derive"
667−version = "1.0.104"
709+version = "1.0.114"
668710source = "registry+https://github.com/rust-lang/crates.io-index"
669711dependencies = [
670− "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
712+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
671713 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
672− "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
714+ "syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
673715]
674716
675717[[package]]
676718name = "serde_json"
677−version = "1.0.47"
719+version = "1.0.57"
678720source = "registry+https://github.com/rust-lang/crates.io-index"
679721dependencies = [
680722 "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
681723 "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
682− "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
724+ "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",
683725]
684726
685727[[package]]
@@ -694,10 +736,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
694736
695737[[package]]
696738name = "syn"
697−version = "1.0.11"
739+version = "1.0.33"
698740source = "registry+https://github.com/rust-lang/crates.io-index"
699741dependencies = [
700− "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
742+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
701743 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
702744 "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
703745]
@@ -712,11 +754,11 @@ dependencies = [
712754
713755[[package]]
714756name = "tinytemplate"
715−version = "1.0.2"
757+version = "1.1.0"
716758source = "registry+https://github.com/rust-lang/crates.io-index"
717759dependencies = [
718− "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
719− "serde_json 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
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)",
720762]
721763
722764[[package]]
@@ -765,10 +807,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
765807dependencies = [
766808 "bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
767809 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
768− "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
769− "proc-macro2 1.0.6 (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)",
770812 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
771− "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
813+ "syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
772814 "wasm-bindgen-shared 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
773815]
774816
@@ -797,9 +839,9 @@ name = "wasm-bindgen-macro-support"
797839version = "0.2.55"
798840source = "registry+https://github.com/rust-lang/crates.io-index"
799841dependencies = [
800− "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
842+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
801843 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
802− "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
844+ "syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
803845 "wasm-bindgen-backend 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
804846 "wasm-bindgen-shared 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
805847]
@@ -827,7 +869,7 @@ name = "wasm-bindgen-test-macro"
827869version = "0.3.5"
828870source = "registry+https://github.com/rust-lang/crates.io-index"
829871dependencies = [
830− "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
872+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
831873 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
832874]
833875
@@ -838,10 +880,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
838880dependencies = [
839881 "anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
840882 "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
841− "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
842− "proc-macro2 1.0.6 (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)",
843885 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
844− "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
886+ "syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
845887 "wasm-bindgen-backend 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
846888 "weedle 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
847889]
@@ -905,9 +947,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
905947"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
906948"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
907949"checksum console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"
908−"checksum console_log 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1e7871d2947441b0fdd8e2bd1ce2a2f75304f896582c0d572162d48290683c48"
909−"checksum criterion 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1fc755679c12bda8e5523a71e4d654b6bf2e14bd838dfc48cde6559a05caf7d1"
910−"checksum criterion-plot 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a01e15e0ea58e8234f96146b1f91fa9d0e4dd7a38da93ff7a75d42c0b9d3a545"
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"
911953"checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca"
912954"checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac"
913955"checksum crossbeam-queue 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dfd6515864a82d2f877b42813d4553292c6659498c9a2aa31bab5a15243c2700"
@@ -915,36 +957,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
915957"checksum csv 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "37519ccdfd73a75821cac9319d4fce15a81b9fcf75f951df5b9988aa3a0af87d"
916958"checksum csv-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9b5cadb6b25c77aeff80ba701712494213f4a8418fcda2ee11b6560c3ad0bf4c"
917959"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
918−"checksum futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b6f16056ecbb57525ff698bb955162d0cd03bee84e6241c27ff75c08d8ca5987"
919−"checksum futures-channel 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fcae98ca17d102fd8a3603727b9259fcf7fa4239b603d2142926189bc8999b86"
920−"checksum futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "79564c427afefab1dfb3298535b21eda083ef7935b4f0ecbfcb121f0aec10866"
921−"checksum futures-executor 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1e274736563f686a837a0568b478bdabfeaec2dca794b5649b04e2fe1627c231"
922−"checksum futures-io 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e676577d229e70952ab25f3945795ba5b16d63ca794ca9d2c860e5595d20b5ff"
923−"checksum futures-macro 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "52e7c56c15537adb4f76d0b7a76ad131cb4d2f4f32d3b0bcabcbe1c7c5e87764"
924−"checksum futures-sink 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "171be33efae63c2d59e6dbba34186fe0d6394fb378069a76dfd80fdcffd43c16"
925−"checksum futures-task 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0bae52d6b29cf440e298856fec3965ee6fa71b06aa7495178615953fd669e5f9"
926−"checksum futures-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d66274fb76985d3c62c886d1da7ac4c0903a8c9f754e8fe0f35a6a6cc39e76"
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"
927969"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"
928971"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
929972"checksum hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120"
930−"checksum itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484"
973+"checksum itertools 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
931974"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
932975"checksum js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)" = "1c840fdb2167497b0bd0db43d6dfe61e91637fa72f9d061f8bd17ddc44ba6414"
933976"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
934977"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
935−"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
978+"checksum log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
936979"checksum longest-increasing-subsequence 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3bd0dd2cd90571056fdb71f6275fada10131182f84899f4b2a916e565d81d86"
937980"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
938981"checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9"
939982"checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
940983"checksum num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c81ffc11c212fa327657cb19dd85eb7419e163b5b076bede2bdb5c974c07e4"
941984"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"
942986"checksum oorandom 11.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ebcec7c9c2a95cacc7cd0ecb89d8a8454eca13906f6deb55258ffff0adeb9405"
943−"checksum pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587"
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"
944990"checksum plotters 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "4e3bb8da247d27ae212529352020f3e5ee16e83c0c258061d27b08ab92675eeb"
945991"checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5"
946992"checksum proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "369a6ed065f249a159e06c45752c780bda2fb53c995718f9e484d08daa9eb42e"
947−"checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27"
993+"checksum proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa"
948994"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
949995"checksum rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098"
950996"checksum rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9"
@@ -958,14 +1004,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
9581004"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
9591005"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
9601006"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
961−"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
962−"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
963−"checksum serde_json 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)" = "15913895b61e0be854afd32fd4163fcd2a3df34142cf2cb961b310ce694cbf90"
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"
9641011"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
9651012"checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3"
966−"checksum syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "dff0acdb207ae2fe6d5976617f887eb1e35a2ba52c13c7234c790960cdad9238"
1013+"checksum syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)" = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd"
9671014"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
968−"checksum tinytemplate 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4574b75faccaacddb9b284faecdf0b544b80b6b294f3d062d325c5726a209c20"
1015+"checksum tinytemplate 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d3dc76004a03cec1c5932bca4cdc2e39aaa798e3f82363dd94f9adf6098c12f"
9691016"checksum unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
9701017"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20"
9711018"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
Cargo.toml+8−8
@@ -8,7 +8,7 @@ license = "MPL-2.0"
88name = "dodrio"
99readme = "./README.md"
1010repository = "https://github.com/fitzgen/dodrio"
11−version = "0.1.0"
11+version = "0.2.0"
1212
1313[badges]
1414travis-ci = { repository = "fitzgen/dodrio" }
@@ -46,9 +46,9 @@ bumpalo = "2.6.0"
4646cfg-if = "0.1.10"
4747fxhash = "0.2.1"
4848js-sys = "0.3.32"
49−log = { version = "0.4.8", optional = true }
49+log = { version = "0.4.11", optional = true }
5050longest-increasing-subsequence = "0.1.0"
51−serde = { version = "1.0.104", optional = true }
51+serde = { version = "1.0.114", optional = true }
5252wasm-bindgen = "0.2.55"
5353wasm-bindgen-futures = "0.4.5"
5454
@@ -64,10 +64,10 @@ features = [
6464]
6565
6666[dev-dependencies]
67−console_log = "0.1.2"
68−dodrio-js-api = { version = "=0.1.0", path = "./crates/js-api" }
69−futures = "0.3.1"
70−log = "0.4.8"
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"
7171wasm-bindgen-test = "0.3.5"
7272
7373[dev-dependencies.web-sys]
@@ -81,7 +81,7 @@ features = [
8181]
8282
8383[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
84−criterion = "0.3.1"
84+criterion = "0.3.3"
8585
8686[profile.bench]
8787debug = true
benches/benches.rs+4−4
@@ -17,16 +17,16 @@ use std::convert::TryInto;
1717
1818/// The simplest thing we can render: `<div/>`.
1919struct Empty;
20−impl Render for Empty {
21− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
20+impl<'a> Render<'a> for Empty {
21+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
2222 div(&cx).finish()
2323 }
2424}
2525
2626/// Render a list that is `self.0` items long, has attributes and listeners.
2727struct SimpleList(usize);
28−impl Render for SimpleList {
29− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
28+impl<'a> Render<'a> for SimpleList {
29+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
3030 let mut children = bumpalo::collections::Vec::with_capacity_in(self.0, cx.bump);
3131 children.extend((0..self.0).map(|_| {
3232 li(&cx)
crates/js-api/Cargo.toml+2−2
@@ -7,13 +7,13 @@ keywords = ["javascript", "js", "vdom", "virtual-dom"]
77license = "MPL-2.0"
88name = "dodrio-js-api"
99repository = "https://github.com/fitzgen/dodrio"
10−version = "0.1.0"
10+version = "0.2.0"
1111
1212[badges]
1313travis-ci = { repository = "fitzgen/dodrio" }
1414
1515[dependencies]
16−dodrio = { version = "=0.1.0", path = "../.." }
16+dodrio = { version = "=0.2.0", path = "../.." }
1717wasm-bindgen = "0.2.55"
1818js-sys = "0.3.32"
1919wasm-bindgen-futures = "0.4.5"
crates/js-api/src/lib.rs+4−4
@@ -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 Render for GreetingViaJs {
103− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
102+impl<'a> Render<'a> for GreetingViaJs {
103+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
104104 use dodrio::builder::*;
105105 p(&cx)
106106 .children([
@@ -216,8 +216,8 @@ impl JsRender {
216216 }
217217}
218218
219−impl Render for JsRender {
220− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
219+impl<'a> Render<'a> for JsRender {
220+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
221221 create(cx, self.render())
222222 }
223223}
examples/counter/Cargo.toml+2−2
@@ -11,9 +11,9 @@ crate-type = ["cdylib"]
1111
1212[dependencies]
1313console_error_panic_hook = "0.1.6"
14−console_log = "0.1.2"
14+console_log = "0.2.0"
1515dodrio = { path = "../.." }
16−log = "0.4.8"
16+log = "0.4.11"
1717wasm-bindgen = "0.2.55"
1818
1919[dependencies.web-sys]
examples/counter/src/lib.rs+2−2
@@ -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 Render for Counter {
30− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
29+impl<'a> Render<'a> for Counter {
30+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
3131 use dodrio::builder::*;
3232
3333 // Stringify the count as a bump-allocated string.
examples/game-of-life/src/lib.rs+2−2
@@ -126,8 +126,8 @@ impl Universe {
126126}
127127
128128/// The rendering implementation for our Game of Life.
129−impl Render for Universe {
130− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
129+impl<'a> Render<'a> for Universe {
130+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
131131 use dodrio::builder::*;
132132
133133 let mut rows = bumpalo::collections::Vec::with_capacity_in(self.height as usize, cx.bump);
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 Render for Hello {
14− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
13+impl<'a> Render<'a> for Hello {
14+ fn render(&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/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 Render for SayHelloTo {
27− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
26+impl<'a> Render<'a> for SayHelloTo {
27+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
2828 use dodrio::builder::*;
2929
3030 div(&cx)
examples/js-component/src/lib.rs+2−2
@@ -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 Render for GreetingViaJs {
35− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
34+impl<'a> Render<'a> for GreetingViaJs {
35+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
3636 use dodrio::builder::*;
3737 p(&cx)
3838 .children([text("JavaScript says: "), self.js.render(cx)])
examples/moire/Cargo.toml+2−2
@@ -10,13 +10,13 @@ crate-type = ["cdylib"]
1010[dependencies]
1111cfg-if = "0.1.10"
1212dodrio = { path = "../.." }
13−log = "0.4.8"
13+log = "0.4.11"
1414wasm-bindgen = "0.2.55"
1515wasm-bindgen-futures = "0.4.5"
1616
1717# Optional dependencies for logging.
1818console_error_panic_hook = { optional = true, version = "0.1.6" }
19−console_log = { optional = true, version = "0.1.2" }
19+console_log = { optional = true, version = "0.2.0" }
2020js-sys = "0.3.32"
2121
2222[dependencies.web-sys]
examples/moire/src/lib.rs+2−2
@@ -104,8 +104,8 @@ impl Moire {
104104 }
105105}
106106
107−impl Render for Moire {
108− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
107+impl<'a> Render<'a> for Moire {
108+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
109109 use dodrio::builder::*;
110110
111111 let elapsed = web_sys::window()
examples/sierpinski-triangle/src/lib.rs+2−2
@@ -85,8 +85,8 @@ impl Container {
8585 }
8686}
8787
88−impl Render for Container {
89− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
88+impl<'a> Render<'a> for Container {
89+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
9090 use dodrio::builder::div;
9191
9292 let elapsed = web_sys::window()
examples/todomvc/Cargo.toml+4−4
@@ -8,15 +8,15 @@ version = "0.1.0"
88cfg-if = "0.1.10"
99dodrio = { path = "../..", features = ["serde"] }
1010js-sys = "0.3.32"
11−serde = { features = ["derive"], version = "1.0.104" }
12−serde_json = "1.0.47"
11+serde = { features = ["derive"], version = "1.0.114" }
12+serde_json = "1.0.57"
1313wasm-bindgen = "0.2.55"
1414wasm-bindgen-futures = "0.4.5"
1515
1616# Optional dependencies for logging.
1717console_error_panic_hook = { optional = true, version = "0.1.6" }
18−console_log = { optional = true, version = "0.1.2" }
19−log = { optional = true, version = "0.4.8" }
18+console_log = { optional = true, version = "0.2.0" }
19+log = { optional = true, version = "0.4.11" }
2020
2121[dependencies.web-sys]
2222version = "0.3.32"
examples/todomvc/src/todo.rs+2−2
@@ -116,8 +116,8 @@ impl<C> Todo<C> {
116116 }
117117}
118118
119−impl<C: TodoActions> Render for Todo<C> {
120− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
119+impl<'a, C: TodoActions> Render<'a> for Todo<C> {
120+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
121121 use dodrio::{
122122 builder::*,
123123 bumpalo::{self, collections::String},
examples/todomvc/src/todos.rs+2−2
@@ -289,8 +289,8 @@ impl<C: TodosActions> Todos<C> {
289289 }
290290}
291291
292−impl<C: TodosActions> Render for Todos<C> {
293− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
292+impl<'a, C: TodosActions> Render<'a> for Todos<C> {
293+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
294294 use dodrio::builder::*;
295295
296296 div(&cx)
src/cached.rs+7−7
@@ -45,8 +45,8 @@ where
4545 /// count: u32,
4646 /// }
4747 ///
48− /// impl Render for Counter {
49− /// fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
48+ /// impl<'a> Render<'a> for Counter {
49+ /// fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
5050 /// // ...
5151 /// # unimplemented!()
5252 /// }
@@ -85,8 +85,8 @@ where
8585 /// who: String
8686 /// }
8787 ///
88− /// impl Render for Hello {
89− /// fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
88+ /// impl<'a> Render<'a> for Hello {
89+ /// fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
9090 /// use dodrio::builder::*;
9191 /// let greeting = bumpalo::format!(in cx.bump, "Hello, {}!", self.who);
9292 /// p(&cx)
@@ -143,11 +143,11 @@ where
143143 }
144144}
145145
146−impl<R> Render for Cached<R>
146+impl<'a, R> Render<'a> for Cached<R>
147147where
148− R: 'static + Default + Render,
148+ R: 'static + Default + for<'b> Render<'b>,
149149{
150− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
150+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
151151 let template = cx.template::<R>();
152152 let cached = match self.cached.get() {
153153 // This does-the-cache-contain-this-id check is necessary because
src/change_list/mod.rs+2−2
@@ -233,9 +233,9 @@ impl ChangeListBuilder<'_> {
233233 self.state.emitter.replace_with();
234234 }
235235
236− pub fn set_attribute(&mut self, name: &str, value: &str) {
236+ pub fn set_attribute(&mut self, name: &str, value: &str, is_namespaced: bool) {
237237 debug_assert!(self.traversal_is_committed());
238− if name == "class" {
238+ if name == "class" && !is_namespaced {
239239 let class_id = self.ensure_string(value);
240240 debug!("emit: set_class({:?})", value);
241241 self.state.emitter.set_class(class_id.into());
src/diff.rs+6−6
@@ -78,7 +78,7 @@ pub(crate) fn diff(
7878 return;
7979 }
8080 diff_listeners(change_list, registry, old_listeners, new_listeners);
81− diff_attributes(change_list, old_attributes, new_attributes);
81+ diff_attributes(change_list, old_attributes, new_attributes, new_namespace.is_some());
8282 diff_children(
8383 cached_set,
8484 change_list,
@@ -204,26 +204,26 @@ fn diff_listeners(
204204// [... node]
205205//
206206// The change list stack is left unchanged.
207−fn diff_attributes(change_list: &mut ChangeListBuilder, old: &[Attribute], new: &[Attribute]) {
207+fn diff_attributes(change_list: &mut ChangeListBuilder, old: &[Attribute], new: &[Attribute], is_namespaced: bool) {
208208 // Do O(n^2) passes to add/update and remove attributes, since
209209 // there are almost always very few attributes.
210210 'outer: for new_attr in new {
211211 if new_attr.is_volatile() {
212212 change_list.commit_traversal();
213− change_list.set_attribute(new_attr.name, new_attr.value);
213+ change_list.set_attribute(new_attr.name, new_attr.value, is_namespaced);
214214 } else {
215215 for old_attr in old {
216216 if old_attr.name == new_attr.name {
217217 if old_attr.value != new_attr.value {
218218 change_list.commit_traversal();
219− change_list.set_attribute(new_attr.name, new_attr.value);
219+ change_list.set_attribute(new_attr.name, new_attr.value, is_namespaced);
220220 }
221221 continue 'outer;
222222 }
223223 }
224224
225225 change_list.commit_traversal();
226− change_list.set_attribute(new_attr.name, new_attr.value);
226+ change_list.set_attribute(new_attr.name, new_attr.value, is_namespaced);
227227 }
228228 }
229229
@@ -953,7 +953,7 @@ fn create(
953953 }
954954
955955 for attr in attributes {
956− change_list.set_attribute(&attr.name, &attr.value);
956+ change_list.set_attribute(&attr.name, &attr.value, namespace.is_some());
957957 }
958958
959959 // Fast path: if there is a single text child, it is faster to
src/lib.rs+2−2
@@ -18,8 +18,8 @@
1818//! }
1919//! }
2020//!
21−//! impl<'who> Render for Hello<'who> {
22−//! fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
21+//! impl<'a, 'who> Render<'a> for Hello<'who> {
22+//! fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
2323//! use dodrio::builder::*;
2424//!
2525//! let id = bumpalo::format!(in cx.bump, "hello-{}", self.who);
src/render.rs+39−12
@@ -21,8 +21,8 @@ use wasm_bindgen::UnwrapThrowExt;
2121///
2222/// pub struct MyComponent;
2323///
24−/// impl Render for MyComponent {
25−/// fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
24+/// impl<'a> Render<'a> for MyComponent {
25+/// fn render(&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 {
38+pub trait Render<'a> {
3939 /// Render `self` as a virtual DOM. Use the given context's `Bump` for
4040 /// temporary allocations.
41− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a>;
41+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a>;
4242}
4343
44−impl<'r, R> Render for &'r R
44+impl<'a, 'r, R> Render<'a> for &'r R
4545where
46− R: Render,
46+ R: Render<'a>,
4747{
48− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
48+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
4949 (**self).render(cx)
5050 }
5151}
5252
53−impl<R> Render for Rc<R>
53+impl<'a, R> Render<'a> for Rc<R>
5454where
55− R: Render,
55+ R: Render<'a>,
5656{
57− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
57+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
5858 (**self).render(cx)
5959 }
6060}
@@ -69,7 +69,7 @@ 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 + Render {
72+pub trait RootRender: Any + for<'a> Render<'a> {
7373 /// Get this `&RootRender` trait object as an `&Any` trait object reference.
7474 fn as_any(&self) -> &dyn Any;
7575
@@ -80,7 +80,7 @@ pub trait RootRender: Any + Render {
8080
8181impl<T> RootRender for T
8282where
83− T: Any + Render,
83+ T: Any + for<'a> Render<'a>,
8484{
8585 fn as_any(&self) -> &dyn Any {
8686 self
@@ -138,4 +138,31 @@ 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+ }
141168}
src/render_context.rs+1−1
@@ -69,7 +69,7 @@ impl<'a> RenderContext<'a> {
6969 /// Get or create the cached template for `Cached<R>`.
7070 pub(crate) fn template<R>(&mut self) -> Option<CacheId>
7171 where
72− R: 'static + Default + Render,
72+ R: 'static + Default + for<'b> Render<'b>,
7373 {
7474 let template_id = Cached::<R>::template_id();
7575 if let Some(cache_id) = self.templates.get(&template_id).cloned() {
tests/web/cached.rs+4−4
@@ -18,8 +18,8 @@ impl CountRenders {
1818 }
1919}
2020
21−impl Render for CountRenders {
22− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
21+impl<'a> Render<'a> for CountRenders {
22+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
2323 let count = self.render_count.get() + 1;
2424 self.render_count.set(count);
2525
@@ -153,8 +153,8 @@ impl Default for Id {
153153 }
154154}
155155
156−impl Render for Id {
157− fn render<'a>(&self, _cx: &mut RenderContext<'a>) -> Node<'a> {
156+impl<'a> Render<'a> for Id {
157+ fn render(&self, _cx: &mut RenderContext<'a>) -> Node<'a> {
158158 text(self.0)
159159 }
160160}
tests/web/events.rs+4−4
@@ -24,8 +24,8 @@ impl EventContainer {
2424 }
2525}
2626
27−impl Render for EventContainer {
28− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
27+impl<'a> Render<'a> for EventContainer {
28+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
2929 use dodrio::builder::*;
3030 div(&cx)
3131 .attr("id", "target")
@@ -126,8 +126,8 @@ impl ListensOnlyOnFirstRender {
126126 }
127127}
128128
129−impl Render for ListensOnlyOnFirstRender {
130− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
129+impl<'a> Render<'a> for ListensOnlyOnFirstRender {
130+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
131131 use dodrio::builder::*;
132132
133133 let count = self.count.get();
tests/web/js_api.rs+2−2
@@ -35,8 +35,8 @@ impl WrapJs {
3535 }
3636}
3737
38−impl Render for WrapJs {
39− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
38+impl<'a> Render<'a> for WrapJs {
39+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
4040 div(&cx)
4141 .attr("class", "wrap-js")
4242 .children([self.inner.render(cx)])
tests/web/keyed.rs+4−4
@@ -7,8 +7,8 @@ use wasm_bindgen_test::*;
77
88struct Keyed(u16);
99
10−impl Render for Keyed {
11− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
10+impl<'a> Render<'a> for Keyed {
11+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
1212 let key = bumpalo::format!(in cx.bump, "{}", self.0).into_bump_str();
1313 div(&cx)
1414 .attr("class", "keyed")
@@ -33,8 +33,8 @@ where
3333
3434async fn assert_keyed<Before, After>(before: Before, after: After) -> Result<(), JsValue>
3535where
36− Before: 'static + Render,
37− After: 'static + Render,
36+ Before: 'static + for<'a> Render<'a>,
37+ After: 'static + for<'a> Render<'a>,
3838{
3939 #[wasm_bindgen(module = "/tests/web/keyed.js")]
4040 extern "C" {
tests/web/main.rs+6−6
@@ -50,7 +50,7 @@ pub fn init_logging() {
5050
5151/// Assert that the `container` contains the physical DOM tree that matches
5252/// `r`'s rendered virtual DOM.
53−pub fn assert_rendered<R: Render>(container: &web_sys::Element, r: &R) {
53+pub fn assert_rendered<R: for<'a> Render<'a>>(container: &web_sys::Element, r: &R) {
5454 init_logging();
5555
5656 let cached_set = &RefCell::new(CachedSet::default());
@@ -155,11 +155,11 @@ pub struct RenderFn<F>(F)
155155where
156156 F: for<'a> Fn(&mut RenderContext<'a>) -> Node<'a>;
157157
158−impl<F> Render for RenderFn<F>
158+impl<'a, F> Render<'a> for RenderFn<F>
159159where
160− F: for<'a> Fn(&mut RenderContext<'a>) -> Node<'a>,
160+ F: for<'b> Fn(&mut RenderContext<'b>) -> Node<'b>,
161161{
162− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
162+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {
163163 (self.0)(cx)
164164 }
165165}
@@ -169,8 +169,8 @@ where
169169/// the physical DOM tree correctly matches `after`.
170170pub async fn assert_before_after<R, S>(before: R, after: S) -> Result<(), JsValue>
171171where
172− R: 'static + Render,
173− S: 'static + Render,
172+ R: 'static + for<'a> Render<'a>,
173+ S: 'static + for<'a> Render<'a>,
174174{
175175 let container = create_element("div");
176176
tests/web/render.rs+89−1
@@ -1,6 +1,7 @@
11use super::{assert_rendered, before_after, create_element, RenderFn};
2−use dodrio::{builder::*, Vdom};
2+use dodrio::{builder::*, bumpalo::collections::String, Node, Render, RenderContext, Vdom};
33use std::rc::Rc;
4+use wasm_bindgen::{ JsCast};
45use wasm_bindgen_test::*;
56
67#[wasm_bindgen_test]
@@ -34,6 +35,93 @@ fn container_is_emptied_upon_drop() {
3435 assert!(container.first_child().is_none());
3536}
3637
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+
37125before_after! {
38126 same_text {
39127 before(_cx) {