ca871d6...master · dodrio

git.iko.soy/dodrio

on master help sign in

.travis.yml+18−12

since splitsnapshots

unifiedsplit

@@ -25,24 +25,30 @@ matrix:

25 - name: "build (beta)"

26 rust: beta

27 script: INSTALL=1 ./build.sh

28− - name: "build (nightly)"

29− rust: nightly

30− script: INSTALL=1 ./build.sh

31 - name: "headless browser tests (firefox)"

28 - name: "headless browser tests (firefox)"

32 rust: stable

29 rust: stable

33 addons:

30 addons:

34 firefox: latest

31 firefox: latest

35 script: wasm-pack test --firefox --headless -- --features xxx-unstable-internal-use-only

32 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

41 - name: "native tests"

33 - name: "native tests"

42 rust: stable

34 rust: stable

43 install: echo "no install"

35 install: echo "no install"

44 script: cargo test --all

36 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

45− - name: "check native benches"

43+ # - name: "check native benches"

46− rust: nightly

44+ # rust: nightly

47− install: echo "no install"

45+ # install: echo "no install"

48− script: cargo check --benches --features xxx-unstable-internal-use-only

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

Cargo.lock+498−500

@@ -1,104 +1,71 @@

1# This file is automatically @generated by Cargo.

2# It is not intended for manual editing.

3[[package]]

4−name = "aho-corasick"

4+name = "anyhow"

5−version = "0.7.3"

5+version = "1.0.25"

6source = "registry+https://github.com/rust-lang/crates.io-index"

7−dependencies = [

8− "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",

9−]

10−

11−[[package]]

12−name = "arrayvec"

13−version = "0.4.10"

14−source = "registry+https://github.com/rust-lang/crates.io-index"

15−dependencies = [

16− "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",

17−]

19[[package]]

8[[package]]

20name = "atty"

9name = "atty"

21−version = "0.2.11"

10+version = "0.2.13"

22source = "registry+https://github.com/rust-lang/crates.io-index"

11source = "registry+https://github.com/rust-lang/crates.io-index"

23dependencies = [

12dependencies = [

24− "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",

25− "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",

13+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",

26− "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",

14+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",

27]

15]

29[[package]]

17[[package]]

30name = "autocfg"

18name = "autocfg"

31−version = "0.1.2"

19+version = "0.1.7"

32source = "registry+https://github.com/rust-lang/crates.io-index"

20source = "registry+https://github.com/rust-lang/crates.io-index"

34[[package]]

22[[package]]

35−name = "backtrace"

23+name = "bitflags"

36−version = "0.3.15"

24+version = "1.2.1"

37source = "registry+https://github.com/rust-lang/crates.io-index"

25source = "registry+https://github.com/rust-lang/crates.io-index"

38−dependencies = [

39− "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",

40− "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",

41− "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",

42− "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",

43− "rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",

44− "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",

45−]

47[[package]]

27[[package]]

48−name = "backtrace-sys"

28+name = "bstr"

49−version = "0.1.28"

29+version = "0.2.8"

50source = "registry+https://github.com/rust-lang/crates.io-index"

30source = "registry+https://github.com/rust-lang/crates.io-index"

51dependencies = [

31dependencies = [

32+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",

52− "cc 1.0.34 (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)",

53− "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",

35+ "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",

54]

36]

56−[[package]]

57−name = "bitflags"

58−version = "1.0.4"

59−source = "registry+https://github.com/rust-lang/crates.io-index"

60−

61[[package]]

38[[package]]

62name = "bumpalo"

39name = "bumpalo"

63−version = "2.3.0"

40+version = "2.6.0"

64source = "registry+https://github.com/rust-lang/crates.io-index"

41source = "registry+https://github.com/rust-lang/crates.io-index"

66[[package]]

43[[package]]

67name = "byteorder"

44name = "byteorder"

68−version = "1.3.1"

45+version = "1.3.2"

69source = "registry+https://github.com/rust-lang/crates.io-index"

46source = "registry+https://github.com/rust-lang/crates.io-index"

71[[package]]

48[[package]]

72name = "cast"

49name = "cast"

73−version = "0.2.2"

50+version = "0.2.3"

74−source = "registry+https://github.com/rust-lang/crates.io-index"

75−

76−[[package]]

77−name = "cc"

78−version = "1.0.34"

79source = "registry+https://github.com/rust-lang/crates.io-index"

51source = "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+]

81[[package]]

56[[package]]

82name = "cfg-if"

57name = "cfg-if"

83−version = "0.1.7"

58+version = "0.1.10"

84source = "registry+https://github.com/rust-lang/crates.io-index"

59source = "registry+https://github.com/rust-lang/crates.io-index"

86[[package]]

61[[package]]

87name = "clap"

62name = "clap"

88−version = "2.32.0"

63+version = "2.33.0"

89source = "registry+https://github.com/rust-lang/crates.io-index"

64source = "registry+https://github.com/rust-lang/crates.io-index"

90dependencies = [

65dependencies = [

91− "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",

66+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",

92− "textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",

67+ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",

93− "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",

94−]

95−

96−[[package]]

97−name = "cloudabi"

98−version = "0.0.3"

99−source = "registry+https://github.com/rust-lang/crates.io-index"

100−dependencies = [

101− "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",

68+ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",

102]

69]

103

104[[package]]

71[[package]]

@@ -106,120 +73,132 @@ name = "console_error_panic_hook"

106version = "0.1.6"

73version = "0.1.6"

107source = "registry+https://github.com/rust-lang/crates.io-index"

74source = "registry+https://github.com/rust-lang/crates.io-index"

108dependencies = [

75dependencies = [

109− "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",

76+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",

110− "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",

77+ "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",

111]

78]

112

113[[package]]

80[[package]]

114name = "console_log"

81name = "console_log"

115−version = "0.1.2"

82+version = "0.2.0"

116source = "registry+https://github.com/rust-lang/crates.io-index"

83source = "registry+https://github.com/rust-lang/crates.io-index"

117dependencies = [

84dependencies = [

118− "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",

85+ "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",

119− "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",

86+ "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",

120]

87]

121

122[[package]]

89[[package]]

123name = "criterion"

90name = "criterion"

124−version = "0.2.10"

91+version = "0.3.3"

125source = "registry+https://github.com/rust-lang/crates.io-index"

92source = "registry+https://github.com/rust-lang/crates.io-index"

126dependencies = [

93dependencies = [

127− "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",

94+ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",

128− "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",

95+ "cast 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",

129− "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",

96+ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",

130− "criterion-plot 0.3.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)",

131− "csv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",

98+ "csv 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",

132− "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",

99+ "itertools 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",

133− "lazy_static 1.3.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)",

134− "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",

101+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",

135− "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",

136− "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",

102+ "oorandom 11.1.0 (registry+https://github.com/rust-lang/crates.io-index)",

137− "rand_xoshiro 0.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)",

138− "rayon 1.0.3 (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)",

139− "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",

107+ "serde_cbor 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",

140− "serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",

108+ "serde_derive 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",

141− "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",

109+ "serde_json 1.0.57 (registry+https://github.com/rust-lang/crates.io-index)",

142− "tinytemplate 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",

110+ "tinytemplate 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",

143− "walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)",

111+ "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)",

144]

112]

145

113

146[[package]]

114[[package]]

147name = "criterion-plot"

115name = "criterion-plot"

148−version = "0.3.0"

116+version = "0.4.3"

149source = "registry+https://github.com/rust-lang/crates.io-index"

117source = "registry+https://github.com/rust-lang/crates.io-index"

150dependencies = [

118dependencies = [

151− "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",

152− "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",

119+ "cast 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",

153− "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",

120+ "itertools 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",

154]

121]

155

122

156[[package]]

123[[package]]

157name = "crossbeam-deque"

124name = "crossbeam-deque"

158−version = "0.2.0"

125+version = "0.7.2"

159source = "registry+https://github.com/rust-lang/crates.io-index"

126source = "registry+https://github.com/rust-lang/crates.io-index"

160dependencies = [

127dependencies = [

161− "crossbeam-epoch 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",

128+ "crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",

162− "crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",

129+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",

163]

130]

164

131

165[[package]]

132[[package]]

166name = "crossbeam-epoch"

133name = "crossbeam-epoch"

167−version = "0.3.1"

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"

168source = "registry+https://github.com/rust-lang/crates.io-index"

148source = "registry+https://github.com/rust-lang/crates.io-index"

169dependencies = [

149dependencies = [

170− "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",

171− "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",

172− "crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",

173− "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",

174− "memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",

175− "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",

176− "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",

150+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",

177]

151]

178

152

179[[package]]

153[[package]]

180name = "crossbeam-utils"

154name = "crossbeam-utils"

181−version = "0.2.2"

155+version = "0.7.0"

182source = "registry+https://github.com/rust-lang/crates.io-index"

156source = "registry+https://github.com/rust-lang/crates.io-index"

183dependencies = [

157dependencies = [

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)",

184− "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",

160+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",

185]

161]

186

162

187[[package]]

163[[package]]

188name = "csv"

164name = "csv"

189−version = "1.0.5"

165+version = "1.1.1"

190source = "registry+https://github.com/rust-lang/crates.io-index"

166source = "registry+https://github.com/rust-lang/crates.io-index"

191dependencies = [

167dependencies = [

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)",

192− "csv-core 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",

171+ "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",

193− "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",

172+ "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",

194]

173]

195

174

196[[package]]

175[[package]]

197name = "csv-core"

176name = "csv-core"

198−version = "0.1.5"

177+version = "0.1.6"

199source = "registry+https://github.com/rust-lang/crates.io-index"

178source = "registry+https://github.com/rust-lang/crates.io-index"

200dependencies = [

179dependencies = [

201− "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",

180+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",

202]

181]

203

182

204[[package]]

183[[package]]

205name = "dodrio"

184name = "dodrio"

206−version = "0.1.0"

185+version = "0.2.0"

207dependencies = [

186dependencies = [

208− "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",

209− "bumpalo 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",

187+ "bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)",

210− "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",

188+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",

211− "console_log 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",

189+ "console_log 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",

212− "criterion 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",

190+ "criterion 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",

213− "dodrio-js-api 0.1.0",

191+ "dodrio-js-api 0.2.0",

214− "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",

192+ "futures 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",

215 "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",

193 "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",

216− "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",

194+ "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",

217− "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",

195+ "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",

218 "longest-increasing-subsequence 0.1.0 (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)",

219− "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",

198+ "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",

220− "wasm-bindgen-futures 0.3.17 (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)",

221− "wasm-bindgen-test 0.2.40 (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)",

222− "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",

201+ "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",

223]

202]

224

203

225[[package]]

204[[package]]

@@ -227,12 +206,12 @@ name = "dodrio-counter"

227version = "0.1.0"

206version = "0.1.0"

228dependencies = [

207dependencies = [

229 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",

208 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",

230− "console_log 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",

209+ "console_log 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",

231− "dodrio 0.1.0",

210+ "dodrio 0.2.0",

232− "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",

211+ "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",

233− "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",

212+ "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",

234− "wasm-bindgen-test 0.2.40 (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)",

235− "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",

214+ "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",

236]

215]

237

216

238[[package]]

217[[package]]

@@ -240,13 +219,12 @@ name = "dodrio-game-of-life"

240version = "0.1.0"

219version = "0.1.0"

241dependencies = [

220dependencies = [

242 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",

221 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",

243− "dodrio 0.1.0",

222+ "dodrio 0.2.0",

244− "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",

245− "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",

223+ "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",

246− "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",

224+ "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",

247− "wasm-bindgen-futures 0.3.17 (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)",

248− "wasm-bindgen-test 0.2.40 (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)",

249− "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",

227+ "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",

250]

228]

251

229

252[[package]]

230[[package]]

@@ -254,10 +232,10 @@ name = "dodrio-hello-world"

254version = "0.1.0"

232version = "0.1.0"

255dependencies = [

233dependencies = [

256 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",

234 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",

257− "dodrio 0.1.0",

235+ "dodrio 0.2.0",

258− "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",

236+ "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",

259− "wasm-bindgen-test 0.2.40 (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)",

260− "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",

238+ "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",

261]

239]

262

240

263[[package]]

241[[package]]

@@ -265,22 +243,21 @@ name = "dodrio-input-form"

265version = "0.1.0"

243version = "0.1.0"

266dependencies = [

244dependencies = [

267 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",

245 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",

268− "dodrio 0.1.0",

246+ "dodrio 0.2.0",

269− "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",

247+ "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",

270− "wasm-bindgen-test 0.2.40 (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)",

271− "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",

249+ "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",

272]

250]

273

251

274[[package]]

252[[package]]

275name = "dodrio-js-api"

253name = "dodrio-js-api"

276−version = "0.1.0"

254+version = "0.2.0"

277dependencies = [

255dependencies = [

278− "dodrio 0.1.0",

256+ "dodrio 0.2.0",

279− "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",

280− "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",

257+ "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",

281− "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",

258+ "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",

282− "wasm-bindgen-futures 0.3.17 (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)",

283− "wasm-bindgen-test 0.2.40 (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)",

284]

261]

285

262

286[[package]]

263[[package]]

@@ -288,28 +265,27 @@ name = "dodrio-js-component"

288version = "0.1.0"

265version = "0.1.0"

289dependencies = [

266dependencies = [

290 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",

267 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",

291− "dodrio 0.1.0",

268+ "dodrio 0.2.0",

292− "dodrio-js-api 0.1.0",

269+ "dodrio-js-api 0.2.0",

293− "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",

270+ "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",

294− "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",

271+ "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",

295− "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",

272+ "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",

296]

273]

297

274

298[[package]]

275[[package]]

299name = "dodrio-moire"

276name = "dodrio-moire"

300version = "0.1.0"

277version = "0.1.0"

301dependencies = [

278dependencies = [

302− "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",

279+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",

303 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",

280 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",

304− "console_log 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",

281+ "console_log 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",

305− "dodrio 0.1.0",

282+ "dodrio 0.2.0",

306− "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",

307− "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",

283+ "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",

308− "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",

284+ "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",

309− "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",

285+ "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",

310− "wasm-bindgen-futures 0.3.17 (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)",

311− "wasm-bindgen-test 0.2.40 (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)",

312− "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",

288+ "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",

313]

289]

314

290

315[[package]]

291[[package]]

@@ -317,142 +293,189 @@ name = "dodrio-sierpinski"

317version = "0.1.0"

293version = "0.1.0"

318dependencies = [

294dependencies = [

319 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",

295 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",

320− "dodrio 0.1.0",

296+ "dodrio 0.2.0",

321− "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",

322− "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",

297+ "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",

323− "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",

298+ "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",

324− "wasm-bindgen-futures 0.3.17 (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)",

325− "wasm-bindgen-test 0.2.40 (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)",

326− "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",

301+ "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",

327]

302]

328

303

329[[package]]

304[[package]]

330name = "dodrio-todomvc"

305name = "dodrio-todomvc"

331version = "0.1.0"

306version = "0.1.0"

332dependencies = [

307dependencies = [

333− "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",

308+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",

334 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",

309 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",

335− "console_log 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",

310+ "console_log 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",

336− "dodrio 0.1.0",

311+ "dodrio 0.2.0",

337− "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",

338− "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",

312+ "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",

339− "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",

313+ "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",

340− "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",

314+ "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",

341− "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",

315+ "serde_json 1.0.57 (registry+https://github.com/rust-lang/crates.io-index)",

342− "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",

316+ "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",

343− "wasm-bindgen-futures 0.3.17 (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)",

344− "wasm-bindgen-test 0.2.40 (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)",

345− "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",

319+ "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",

346]

320]

347

321

348[[package]]

322[[package]]

349name = "either"

323name = "either"

350−version = "1.5.2"

324+version = "1.5.3"

351source = "registry+https://github.com/rust-lang/crates.io-index"

325source = "registry+https://github.com/rust-lang/crates.io-index"

352

326

353[[package]]

327[[package]]

354−name = "env_logger"

328+name = "futures"

355−version = "0.6.1"

329+version = "0.3.5"

356source = "registry+https://github.com/rust-lang/crates.io-index"

330source = "registry+https://github.com/rust-lang/crates.io-index"

357dependencies = [

331dependencies = [

358− "atty 0.2.11 (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)",

359− "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",

334+ "futures-executor 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",

360− "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",

335+ "futures-io 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",

361− "regex 1.1.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)",

362− "termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",

338+ "futures-util 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",

363]

339]

364

340

365[[package]]

341[[package]]

366−name = "failure"

342+name = "futures-channel"

367−version = "0.1.5"

343+version = "0.3.5"

368source = "registry+https://github.com/rust-lang/crates.io-index"

344source = "registry+https://github.com/rust-lang/crates.io-index"

369dependencies = [

345dependencies = [

370− "backtrace 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",

346+ "futures-core 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",

371− "failure_derive 0.1.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)",

372]

348]

373

349

374[[package]]

350[[package]]

375−name = "failure_derive"

351+name = "futures-core"

376−version = "0.1.5"

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"

377source = "registry+https://github.com/rust-lang/crates.io-index"

358source = "registry+https://github.com/rust-lang/crates.io-index"

378dependencies = [

359dependencies = [

379− "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",

360+ "futures-core 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",

380− "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",

361+ "futures-task 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",

381− "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",

382− "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",

362+ "futures-util 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",

383]

363]

384

364

385[[package]]

365[[package]]

386−name = "fuchsia-cprng"

366+name = "futures-io"

387−version = "0.1.1"

367+version = "0.3.5"

388source = "registry+https://github.com/rust-lang/crates.io-index"

368source = "registry+https://github.com/rust-lang/crates.io-index"

389

369

390[[package]]

370[[package]]

391−name = "futures"

371+name = "futures-macro"

392−version = "0.1.26"

372+version = "0.3.5"

373+source = "registry+https://github.com/rust-lang/crates.io-index"

374+dependencies = [

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)",

379+]

380+

381+[[package]]

382+name = "futures-sink"

383+version = "0.3.5"

384+source = "registry+https://github.com/rust-lang/crates.io-index"

385+

386+[[package]]

387+name = "futures-task"

388+version = "0.3.5"

393source = "registry+https://github.com/rust-lang/crates.io-index"

389source = "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"

397+source = "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+]

394

412

395[[package]]

413[[package]]

396name = "fxhash"

414name = "fxhash"

397version = "0.2.1"

415version = "0.2.1"

398source = "registry+https://github.com/rust-lang/crates.io-index"

416source = "registry+https://github.com/rust-lang/crates.io-index"

399dependencies = [

417dependencies = [

400− "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",

418+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",

401]

419]

402

420

421+[[package]]

422+name = "half"

423+version = "1.6.0"

424+source = "registry+https://github.com/rust-lang/crates.io-index"

425+

403[[package]]

426[[package]]

404name = "heck"

427name = "heck"

405version = "0.3.1"

428version = "0.3.1"

406source = "registry+https://github.com/rust-lang/crates.io-index"

429source = "registry+https://github.com/rust-lang/crates.io-index"

407dependencies = [

430dependencies = [

408− "unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",

431+ "unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",

409]

432]

410

433

411[[package]]

434[[package]]

412−name = "humantime"

435+name = "hermit-abi"

413−version = "1.2.0"

436+version = "0.1.3"

414source = "registry+https://github.com/rust-lang/crates.io-index"

437source = "registry+https://github.com/rust-lang/crates.io-index"

415dependencies = [

438dependencies = [

416− "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",

439+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",

417]

440]

418

441

419[[package]]

442[[package]]

420name = "itertools"

443name = "itertools"

421−version = "0.8.0"

444+version = "0.9.0"

422source = "registry+https://github.com/rust-lang/crates.io-index"

445source = "registry+https://github.com/rust-lang/crates.io-index"

423dependencies = [

446dependencies = [

424− "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)",

447+ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",

425]

448]

426

449

427[[package]]

450[[package]]

428name = "itoa"

451name = "itoa"

429−version = "0.4.3"

452+version = "0.4.4"

430source = "registry+https://github.com/rust-lang/crates.io-index"

453source = "registry+https://github.com/rust-lang/crates.io-index"

431

454

432[[package]]

455[[package]]

433name = "js-sys"

456name = "js-sys"

434−version = "0.3.17"

457+version = "0.3.32"

435source = "registry+https://github.com/rust-lang/crates.io-index"

458source = "registry+https://github.com/rust-lang/crates.io-index"

436dependencies = [

459dependencies = [

437− "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",

460+ "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",

438]

461]

439

462

440[[package]]

463[[package]]

441name = "lazy_static"

464name = "lazy_static"

442−version = "1.3.0"

465+version = "1.4.0"

443source = "registry+https://github.com/rust-lang/crates.io-index"

466source = "registry+https://github.com/rust-lang/crates.io-index"

444

467

445[[package]]

468[[package]]

446name = "libc"

469name = "libc"

447−version = "0.2.51"

470+version = "0.2.66"

448source = "registry+https://github.com/rust-lang/crates.io-index"

471source = "registry+https://github.com/rust-lang/crates.io-index"

449

472

450[[package]]

473[[package]]

451name = "log"

474name = "log"

452−version = "0.4.6"

475+version = "0.4.11"

453source = "registry+https://github.com/rust-lang/crates.io-index"

476source = "registry+https://github.com/rust-lang/crates.io-index"

454dependencies = [

477dependencies = [

455− "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",

478+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",

456]

479]

457

480

458[[package]]

481[[package]]

@@ -462,175 +485,180 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

462

485

463[[package]]

486[[package]]

464name = "memchr"

487name = "memchr"

465−version = "2.2.0"

488+version = "2.2.1"

466source = "registry+https://github.com/rust-lang/crates.io-index"

489source = "registry+https://github.com/rust-lang/crates.io-index"

467dependencies = [

490dependencies = [

468− "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",

491+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",

469]

492]

470

493

471[[package]]

494[[package]]

472name = "memoffset"

495name = "memoffset"

473−version = "0.2.1"

496+version = "0.5.3"

474−source = "registry+https://github.com/rust-lang/crates.io-index"

475−

476−[[package]]

477−name = "nodrop"

478−version = "0.1.13"

479source = "registry+https://github.com/rust-lang/crates.io-index"

497source = "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+]

480

501

481[[package]]

502[[package]]

482name = "nom"

503name = "nom"

483version = "4.2.3"

504version = "4.2.3"

484source = "registry+https://github.com/rust-lang/crates.io-index"

505source = "registry+https://github.com/rust-lang/crates.io-index"

485dependencies = [

506dependencies = [

486− "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",

507+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",

487 "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",

508 "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",

488]

509]

489

510

490[[package]]

511[[package]]

491name = "num-traits"

512name = "num-traits"

492−version = "0.2.6"

513+version = "0.2.10"

493source = "registry+https://github.com/rust-lang/crates.io-index"

514source = "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+]

494

518

495[[package]]

519[[package]]

496name = "num_cpus"

520name = "num_cpus"

497−version = "1.10.0"

521+version = "1.11.1"

498source = "registry+https://github.com/rust-lang/crates.io-index"

522source = "registry+https://github.com/rust-lang/crates.io-index"

499dependencies = [

523dependencies = [

524+ "hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",

500− "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",

525+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",

501]

526]

502

527

503[[package]]

528[[package]]

504−name = "proc-macro2"

529+name = "once_cell"

505−version = "0.4.27"

530+version = "1.3.1"

506source = "registry+https://github.com/rust-lang/crates.io-index"

531source = "registry+https://github.com/rust-lang/crates.io-index"

507−dependencies = [

508− "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",

509−]

510

532

511[[package]]

533[[package]]

512−name = "quick-error"

534+name = "oorandom"

513−version = "1.2.2"

535+version = "11.1.0"

514source = "registry+https://github.com/rust-lang/crates.io-index"

536source = "registry+https://github.com/rust-lang/crates.io-index"

515

537

516[[package]]

538[[package]]

517−name = "quote"

539+name = "pin-project"

518−version = "0.6.11"

540+version = "0.4.16"

519source = "registry+https://github.com/rust-lang/crates.io-index"

541source = "registry+https://github.com/rust-lang/crates.io-index"

520dependencies = [

542dependencies = [

521− "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",

543+ "pin-project-internal 0.4.16 (registry+https://github.com/rust-lang/crates.io-index)",

522]

544]

523

545

524[[package]]

546[[package]]

525−name = "rand_core"

547+name = "pin-project-internal"

526−version = "0.3.1"

548+version = "0.4.16"

527source = "registry+https://github.com/rust-lang/crates.io-index"

549source = "registry+https://github.com/rust-lang/crates.io-index"

528dependencies = [

550dependencies = [

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)",

529− "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",

553+ "syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",

530]

554]

531

555

532[[package]]

556[[package]]

533−name = "rand_core"

557+name = "pin-utils"

534−version = "0.4.0"

558+version = "0.1.0"

535source = "registry+https://github.com/rust-lang/crates.io-index"

559source = "registry+https://github.com/rust-lang/crates.io-index"

536

560

537[[package]]

561[[package]]

538−name = "rand_os"

562+name = "plotters"

539−version = "0.1.3"

563+version = "0.2.12"

540source = "registry+https://github.com/rust-lang/crates.io-index"

564source = "registry+https://github.com/rust-lang/crates.io-index"

541dependencies = [

565dependencies = [

542− "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",

566+ "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",

543− "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",

567+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",

544− "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",

568+ "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",

545− "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",

546− "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",

547− "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",

569+ "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",

548]

570]

549

571

550[[package]]

572[[package]]

551−name = "rand_xoshiro"

573+name = "proc-macro-hack"

552−version = "0.1.0"

574+version = "0.5.11"

553source = "registry+https://github.com/rust-lang/crates.io-index"

575source = "registry+https://github.com/rust-lang/crates.io-index"

554dependencies = [

576dependencies = [

555− "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",

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)",

556− "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",

579+ "syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",

557]

580]

558

581

559[[package]]

582[[package]]

560−name = "rayon"

583+name = "proc-macro-nested"

561−version = "1.0.3"

584+version = "0.1.3"

562source = "registry+https://github.com/rust-lang/crates.io-index"

585source = "registry+https://github.com/rust-lang/crates.io-index"

563−dependencies = [

564− "crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",

565− "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)",

566− "rayon-core 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)",

567−]

568

586

569[[package]]

587[[package]]

570−name = "rayon-core"

588+name = "proc-macro2"

571−version = "1.4.1"

589+version = "1.0.18"

572source = "registry+https://github.com/rust-lang/crates.io-index"

590source = "registry+https://github.com/rust-lang/crates.io-index"

573dependencies = [

591dependencies = [

574− "crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",

575− "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",

576− "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",

577− "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",

592+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",

578]

593]

579

594

580[[package]]

595[[package]]

581−name = "rdrand"

596+name = "quote"

582−version = "0.4.0"

597+version = "1.0.2"

583source = "registry+https://github.com/rust-lang/crates.io-index"

598source = "registry+https://github.com/rust-lang/crates.io-index"

584dependencies = [

599dependencies = [

585− "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",

600+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",

586]

601]

587

602

588[[package]]

603[[package]]

589−name = "redox_syscall"

604+name = "rayon"

590−version = "0.1.52"

605+version = "1.3.0"

591source = "registry+https://github.com/rust-lang/crates.io-index"

606source = "registry+https://github.com/rust-lang/crates.io-index"

607+dependencies = [

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)",

611+]

592

612

593[[package]]

613[[package]]

594−name = "redox_termios"

614+name = "rayon-core"

595−version = "0.1.1"

615+version = "1.7.0"

596source = "registry+https://github.com/rust-lang/crates.io-index"

616source = "registry+https://github.com/rust-lang/crates.io-index"

597dependencies = [

617dependencies = [

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)",

598− "redox_syscall 0.1.52 (registry+https://github.com/rust-lang/crates.io-index)",

622+ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",

599]

623]

600

624

601[[package]]

625[[package]]

602name = "regex"

626name = "regex"

603−version = "1.1.5"

627+version = "1.3.3"

604source = "registry+https://github.com/rust-lang/crates.io-index"

628source = "registry+https://github.com/rust-lang/crates.io-index"

605dependencies = [

629dependencies = [

606− "aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",

607− "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",

608− "regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",

609− "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",

610− "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",

630+ "regex-syntax 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",

611]

631]

612

632

613[[package]]

633[[package]]

614−name = "regex-syntax"

634+name = "regex-automata"

615−version = "0.6.6"

635+version = "0.1.8"

616source = "registry+https://github.com/rust-lang/crates.io-index"

636source = "registry+https://github.com/rust-lang/crates.io-index"

617dependencies = [

637dependencies = [

618− "ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",

638+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",

619]

639]

620

640

621[[package]]

641[[package]]

622−name = "rustc-demangle"

642+name = "regex-syntax"

623−version = "0.1.13"

643+version = "0.6.13"

624source = "registry+https://github.com/rust-lang/crates.io-index"

644source = "registry+https://github.com/rust-lang/crates.io-index"

625

645

646+[[package]]

647+name = "rustc_version"

648+version = "0.2.3"

649+source = "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+]

653+

626[[package]]

654[[package]]

627name = "ryu"

655name = "ryu"

628−version = "0.2.7"

656+version = "1.0.2"

629source = "registry+https://github.com/rust-lang/crates.io-index"

657source = "registry+https://github.com/rust-lang/crates.io-index"

630

658

631[[package]]

659[[package]]

632name = "same-file"

660name = "same-file"

633−version = "1.0.4"

661+version = "1.0.5"

634source = "registry+https://github.com/rust-lang/crates.io-index"

662source = "registry+https://github.com/rust-lang/crates.io-index"

635dependencies = [

663dependencies = [

636 "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",

664 "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",

@@ -643,129 +671,109 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

643

671

644[[package]]

672[[package]]

645name = "scopeguard"

673name = "scopeguard"

646−version = "0.3.3"

674+version = "1.0.0"

647source = "registry+https://github.com/rust-lang/crates.io-index"

675source = "registry+https://github.com/rust-lang/crates.io-index"

648

676

649[[package]]

677[[package]]

650−name = "serde"

678+name = "semver"

651−version = "1.0.90"

679+version = "0.9.0"

652source = "registry+https://github.com/rust-lang/crates.io-index"

680source = "registry+https://github.com/rust-lang/crates.io-index"

653dependencies = [

681dependencies = [

654− "serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",

682+ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",

655]

683]

656

684

657[[package]]

685[[package]]

658−name = "serde_derive"

686+name = "semver-parser"

659−version = "1.0.90"

687+version = "0.7.0"

660source = "registry+https://github.com/rust-lang/crates.io-index"

688source = "registry+https://github.com/rust-lang/crates.io-index"

661−dependencies = [

662− "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",

663− "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",

664− "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",

665−]

666

689

667[[package]]

690[[package]]

668−name = "serde_json"

691+name = "serde"

669−version = "1.0.39"

692+version = "1.0.114"

670source = "registry+https://github.com/rust-lang/crates.io-index"

693source = "registry+https://github.com/rust-lang/crates.io-index"

671dependencies = [

694dependencies = [

672− "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",

673− "ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",

674− "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",

695+ "serde_derive 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",

675]

696]

676

697

677[[package]]

698[[package]]

678−name = "sourcefile"

699+name = "serde_cbor"

679−version = "0.1.4"

700+version = "0.11.1"

680source = "registry+https://github.com/rust-lang/crates.io-index"

701source = "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+]

681

706

682[[package]]

707[[package]]

683−name = "syn"

708+name = "serde_derive"

684−version = "0.15.30"

709+version = "1.0.114"

685source = "registry+https://github.com/rust-lang/crates.io-index"

710source = "registry+https://github.com/rust-lang/crates.io-index"

686dependencies = [

711dependencies = [

687− "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",

712+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",

688− "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",

713+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",

689− "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",

714+ "syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",

690]

715]

691

716

692[[package]]

717[[package]]

693−name = "synstructure"

718+name = "serde_json"

694−version = "0.10.1"

719+version = "1.0.57"

695source = "registry+https://github.com/rust-lang/crates.io-index"

720source = "registry+https://github.com/rust-lang/crates.io-index"

696dependencies = [

721dependencies = [

697− "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",

722+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",

698− "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",

699− "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",

723+ "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",

700− "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",

724+ "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",

701]

725]

702

726

703[[package]]

727[[package]]

704−name = "termcolor"

728+name = "slab"

705−version = "1.0.4"

729+version = "0.4.2"

706source = "registry+https://github.com/rust-lang/crates.io-index"

730source = "registry+https://github.com/rust-lang/crates.io-index"

707−dependencies = [

708− "wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",

709−]

710

731

711[[package]]

732[[package]]

712−name = "termion"

733+name = "sourcefile"

713−version = "1.5.1"

734+version = "0.1.4"

714source = "registry+https://github.com/rust-lang/crates.io-index"

735source = "registry+https://github.com/rust-lang/crates.io-index"

715−dependencies = [

716− "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",

717− "redox_syscall 0.1.52 (registry+https://github.com/rust-lang/crates.io-index)",

718− "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",

719−]

720

736

721[[package]]

737[[package]]

722−name = "textwrap"

738+name = "syn"

723−version = "0.10.0"

739+version = "1.0.33"

724source = "registry+https://github.com/rust-lang/crates.io-index"

740source = "registry+https://github.com/rust-lang/crates.io-index"

725dependencies = [

741dependencies = [

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)",

726− "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",

744+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",

727]

745]

728

746

729[[package]]

747[[package]]

730−name = "thread_local"

748+name = "textwrap"

731−version = "0.3.6"

749+version = "0.11.0"

732source = "registry+https://github.com/rust-lang/crates.io-index"

750source = "registry+https://github.com/rust-lang/crates.io-index"

733dependencies = [

751dependencies = [

734− "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",

752+ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",

735]

753]

736

754

737[[package]]

755[[package]]

738name = "tinytemplate"

756name = "tinytemplate"

739−version = "1.0.1"

757+version = "1.1.0"

740source = "registry+https://github.com/rust-lang/crates.io-index"

758source = "registry+https://github.com/rust-lang/crates.io-index"

741dependencies = [

759dependencies = [

742− "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",

760+ "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",

743− "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",

761+ "serde_json 1.0.57 (registry+https://github.com/rust-lang/crates.io-index)",

744]

762]

745

763

746−[[package]]

747−name = "ucd-util"

748−version = "0.1.3"

749−source = "registry+https://github.com/rust-lang/crates.io-index"

750−

751[[package]]

764[[package]]

752name = "unicode-segmentation"

765name = "unicode-segmentation"

753−version = "1.2.1"

766+version = "1.6.0"

754source = "registry+https://github.com/rust-lang/crates.io-index"

767source = "registry+https://github.com/rust-lang/crates.io-index"

755

768

756[[package]]

769[[package]]

757name = "unicode-width"

770name = "unicode-width"

758−version = "0.1.5"

771+version = "0.1.6"

759source = "registry+https://github.com/rust-lang/crates.io-index"

772source = "registry+https://github.com/rust-lang/crates.io-index"

760

773

761[[package]]

774[[package]]

762name = "unicode-xid"

775name = "unicode-xid"

763−version = "0.1.0"

776+version = "0.2.0"

764−source = "registry+https://github.com/rust-lang/crates.io-index"

765−

766−[[package]]

767−name = "utf8-ranges"

768−version = "1.0.2"

769source = "registry+https://github.com/rust-lang/crates.io-index"

777source = "registry+https://github.com/rust-lang/crates.io-index"

770

778

771[[package]]

779[[package]]

@@ -775,126 +783,126 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

775

783

776[[package]]

784[[package]]

777name = "walkdir"

785name = "walkdir"

778−version = "2.2.7"

786+version = "2.3.1"

779source = "registry+https://github.com/rust-lang/crates.io-index"

787source = "registry+https://github.com/rust-lang/crates.io-index"

780dependencies = [

788dependencies = [

781− "same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",

789+ "same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",

782− "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",

790+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",

783 "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",

791 "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",

784]

792]

785

793

786[[package]]

794[[package]]

787name = "wasm-bindgen"

795name = "wasm-bindgen"

788−version = "0.2.40"

796+version = "0.2.55"

789source = "registry+https://github.com/rust-lang/crates.io-index"

797source = "registry+https://github.com/rust-lang/crates.io-index"

790dependencies = [

798dependencies = [

799+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",

791− "wasm-bindgen-macro 0.2.40 (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)",

792]

801]

793

802

794[[package]]

803[[package]]

795name = "wasm-bindgen-backend"

804name = "wasm-bindgen-backend"

796−version = "0.2.40"

805+version = "0.2.55"

797source = "registry+https://github.com/rust-lang/crates.io-index"

806source = "registry+https://github.com/rust-lang/crates.io-index"

798dependencies = [

807dependencies = [

799− "bumpalo 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",

808+ "bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)",

800− "lazy_static 1.3.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)",

801− "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",

810+ "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",

802− "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",

811+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",

803− "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",

812+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",

804− "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",

813+ "syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",

805− "wasm-bindgen-shared 0.2.40 (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)",

806]

815]

807

816

808[[package]]

817[[package]]

809name = "wasm-bindgen-futures"

818name = "wasm-bindgen-futures"

810−version = "0.3.17"

819+version = "0.4.5"

811source = "registry+https://github.com/rust-lang/crates.io-index"

820source = "registry+https://github.com/rust-lang/crates.io-index"

812dependencies = [

821dependencies = [

813− "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",

822+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",

814− "js-sys 0.3.17 (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)",

815− "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",

825+ "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",

816]

826]

817

827

818[[package]]

828[[package]]

819name = "wasm-bindgen-macro"

829name = "wasm-bindgen-macro"

820−version = "0.2.40"

830+version = "0.2.55"

821source = "registry+https://github.com/rust-lang/crates.io-index"

831source = "registry+https://github.com/rust-lang/crates.io-index"

822dependencies = [

832dependencies = [

823− "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",

833+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",

824− "wasm-bindgen-macro-support 0.2.40 (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)",

825]

835]

826

836

827[[package]]

837[[package]]

828name = "wasm-bindgen-macro-support"

838name = "wasm-bindgen-macro-support"

829−version = "0.2.40"

839+version = "0.2.55"

830source = "registry+https://github.com/rust-lang/crates.io-index"

840source = "registry+https://github.com/rust-lang/crates.io-index"

831dependencies = [

841dependencies = [

832− "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",

842+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",

833− "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",

843+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",

834− "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",

844+ "syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",

835− "wasm-bindgen-backend 0.2.40 (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)",

836− "wasm-bindgen-shared 0.2.40 (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)",

837]

847]

838

848

839[[package]]

849[[package]]

840name = "wasm-bindgen-shared"

850name = "wasm-bindgen-shared"

841−version = "0.2.40"

851+version = "0.2.55"

842source = "registry+https://github.com/rust-lang/crates.io-index"

852source = "registry+https://github.com/rust-lang/crates.io-index"

843

853

844[[package]]

854[[package]]

845name = "wasm-bindgen-test"

855name = "wasm-bindgen-test"

846−version = "0.2.40"

856+version = "0.3.5"

847source = "registry+https://github.com/rust-lang/crates.io-index"

857source = "registry+https://github.com/rust-lang/crates.io-index"

848dependencies = [

858dependencies = [

849 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",

859 "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",

850− "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",

851− "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",

860+ "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",

852 "scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",

861 "scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",

853− "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",

862+ "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",

854− "wasm-bindgen-futures 0.3.17 (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)",

855− "wasm-bindgen-test-macro 0.2.40 (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)",

856]

865]

857

866

858[[package]]

867[[package]]

859name = "wasm-bindgen-test-macro"

868name = "wasm-bindgen-test-macro"

860−version = "0.2.40"

869+version = "0.3.5"

861source = "registry+https://github.com/rust-lang/crates.io-index"

870source = "registry+https://github.com/rust-lang/crates.io-index"

862dependencies = [

871dependencies = [

863− "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",

872+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",

864− "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",

873+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",

865]

874]

866

875

867[[package]]

876[[package]]

868name = "wasm-bindgen-webidl"

877name = "wasm-bindgen-webidl"

869−version = "0.2.40"

878+version = "0.2.55"

870source = "registry+https://github.com/rust-lang/crates.io-index"

879source = "registry+https://github.com/rust-lang/crates.io-index"

871dependencies = [

880dependencies = [

872− "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",

881+ "anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",

873 "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",

882 "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",

874− "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",

883+ "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",

875− "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",

884+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",

876− "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",

885+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",

877− "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",

886+ "syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",

878− "wasm-bindgen-backend 0.2.40 (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)",

879− "weedle 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",

888+ "weedle 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",

880]

889]

881

890

882[[package]]

891[[package]]

883name = "web-sys"

892name = "web-sys"

884−version = "0.3.17"

893+version = "0.3.32"

885source = "registry+https://github.com/rust-lang/crates.io-index"

894source = "registry+https://github.com/rust-lang/crates.io-index"

886dependencies = [

895dependencies = [

887− "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",

888− "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",

896+ "anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",

889− "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",

897+ "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",

890 "sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",

898 "sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",

891− "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",

899+ "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",

892− "wasm-bindgen-webidl 0.2.40 (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)",

893]

901]

894

902

895[[package]]

903[[package]]

896name = "weedle"

904name = "weedle"

897−version = "0.8.0"

905+version = "0.10.0"

898source = "registry+https://github.com/rust-lang/crates.io-index"

906source = "registry+https://github.com/rust-lang/crates.io-index"

899dependencies = [

907dependencies = [

900 "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)",

908 "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)",

@@ -902,7 +910,7 @@ dependencies = [

902

910

903[[package]]

911[[package]]

904name = "winapi"

912name = "winapi"

905−version = "0.3.7"

913+version = "0.3.8"

906source = "registry+https://github.com/rust-lang/crates.io-index"

914source = "registry+https://github.com/rust-lang/crates.io-index"

907dependencies = [

915dependencies = [

908 "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",

916 "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",

@@ -919,7 +927,7 @@ name = "winapi-util"

919version = "0.1.2"

927version = "0.1.2"

920source = "registry+https://github.com/rust-lang/crates.io-index"

928source = "registry+https://github.com/rust-lang/crates.io-index"

921dependencies = [

929dependencies = [

922− "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",

930+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",

923]

931]

924

932

925[[package]]

933[[package]]

@@ -927,111 +935,101 @@ name = "winapi-x86_64-pc-windows-gnu"

927version = "0.4.0"

935version = "0.4.0"

928source = "registry+https://github.com/rust-lang/crates.io-index"

936source = "registry+https://github.com/rust-lang/crates.io-index"

929

937

930−[[package]]

931−name = "wincolor"

932−version = "1.0.1"

933−source = "registry+https://github.com/rust-lang/crates.io-index"

934−dependencies = [

935− "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",

936− "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",

937−]

938−

939[metadata]

938[metadata]

940−"checksum aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e6f484ae0c99fec2e858eb6134949117399f222608d84cadb3f58c1f97c2364c"

939+"checksum anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "9267dff192e68f3399525901e709a48c1d3982c9c072fa32f2127a0cb0babf14"

941−"checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71"

942−"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"

940+"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"

943−"checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799"

941+"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"

944−"checksum backtrace 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "f106c02a3604afcdc0df5d36cc47b44b55917dbaf3d808f71c163a0ddba64637"

942+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"

945−"checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"

943+"checksum bstr 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8d6c2c5b58ab920a4f5aeaaca34b4488074e8cc7596af94e6f8c6ff247c60245"

946−"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"

947−"checksum bumpalo 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f6a6bc2ba935b1e2f810787ceba8dfe86cbc164cee55925cae715541186673c4"

944+"checksum bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad807f2fc2bf185eeb98ff3a901bd46dc5ad58163d0fa4577ba0d25674d71708"

948−"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb"

945+"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"

949−"checksum cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "926013f2860c46252efceabb19f4a6b308197505082c609025aa6706c011d427"

946+"checksum cast 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0"

950−"checksum cc 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)" = "30f813bf45048a18eda9190fd3c6b78644146056740c43172a5a3699118588fd"

951−"checksum cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11d43355396e872eefb45ce6342e4374ed7bc2b3a502d1b28e36d6e23c05d1f4"

947+"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"

952−"checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e"

948+"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"

953−"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"

954"checksum console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"

949"checksum console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"

955−"checksum console_log 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1e7871d2947441b0fdd8e2bd1ce2a2f75304f896582c0d572162d48290683c48"

950+"checksum console_log 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "501a375961cef1a0d44767200e66e4a559283097e91d0730b1d75dfb2f8a1494"

956−"checksum criterion 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "1c6e5ee5b9652d4f851418c448af105642e1f99e9a2741a8ff45c0d2c911b1e0"

951+"checksum criterion 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "70daa7ceec6cf143990669a04c7df13391d55fb27bd4079d252fca774ba244d8"

957−"checksum criterion-plot 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4107e4a5abb94267e0149922b8ff49dc70a87cc202820fdbfc0d3e1edbdc4b16"

952+"checksum criterion-plot 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d"

958−"checksum crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f739f8c5363aca78cfb059edf753d8f0d36908c348f3d8d1503f03d8b75d9cf3"

953+"checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca"

959−"checksum crossbeam-epoch 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "927121f5407de9956180ff5e936fe3cf4324279280001cd56b669d28ee7e9150"

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"

960−"checksum crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2760899e32a1d58d5abb31129f8fae5de75220bc2176e77ff7c627ae45c918d9"

956+"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4"

961−"checksum csv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "9fd1c44c58078cfbeaf11fbb3eac9ae5534c23004ed770cc4bfb48e658ae4f04"

957+"checksum csv 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "37519ccdfd73a75821cac9319d4fce15a81b9fcf75f951df5b9988aa3a0af87d"

962−"checksum csv-core 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa5cdef62f37e6ffe7d1f07a381bc0db32b7a3ff1cac0de56cb0d81e71f53d65"

958+"checksum csv-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9b5cadb6b25c77aeff80ba701712494213f4a8418fcda2ee11b6560c3ad0bf4c"

963−"checksum either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b"

959+"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"

964−"checksum env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b61fa891024a945da30a9581546e8cfaf5602c7b3f4c137a2805cf388f92075a"

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"

965−"checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"

963+"checksum futures-executor 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "10d6bb888be1153d3abeb9006b11b02cf5e9b209fda28693c31ae1e4e012e314"

966−"checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"

964+"checksum futures-io 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789"

967−"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"

965+"checksum futures-macro 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39"

968−"checksum futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "62941eff9507c8177d448bd83a44d9b9760856e184081d8cd79ba9f03dd24981"

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"

969"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"

970"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"

971"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"

971−"checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114"

972+"checksum hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120"

972−"checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358"

973+"checksum itertools 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"

973−"checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b"

974+"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"

974−"checksum js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "d4bda84b98977341bb6ba1086ecbd9eab8bc929de0f2923c118baf76c21dd0c8"

975+"checksum js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)" = "1c840fdb2167497b0bd0db43d6dfe61e91637fa72f9d061f8bd17ddc44ba6414"

975−"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14"

976+"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

976−"checksum libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)" = "bedcc7a809076656486ffe045abeeac163da1b558e963a31e29fbfbeba916917"

977+"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"

977−"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"

978+"checksum log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"

978"checksum longest-increasing-subsequence 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3bd0dd2cd90571056fdb71f6275fada10131182f84899f4b2a916e565d81d86"

979"checksum longest-increasing-subsequence 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3bd0dd2cd90571056fdb71f6275fada10131182f84899f4b2a916e565d81d86"

979−"checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39"

980+"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"

980−"checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"

981+"checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9"

981−"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"

982"checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"

983−"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"

983+"checksum num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c81ffc11c212fa327657cb19dd85eb7419e163b5b076bede2bdb5c974c07e4"

984−"checksum num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a23f0ed30a54abaa0c7e83b1d2d87ada7c3c23078d1d87815af3e3b6385fbba"

984+"checksum num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72"

985−"checksum proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)" = "4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915"

985+"checksum once_cell 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b1c601810575c99596d4afc46f78a678c80105117c379eb3650cf99b8a21ce5b"

986−"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"

986+"checksum oorandom 11.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ebcec7c9c2a95cacc7cd0ecb89d8a8454eca13906f6deb55258ffff0adeb9405"

987−"checksum quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)" = "cdd8e04bd9c52e0342b406469d494fcb033be4bdbe5c606016defbb1681411e1"

987+"checksum pin-project 0.4.16 (registry+https://github.com/rust-lang/crates.io-index)" = "81d480cb4e89522ccda96d0eed9af94180b7a5f93fb28f66e1fd7d68431663d1"

988−"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"

988+"checksum pin-project-internal 0.4.16 (registry+https://github.com/rust-lang/crates.io-index)" = "a82996f11efccb19b685b14b5df818de31c1edcee3daa256ab5775dd98e72feb"

989−"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0"

989+"checksum pin-utils 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"

990−"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"

990+"checksum plotters 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "4e3bb8da247d27ae212529352020f3e5ee16e83c0c258061d27b08ab92675eeb"

991−"checksum rand_xoshiro 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "03b418169fb9c46533f326efd6eed2576699c44ca92d3052a066214a8d828929"

991+"checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5"

992−"checksum rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "373814f27745b2686b350dd261bfd24576a6fb0e2c5919b3a2b6005f820b0473"

992+"checksum proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "369a6ed065f249a159e06c45752c780bda2fb53c995718f9e484d08daa9eb42e"

993−"checksum rayon-core 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b055d1e92aba6877574d8fe604a63c8b5df60f60e5982bf7ccbb1338ea527356"

993+"checksum proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa"

994−"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"

994+"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"

995−"checksum redox_syscall 0.1.52 (registry+https://github.com/rust-lang/crates.io-index)" = "d32b3053e5ced86e4bc0411fec997389532bf56b000e66cb4884eeeb41413d69"

995+"checksum rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098"

996−"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"

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"

997−"checksum regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "559008764a17de49a3146b234641644ed37d118d1ef641a0bb573d146edc6ce0"

998+"checksum regex-automata 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "92b73c2a1770c255c240eaa4ee600df1704a38dc3feaa6e949e7fcd4f8dc09f9"

998−"checksum regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dcfd8681eebe297b81d98498869d4aae052137651ad7b96822f09ceb690d0a96"

999+"checksum regex-syntax 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e734e891f5b408a29efbf8309e656876276f49ab6a6ac208600b4419bd893d90"

999−"checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619"

1000+"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"

1000−"checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7"

1001+"checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"

1001−"checksum same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267"

1002+"checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421"

1002"checksum scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"

1003"checksum scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"

1003−"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"

1004+"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"

1004−"checksum serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)" = "aa5f7c20820475babd2c077c3ab5f8c77a31c15e16ea38687b4c02d3e48680f4"

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"

1005−"checksum serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)" = "58fc82bec244f168b23d1963b45c8bf5726e9a15a9d146a067f9081aeed2de79"

1009+"checksum serde_derive 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)" = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e"

1006−"checksum serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)" = "5a23aa71d4a4d43fdbfaac00eff68ba8a06a51759a89ac3304323e800c4dd40d"

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"

1007"checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3"

1012"checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3"

1008−"checksum syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)" = "66c8865bf5a7cbb662d8b011950060b3c8743dca141b054bf7195b20d314d8e2"

1013+"checksum syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)" = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd"

1009−"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"

1010−"checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f"

1011−"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"

1012−"checksum textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6"

1014+"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"

1013−"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"

1015+"checksum tinytemplate 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d3dc76004a03cec1c5932bca4cdc2e39aaa798e3f82363dd94f9adf6098c12f"

1014−"checksum tinytemplate 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7655088894274afb52b807bd3c87072daa1fedd155068b8705cabfd628956115"

1015−"checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86"

1016−"checksum unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aa6024fc12ddfd1c6dbc14a80fa2324d4568849869b779f6bd37e5e4c03344d1"

1016+"checksum unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"

1017−"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526"

1017+"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20"

1018−"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"

1018+"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"

1019−"checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737"

1020"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"

1019"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"

1021−"checksum walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "9d9d7ed3431229a144296213105a390676cc49c9b6a72bd19f3176c98e129fa1"

1020+"checksum walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"

1022−"checksum wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "9742fc4860f47bede1090a5e4b0cfc33afcd70cfdf45dd28f2cfb02d4662b0dd"

1021+"checksum wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "29ae32af33bacd663a9a28241abecf01f2be64e6a185c6139b04f18b6385c5f2"

1023−"checksum wasm-bindgen-backend 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "c6d7f35ecbb4180513cdb9b298543321bcb278670730415cbb3205ff2c66a477"

1022+"checksum wasm-bindgen-backend 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "1845584bd3593442dc0de6e6d9f84454a59a057722f36f005e44665d6ab19d85"

1024−"checksum wasm-bindgen-futures 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "67bfbec85e48e8915b6acfa1c4d90b770ce033c96dc2067688f3bccd00d3b9e1"

1023+"checksum wasm-bindgen-futures 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1458706aa1b8fe6898d19433c9f110d93a05d1f22ae6adf55810409a94df34b4"

1025−"checksum wasm-bindgen-macro 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "e3c86b06bcd28e92e87d2c2ad208889b2f69ea33f79810b91ef660cc3de65a4c"

1024+"checksum wasm-bindgen-macro 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "87fcc747e6b73c93d22c947a6334644d22cfec5abd8b66238484dc2b0aeb9fe4"

1026−"checksum wasm-bindgen-macro-support 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "81d7338dd8c67e193d8ef18e5802dc03d8710456baa792c1c2e66847e57fd389"

1025+"checksum wasm-bindgen-macro-support 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "3dc4b3f2c4078c8c4a5f363b92fcf62604c5913cbd16c6ff5aaf0f74ec03f570"

1027−"checksum wasm-bindgen-shared 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "0d57c3b66f2f3e4d96b50f49b7b7e2f4cfcddc88b15744433c98c5c105b26672"

1026+"checksum wasm-bindgen-shared 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "ca0b78d6d3be8589b95d1d49cdc0794728ca734adf36d7c9f07e6459508bb53d"

1028−"checksum wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "85bbc3ad78a8d59a63a02d59345e8da9a3e0c1617f79e77fd1c3da6e047db63e"

1027+"checksum wasm-bindgen-test 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ed5833682054e941db0b7e2b4877b61bbaafd680608e40d268e070d34558b305"

1029−"checksum wasm-bindgen-test-macro 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "114dfdf01bd3659dd79db05480fbd2751759d1c79cd9edc22f2fe611c866e932"

1028+"checksum wasm-bindgen-test-macro 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "9c5dcf70d21d0ff0ea5cdb97dba9a9b56ddad4a9bd10c8912eedc55618be022f"

1030−"checksum wasm-bindgen-webidl 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "fc7052a577eefce17a439edfce5c2eedc8432fe7457bbe949624cdf946233fa7"

1029+"checksum wasm-bindgen-webidl 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "3126356474ceb717c8fb5549ae387c9fbf4872818454f4d87708bee997214bb5"

1031−"checksum web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "72d02003924c77af871ad74216f828b6e32af776cbb3f5dab3dcde2f2713c012"

1030+"checksum web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)" = "98405c0a2e722ed3db341b4c5b70eb9fe0021621f7350bab76df93b09b649bbf"

1032−"checksum weedle 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "26a4c67f132386d965390b8a734d5d10adbcd30eb5cc74bd9229af8b83f10044"

1031+"checksum weedle 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3bb43f70885151e629e2a19ce9e50bd730fd436cfd4b666894c9ce4de9141164"

1033−"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770"

1032+"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"

1034"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"

1033"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"

1035"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"

1034"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"

1036"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

1035"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

1037−"checksum wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba"

Cargo.toml+24−16

@@ -8,7 +8,7 @@ license = "MPL-2.0"

8name = "dodrio"

9readme = "./README.md"

10repository = "https://github.com/fitzgen/dodrio"

11−version = "0.1.0"

11+version = "0.2.0"

13[badges]

14travis-ci = { repository = "fitzgen/dodrio" }

@@ -29,24 +29,31 @@ harness = false

29required-features = ["xxx-unstable-internal-use-only"]

31[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+

32# Don't use this feature! It only exists for exposing otherwise-internal APIs

40# Don't use this feature! It only exists for exposing otherwise-internal APIs

33# for testing and benchmarks.

41# for testing and benchmarks.

34xxx-unstable-internal-use-only = []

42xxx-unstable-internal-use-only = []

36[dependencies]

44[dependencies]

37−bumpalo = "2.3.0"

45+bumpalo = "2.6.0"

38−cfg-if = "0.1.7"

46+cfg-if = "0.1.10"

39−futures = "0.1.26"

40−wasm-bindgen = "0.2.40"

41−wasm-bindgen-futures = "0.3.17"

42−js-sys = "0.3.17"

43fxhash = "0.2.1"

47fxhash = "0.2.1"

48+js-sys = "0.3.32"

44−log = { version = "0.4.6", optional = true }

49+log = { version = "0.4.11", optional = true }

45−bitflags = "1.0.4"

46longest-increasing-subsequence = "0.1.0"

50longest-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"

48[dependencies.web-sys]

55[dependencies.web-sys]

49−version = "0.3.17"

56+version = "0.3.32"

50features = [

57features = [

51 "console",

58 "console",

52 "Document",

59 "Document",

@@ -57,13 +64,14 @@ features = [

57]

64]

59[dev-dependencies]

66[dev-dependencies]

60−console_log = "0.1.2"

67+console_log = "0.2.0"

61−dodrio-js-api = { version = "=0.1.0", path = "./crates/js-api" }

68+dodrio-js-api = { version = "=0.2.0", path = "./crates/js-api" }

69+futures = "0.3.5"

62−log = "0.4.6"

70+log = "0.4.11"

63−wasm-bindgen-test = "0.2.40"

71+wasm-bindgen-test = "0.3.5"

65[dev-dependencies.web-sys]

73[dev-dependencies.web-sys]

66−version = "0.3.17"

74+version = "0.3.32"

67features = [

75features = [

68 "Attr",

76 "Attr",

69 "EventTarget",

77 "EventTarget",

@@ -73,7 +81,7 @@ features = [

73]

81]

75[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]

83[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]

76−criterion = "0.2.10"

84+criterion = "0.3.3"

78[profile.bench]

86[profile.bench]

79debug = true

87debug = true

README.md+9

@@ -57,6 +57,15 @@ directory](https://github.com/fitzgen/dodrio/tree/master/examples), including:

57* [`js-component`](https://github.com/fitzgen/dodrio/tree/master/examples/js-component):

58 Defines a rendering component in JavaScript with the `dodrio-js-api` crate.

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+

60## Design

69## Design

62### Bump Allocation

71### Bump Allocation

benches/benches.rs+13−24

@@ -13,19 +13,20 @@ use dodrio::{

13 CachedSet, Node, Render, RenderContext, Vdom,

14};

15use std::cell::RefCell;

16+use std::convert::TryInto;

17/// The simplest thing we can render: `<div/>`.

18/// The simplest thing we can render: `<div/>`.

18struct Empty;

19struct Empty;

19−impl Render for Empty {

20+impl<'a> Render<'a> for Empty {

20− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

21+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

21 div(&cx).finish()

22 div(&cx).finish()

22 }

23 }

23}

24}

25/// Render a list that is `self.0` items long, has attributes and listeners.

26/// Render a list that is `self.0` items long, has attributes and listeners.

26struct SimpleList(usize);

27struct SimpleList(usize);

27−impl Render for SimpleList {

28+impl<'a> Render<'a> for SimpleList {

28− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

29+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

29 let mut children = bumpalo::collections::Vec::with_capacity_in(self.0, cx.bump);

30 let mut children = bumpalo::collections::Vec::with_capacity_in(self.0, cx.bump);

30 children.extend((0..self.0).map(|_| {

31 children.extend((0..self.0).map(|_| {

31 li(&cx)

32 li(&cx)

@@ -46,9 +47,10 @@ fn criterion_benchmark(c: &mut Criterion) {

46 Benchmark::new("empty", {

47 Benchmark::new("empty", {

47 let mut bump = Bump::new();

48 let mut bump = Bump::new();

48 let cached_set = RefCell::new(CachedSet::default());

49 let cached_set = RefCell::new(CachedSet::default());

50+ let mut templates = Default::default();

49 move |b| {

51 move |b| {

50 bump.reset();

52 bump.reset();

51− let mut cx = RenderContext::new(&bump, &cached_set);

53+ let mut cx = RenderContext::new(&bump, &cached_set, &mut templates);

52 b.iter(|| {

54 b.iter(|| {

53 black_box(Empty.render(&mut cx));

55 black_box(Empty.render(&mut cx));

54 })

56 })

@@ -63,24 +65,18 @@ fn criterion_benchmark(c: &mut Criterion) {

63 {

65 {

64 let mut bump = Bump::new();

66 let mut bump = Bump::new();

65 let cached_set = RefCell::new(CachedSet::default());

67 let cached_set = RefCell::new(CachedSet::default());

68+ let mut templates = Default::default();

66 move |b, n| {

69 move |b, n| {

67 bump.reset();

70 bump.reset();

68− let mut cx = RenderContext::new(&bump, &cached_set);

71+ let mut cx = RenderContext::new(&bump, &cached_set, &mut templates);

69 b.iter(|| {

72 b.iter(|| {

70 black_box(SimpleList(*n).render(&mut cx));

73 black_box(SimpleList(*n).render(&mut cx));

71 })

74 })

72 }

75 }

73 },

76 },

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,

77+ vec![100, 1_000, 10_000],

81− ],

82 )

78 )

83− .throughput(|n| Throughput::Elements(*n as u32)),

79+ .throughput(|n| Throughput::Elements((*n).try_into().unwrap())),

84 );

80 );

86 c.bench(

82 c.bench(

@@ -94,14 +90,7 @@ fn criterion_benchmark(c: &mut Criterion) {

94 black_box(&vdom);

90 black_box(&vdom);

95 })

91 })

96 },

92 },

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,

93+ vec![100, 1_000, 10_000],

104− ],

105 )

94 )

106 .with_function("empty-to-full-list-to-empty", |b, &n| {

95 .with_function("empty-to-full-list-to-empty", |b, &n| {

107 b.iter(|| {

96 b.iter(|| {

@@ -121,7 +110,7 @@ fn criterion_benchmark(c: &mut Criterion) {

121 black_box(&vdom);

110 black_box(&vdom);

122 })

111 })

123 })

112 })

124− .throughput(|n| Throughput::Elements(*n as u32)),

113+ .throughput(|n| Throughput::Elements((*n).try_into().unwrap())),

125 );

114 );

126}

115}

127

116

crates/js-api/Cargo.toml+6−7

@@ -7,17 +7,16 @@ keywords = ["javascript", "js", "vdom", "virtual-dom"]

7license = "MPL-2.0"

8name = "dodrio-js-api"

9repository = "https://github.com/fitzgen/dodrio"

10−version = "0.1.0"

10+version = "0.2.0"

12[badges]

13travis-ci = { repository = "fitzgen/dodrio" }

15[dependencies]

16−dodrio = { version = "=0.1.0", path = "../.." }

16+dodrio = { version = "=0.2.0", path = "../.." }

17−wasm-bindgen = "0.2.40"

17+wasm-bindgen = "0.2.55"

18−js-sys = "0.3.17"

18+js-sys = "0.3.32"

19−wasm-bindgen-futures = "0.3.17"

19+wasm-bindgen-futures = "0.4.5"

20−futures = "0.1.26"

22[dev-dependencies]

21[dev-dependencies]

23−wasm-bindgen-test = "0.2.40"

22+wasm-bindgen-test = "0.3.5"

crates/js-api/src/lib.rs+13−10

@@ -99,8 +99,8 @@ impl GreetingViaJs {

100/// And finally the `Render` implementation! This adds a `<p>` element and some

101/// text around whatever the inner JS `Greeting` component renders.

102−impl Render for GreetingViaJs {

102+impl<'a> Render<'a> for GreetingViaJs {

103− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

103+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

104 use dodrio::builder::*;

105 p(&cx)

106 .children([

@@ -116,7 +116,6 @@ impl Render for GreetingViaJs {

116#![deny(missing_docs, missing_debug_implementations)]

117

118use dodrio::{builder, bumpalo, Node, Render, RenderContext};

119−use futures::prelude::*;

120use js_sys::{Object, Promise, Reflect};

119use js_sys::{Object, Promise, Reflect};

121use wasm_bindgen::prelude::*;

120use wasm_bindgen::prelude::*;

122use wasm_bindgen::JsCast;

121use wasm_bindgen::JsCast;

@@ -185,12 +184,16 @@ impl VdomWeak {

185 /// Schedule re-rendering of the virtual DOM. A promise is returned that is

184 /// Schedule re-rendering of the virtual DOM. A promise is returned that is

186 /// resolved after the rendering has happened.

185 /// resolved after the rendering has happened.

187 pub fn render(&self) -> Promise {

186 pub fn render(&self) -> Promise {

188− wasm_bindgen_futures::future_to_promise(

189− self.inner.render().map(|_| JsValue::null()).map_err(|e| {

187+ let future = self.inner.render();

188+

189+ wasm_bindgen_futures::future_to_promise(async move {

190+ if let Err(e) = future.await {

190 let msg = e.to_string();

191 let msg = e.to_string();

191− js_sys::Error::new(&msg).into()

192+ Err(js_sys::Error::new(&msg).into())

192− }),

193+ } else {

194+ Ok(JsValue::null())

195+ }

193− )

196+ })

194 }

197 }

195}

198}

196

199

@@ -213,8 +216,8 @@ impl JsRender {

213 }

216 }

214}

217}

215

218

216−impl Render for JsRender {

219+impl<'a> Render<'a> for JsRender {

217− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

220+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

218 create(cx, self.render())

221 create(cx, self.render())

219 }

222 }

220}

223}

examples/counter/Cargo.toml+5−5

@@ -11,13 +11,13 @@ crate-type = ["cdylib"]

12[dependencies]

13console_error_panic_hook = "0.1.6"

14−console_log = "0.1.2"

14+console_log = "0.2.0"

15dodrio = { path = "../.." }

16−log = "0.4.6"

16+log = "0.4.11"

17−wasm-bindgen = "0.2.40"

17+wasm-bindgen = "0.2.55"

19[dependencies.web-sys]

20−version = "0.3.17"

20+version = "0.3.32"

21features = [

22 "console",

23 "Document",

@@ -30,4 +30,4 @@ features = [

30]

32[dev-dependencies]

33−wasm-bindgen-test = "0.2.40"

33+wasm-bindgen-test = "0.3.5"

examples/counter/src/lib.rsmode 100644 → 100755+5−4

@@ -1,4 +1,4 @@

1−use dodrio::{bumpalo, Render, RenderContext};

1+use dodrio::{bumpalo, Node, Render, RenderContext};

2use log::*;

3use wasm_bindgen::prelude::*;

@@ -26,8 +26,8 @@ impl Counter {

27// The `Render` implementation for `Counter`s displays the current count and has

28// buttons to increment and decrement the count.

29−impl Render for Counter {

29+impl<'a> Render<'a> for Counter {

30− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> dodrio::Node<'a> {

30+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

31 use dodrio::builder::*;

33 // Stringify the count as a bump-allocated string.

@@ -54,7 +54,8 @@ impl Render for Counter {

54 button(&cx)

55 .on("click", |root, vdom, _event| {

56 // Same as above, but decrementing instead of incrementing.

57− root.unwrap_mut::<Counter>().decrement();

57+ let counter = root.unwrap_mut::<Counter>();

58+ counter.decrement();

58 vdom.schedule_render();

59 vdom.schedule_render();

59 })

60 })

60 .children([text("-")])

61 .children([text("-")])

examples/game-of-life/Cargo.toml+5−6

@@ -11,14 +11,13 @@ crate-type = ["cdylib"]

12[dependencies]

13dodrio = { path = "../.." }

14−wasm-bindgen = "0.2.40"

14+wasm-bindgen = "0.2.55"

15console_error_panic_hook = "0.1.6"

16−js-sys = "0.3.17"

16+js-sys = "0.3.32"

17−wasm-bindgen-futures = "0.3.17"

17+wasm-bindgen-futures = "0.4.5"

18−futures = "0.1.26"

20[dependencies.web-sys]

19[dependencies.web-sys]

21−version = "0.3.17"

20+version = "0.3.32"

22features = [

21features = [

23 "Document",

22 "Document",

24 "HtmlElement",

23 "HtmlElement",

@@ -27,4 +26,4 @@ features = [

27]

26]

29[dev-dependencies]

28[dev-dependencies]

30−wasm-bindgen-test = "0.2.40"

29+wasm-bindgen-test = "0.3.5"

examples/game-of-life/index.htmlmode 100644 → 100755−3

@@ -19,9 +19,6 @@

19 padding: 0;

20 }

22− .universe {

23− }

24−

25 body {

22 body {

26 width: 100vw;

23 width: 100vw;

27 height: 100vh;

24 height: 100vh;

examples/game-of-life/src/lib.rs+18−13

@@ -1,5 +1,4 @@

1use dodrio::{bumpalo, Node, Render, RenderContext, Vdom};

2−use futures::prelude::*;

3use std::cell::RefCell;

2use std::cell::RefCell;

4use std::rc::Rc;

3use std::rc::Rc;

5use wasm_bindgen::{prelude::*, JsCast};

4use wasm_bindgen::{prelude::*, JsCast};

@@ -127,8 +126,8 @@ impl Universe {

127}

126}

128

127

129/// The rendering implementation for our Game of Life.

128/// The rendering implementation for our Game of Life.

130−impl Render for Universe {

129+impl<'a> Render<'a> for Universe {

131− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

130+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

132 use dodrio::builder::*;

131 use dodrio::builder::*;

133

132

134 let mut rows = bumpalo::collections::Vec::with_capacity_in(self.height as usize, cx.bump);

133 let mut rows = bumpalo::collections::Vec::with_capacity_in(self.height as usize, cx.bump);

@@ -172,26 +171,32 @@ pub fn run() {

172 // Create a new Game of Life `Universe` render component.

171 // Create a new Game of Life `Universe` render component.

173 let universe = Universe::new();

172 let universe = Universe::new();

174

173

175− // Create a virtual DOM and mount it and the `Hello` render component to the

174+ // Create a virtual DOM and mount it and the `Universe` render component to the

176 // `<body>`.

175 // `<body>`.

177 let vdom = Vdom::new(body.as_ref(), universe);

176 let vdom = Vdom::new(body.as_ref(), universe);

178

177

179 // Kick off a loop that keeps computing a tick of the universe and then

178 // Kick off a loop that keeps computing a tick of the universe and then

180 // re-rendering on every animation frame.

179 // re-rendering on every animation frame.

181− let rc: Rc<RefCell<Option<Closure<FnMut()>>>> = Rc::new(RefCell::new(None));

180+ let rc = <Rc<RefCell<Option<Closure<dyn FnMut()>>>>>::default();

182 let rc2 = rc.clone();

181 let rc2 = rc.clone();

183 let window2 = window.clone();

182 let window2 = window.clone();

184 let weak = vdom.weak();

183 let weak = vdom.weak();

185 let f = Closure::wrap(Box::new(move || {

184 let f = Closure::wrap(Box::new(move || {

186 weak.schedule_render();

185 weak.schedule_render();

187

186

188− wasm_bindgen_futures::spawn_local(

187+ wasm_bindgen_futures::spawn_local({

188+ let weak = weak.clone();

189+ async move {

189− weak.with_component(|root| {

190+ let fut = weak.with_component(|root| {

190− let universe = root.unwrap_mut::<Universe>();

191+ let universe = root.unwrap_mut::<Universe>();

191− universe.tick();

192+ universe.tick();

192− })

193+ });

194+

195+ if fut.await.is_err() {

193− .map_err(|_| wasm_bindgen::throw_str("impossible, we always keep the vdom alive")),

196+ wasm_bindgen::throw_str("impossible, we always keep the vdom alive");

197+ }

198+ }

194− );

199+ });

195

200

196 window

201 window

197 .request_animation_frame(

202 .request_animation_frame(

@@ -202,7 +207,7 @@ pub fn run() {

202 .unchecked_ref::<js_sys::Function>(),

207 .unchecked_ref::<js_sys::Function>(),

203 )

208 )

204 .unwrap_throw();

209 .unwrap_throw();

205− }) as Box<FnMut()>);

210+ }) as Box<dyn FnMut()>);

206 window2

211 window2

207 .request_animation_frame(f.as_ref().unchecked_ref::<js_sys::Function>())

212 .request_animation_frame(f.as_ref().unchecked_ref::<js_sys::Function>())

208 .unwrap_throw();

213 .unwrap_throw();

examples/hello-world/Cargo.toml+3−3

@@ -11,11 +11,11 @@ crate-type = ["cdylib"]

12[dependencies]

13dodrio = { path = "../.." }

14−wasm-bindgen = "0.2.40"

14+wasm-bindgen = "0.2.55"

15console_error_panic_hook = "0.1.6"

17[dependencies.web-sys]

18−version = "0.3.17"

18+version = "0.3.32"

19features = [

20 "Document",

21 "HtmlElement",

@@ -24,4 +24,4 @@ features = [

24]

26[dev-dependencies]

27−wasm-bindgen-test = "0.2.40"

27+wasm-bindgen-test = "0.3.5"

examples/hello-world/src/lib.rs+2−2

@@ -10,8 +10,8 @@ struct Hello {

11// The `Render` implementation describes how to render a `Hello` component into

12// HTML.

13−impl Render for Hello {

13+impl<'a> Render<'a> for Hello {

14− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

14+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

15 let msg = bumpalo::format!(in cx.bump, "Hello, {}!", self.who);

16 let msg = msg.into_bump_str();

17 p(&cx).children([text(msg)]).finish()

examples/input-form/Cargo.toml+3−3

@@ -11,11 +11,11 @@ crate-type = ["cdylib"]

12[dependencies]

13dodrio = { path = "../.." }

14−wasm-bindgen = "0.2.40"

14+wasm-bindgen = "0.2.55"

15console_error_panic_hook = "0.1.6"

17[dependencies.web-sys]

18−version = "0.3.17"

18+version = "0.3.32"

19features = [

20 "console",

21 "Document",

@@ -29,4 +29,4 @@ features = [

29]

31[dev-dependencies]

32−wasm-bindgen-test = "0.2.40"

32+wasm-bindgen-test = "0.3.5"

examples/input-form/src/lib.rs+2−2

@@ -23,8 +23,8 @@ impl SayHelloTo {

24// The `Render` implementation has a text `<input>` and a `<div>` that shows a

25// greeting to the `<input>`'s value.

26−impl Render for SayHelloTo {

26+impl<'a> Render<'a> for SayHelloTo {

27− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

27+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

28 use dodrio::builder::*;

30 div(&cx)

examples/js-component/Cargo.toml+3−3

@@ -12,12 +12,12 @@ crate-type = ["cdylib"]

12[dependencies]

13dodrio = { path = "../.." }

14dodrio-js-api = { path = "../../crates/js-api" }

15−wasm-bindgen = "0.2.40"

15+wasm-bindgen = "0.2.55"

16console_error_panic_hook = "0.1.6"

17−js-sys = "0.3.17"

17+js-sys = "0.3.32"

19[dependencies.web-sys]

20−version = "0.3.17"

20+version = "0.3.32"

21features = [

22 "Document",

23 "HtmlElement",

examples/js-component/src/lib.rs+3−3

@@ -31,8 +31,8 @@ impl GreetingViaJs {

32/// Here's the `Render` implementation! This adds a `<p>` element and some text

33/// around whatever the inner JS `Greeting` component renders.

34−impl Render for GreetingViaJs {

34+impl<'a> Render<'a> for GreetingViaJs {

35− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

35+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

36 use dodrio::builder::*;

37 p(&cx)

38 .children([text("JavaScript says: "), self.js.render(cx)])

@@ -54,7 +54,7 @@ pub fn run() {

54 // Create a new `GreetingViaJs` render component.

55 let component = GreetingViaJs::new("World");

57− // Create a virtual DOM and mount it and the `Hello` render component to the

57+ // Create a virtual DOM and mount it and the `GreetingViaJs` render component to the

58 // `<body>`.

59 let vdom = Vdom::new(body.as_ref(), component);

examples/moire/Cargo.toml+8−9

@@ -8,20 +8,19 @@ edition = "2018"

8crate-type = ["cdylib"]

10[dependencies]

11−cfg-if = "0.1.7"

11+cfg-if = "0.1.10"

12dodrio = { path = "../.." }

13−futures = "0.1.26"

14−log = "0.4.6"

13+log = "0.4.11"

15−wasm-bindgen = "0.2.40"

14+wasm-bindgen = "0.2.55"

16−wasm-bindgen-futures = "0.3.17"

15+wasm-bindgen-futures = "0.4.5"

18# Optional dependencies for logging.

17# Optional dependencies for logging.

19console_error_panic_hook = { optional = true, version = "0.1.6" }

18console_error_panic_hook = { optional = true, version = "0.1.6" }

20−console_log = { optional = true, version = "0.1.2" }

19+console_log = { optional = true, version = "0.2.0" }

21−js-sys = "0.3.17"

20+js-sys = "0.3.32"

23[dependencies.web-sys]

22[dependencies.web-sys]

24−version = "0.3.17"

23+version = "0.3.32"

25features = [

24features = [

26 "Document",

25 "Document",

27 "Element",

26 "Element",

@@ -35,7 +34,7 @@ features = [

35]

34]

37[dev-dependencies]

36[dev-dependencies]

38−wasm-bindgen-test = "0.2.40"

37+wasm-bindgen-test = "0.3.5"

40[features]

39[features]

41logging = [

40logging = [

examples/moire/src/lib.rs+6−7

@@ -5,8 +5,7 @@ use dodrio::{bumpalo, Node, Render, RenderContext, Vdom};

5use std::cell::RefCell;

6use std::rc::Rc;

7use std::str;

8−use wasm_bindgen::prelude::*;

8+use wasm_bindgen::{prelude::*, JsCast};

9−use wasm_bindgen::JsCast;

11/// This is the main function that is automatically invoked when the wasm module

10/// This is the main function that is automatically invoked when the wasm module

12/// is loaded.

11/// is loaded.

@@ -23,12 +22,12 @@ pub fn run() {

23 // Create a new `Moire` render component.

22 // Create a new `Moire` render component.

24 let component = Moire::new();

23 let component = Moire::new();

26− // Create a virtual DOM and mount it and the `Hello` render component to the

25+ // Create a virtual DOM and mount it and the `Moire` render component to the

27 // scene.

26 // scene.

28 let vdom = Vdom::new(&scene, component);

27 let vdom = Vdom::new(&scene, component);

30 // Kick off a loop that keeps re-rendering on every animation frame.

29 // Kick off a loop that keeps re-rendering on every animation frame.

31− let rc: Rc<RefCell<Option<Closure<FnMut()>>>> = Rc::new(RefCell::new(None));

30+ let rc = <Rc<RefCell<Option<Closure<dyn FnMut()>>>>>::default();

32 let rc2 = rc.clone();

31 let rc2 = rc.clone();

33 let window2 = window.clone();

32 let window2 = window.clone();

34 let weak = vdom.weak();

33 let weak = vdom.weak();

@@ -43,7 +42,7 @@ pub fn run() {

43 .unchecked_ref::<js_sys::Function>(),

42 .unchecked_ref::<js_sys::Function>(),

44 )

43 )

45 .unwrap_throw();

44 .unwrap_throw();

46− }) as Box<FnMut()>);

45+ }) as Box<dyn FnMut()>);

47 window2

46 window2

48 .request_animation_frame(f.as_ref().unchecked_ref::<js_sys::Function>())

47 .request_animation_frame(f.as_ref().unchecked_ref::<js_sys::Function>())

49 .unwrap_throw();

48 .unwrap_throw();

@@ -105,8 +104,8 @@ impl Moire {

105 }

104 }

106}

105}

107

106

108−impl Render for Moire {

107+impl<'a> Render<'a> for Moire {

109− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

108+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

110 use dodrio::builder::*;

109 use dodrio::builder::*;

111

110

112 let elapsed = web_sys::window()

111 let elapsed = web_sys::window()

examples/sierpinski-triangle/Cargo.toml+5−6

@@ -9,14 +9,13 @@ crate-type = ["cdylib"]

10[dependencies]

11dodrio = { path = "../.." }

12−wasm-bindgen = "0.2.40"

12+wasm-bindgen = "0.2.55"

13console_error_panic_hook = "0.1.6"

14−js-sys = "0.3.17"

14+js-sys = "0.3.32"

15−wasm-bindgen-futures = "0.3.17"

15+wasm-bindgen-futures = "0.4.5"

16−futures = "0.1.26"

18[dependencies.web-sys]

17[dependencies.web-sys]

19−version = "0.3.17"

18+version = "0.3.32"

20features = [

19features = [

21 "Document",

20 "Document",

22 "HtmlElement",

21 "HtmlElement",

@@ -26,4 +25,4 @@ features = [

26]

25]

28[dev-dependencies]

27[dev-dependencies]

29−wasm-bindgen-test = "0.2.40"

28+wasm-bindgen-test = "0.3.5"

examples/sierpinski-triangle/README.mdmode 100644 → 100755+1−1

@@ -20,5 +20,5 @@ wasm-pack build --target web

20Use any HTTP server, for example:

22```

23−python -m http.server

23+python -m SimpleHTTPServer

24```

examples/sierpinski-triangle/src/lib.rs+5−6

@@ -1,8 +1,7 @@

1use dodrio::{bumpalo, Node, Render, RenderContext, Vdom};

2use std::cell::RefCell;

3use std::rc::Rc;

4−use wasm_bindgen::prelude::*;

4+use wasm_bindgen::{prelude::*, JsCast};

5−use wasm_bindgen::JsCast;

6use web_sys::Window;

5use web_sys::Window;

8// Triangle container defining target size.

7// Triangle container defining target size.

@@ -86,8 +85,8 @@ impl Container {

86 }

85 }

87}

86}

89−impl Render for Container {

88+impl<'a> Render<'a> for Container {

90− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

89+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

91 use dodrio::builder::div;

90 use dodrio::builder::div;

93 let elapsed = web_sys::window()

92 let elapsed = web_sys::window()

@@ -112,7 +111,7 @@ impl Render for Container {

112

111

113// Kick off a loop that keeps re-rendering on every animation frame.

112// Kick off a loop that keeps re-rendering on every animation frame.

114fn animate(window: Window, vdom: Vdom) {

113fn animate(window: Window, vdom: Vdom) {

115− let rc: Rc<RefCell<Option<Closure<FnMut()>>>> = Rc::new(RefCell::new(None));

114+ let rc = <Rc<RefCell<Option<Closure<dyn FnMut()>>>>>::default();

116 let rc2 = rc.clone();

115 let rc2 = rc.clone();

117 let window2 = window.clone();

116 let window2 = window.clone();

118 let weak = vdom.weak();

117 let weak = vdom.weak();

@@ -127,7 +126,7 @@ fn animate(window: Window, vdom: Vdom) {

127 .unchecked_ref::<js_sys::Function>(),

126 .unchecked_ref::<js_sys::Function>(),

128 )

127 )

129 .unwrap_throw();

128 .unwrap_throw();

130− }) as Box<FnMut()>);

129+ }) as Box<dyn FnMut()>);

131 window2

130 window2

132 .request_animation_frame(f.as_ref().unchecked_ref::<js_sys::Function>())

131 .request_animation_frame(f.as_ref().unchecked_ref::<js_sys::Function>())

133 .unwrap_throw();

132 .unwrap_throw();

examples/todomvc/Cargo.toml+11−12

@@ -5,22 +5,21 @@ name = "dodrio-todomvc"

5version = "0.1.0"

7[dependencies]

8−cfg-if = "0.1.7"

8+cfg-if = "0.1.10"

9−dodrio = { path = "../.." }

9+dodrio = { path = "../..", features = ["serde"] }

10−futures = "0.1.26"

11−js-sys = "0.3.17"

10+js-sys = "0.3.32"

12−serde = { features = ["derive"], version = "1.0.90" }

11+serde = { features = ["derive"], version = "1.0.114" }

13−serde_json = "1.0.39"

12+serde_json = "1.0.57"

14−wasm-bindgen = "0.2.40"

13+wasm-bindgen = "0.2.55"

15−wasm-bindgen-futures = "0.3.17"

14+wasm-bindgen-futures = "0.4.5"

17# Optional dependencies for logging.

16# Optional dependencies for logging.

18console_error_panic_hook = { optional = true, version = "0.1.6" }

17console_error_panic_hook = { optional = true, version = "0.1.6" }

19−console_log = { optional = true, version = "0.1.2" }

18+console_log = { optional = true, version = "0.2.0" }

20−log = { optional = true, version = "0.4.6" }

19+log = { optional = true, version = "0.4.11" }

22[dependencies.web-sys]

21[dependencies.web-sys]

23−version = "0.3.17"

22+version = "0.3.32"

24features = [

23features = [

25 "Document",

24 "Document",

26 "Event",

25 "Event",

@@ -35,7 +34,7 @@ features = [

35]

34]

37[dev-dependencies]

36[dev-dependencies]

38−wasm-bindgen-test = "0.2.40"

37+wasm-bindgen-test = "0.3.5"

40[features]

39[features]

41logging = [

40logging = [

examples/todomvc/src/router.rsmode 100644 → 100755+23−21

@@ -4,10 +4,8 @@ use crate::todos::Todos;

4use crate::utils;

5use crate::visibility::Visibility;

6use dodrio::VdomWeak;

7−use futures::prelude::*;

8use std::str::FromStr;

7use std::str::FromStr;

9−use wasm_bindgen::prelude::*;

8+use wasm_bindgen::{prelude::*, JsCast};

10−use wasm_bindgen::JsCast;

12/// Start the router.

10/// Start the router.

13pub fn start(vdom: VdomWeak) {

11pub fn start(vdom: VdomWeak) {

@@ -30,23 +28,27 @@ pub fn start(vdom: VdomWeak) {

30 v

28 v

31 });

29 });

33− wasm_bindgen_futures::spawn_local(

31+ wasm_bindgen_futures::spawn_local({

32+ let vdom = vdom.clone();

33+ async move {

34+ let _ = vdom

34− vdom.with_component({

35+ .with_component({

35− let vdom = vdom.clone();

36+ let vdom = vdom.clone();

36− move |root| {

37+ move |root| {

37− let todos = root.unwrap_mut::<Todos>();

38+ let todos = root.unwrap_mut::<Todos>();

38− // If the todos' visibility already matches the event's

39+ // If the todos' visibility already matches the event's

39− // visibility, then there is nothing to do (ha). If they

40+ // visibility, then there is nothing to do (ha). If they

40− // don't match, then we need to update the todos' visibility

41+ // don't match, then we need to update the todos' visibility

41− // and re-render.

42+ // and re-render.

42− if todos.visibility() != new_vis {

43+ if todos.visibility() != new_vis {

43− todos.set_visibility(new_vis);

44+ todos.set_visibility(new_vis);

44− vdom.schedule_render();

45+ vdom.schedule_render();

45− }

46+ }

46− }

47+ }

47− })

48+ })

48− .map_err(|_| ()),

49+ .await;

50+ }

49− );

51+ });

50 };

52 };

52 // Call it once to handle the initial `#` fragment.

54 // Call it once to handle the initial `#` fragment.

@@ -57,7 +59,7 @@ pub fn start(vdom: VdomWeak) {

57 // Note that if we ever intended to unmount our todos app, we would want to

59 // Note that if we ever intended to unmount our todos app, we would want to

58 // provide a method for removing this router's event listener and cleaning

60 // provide a method for removing this router's event listener and cleaning

59 // up after ourselves.

61 // up after ourselves.

60− let on_hash_change = Closure::wrap(Box::new(on_hash_change) as Box<FnMut()>);

62+ let on_hash_change = Closure::wrap(Box::new(on_hash_change) as Box<dyn FnMut()>);

61 let window = utils::window();

63 let window = utils::window();

62 window

64 window

63 .add_event_listener_with_callback("hashchange", on_hash_change.as_ref().unchecked_ref())

65 .add_event_listener_with_callback("hashchange", on_hash_change.as_ref().unchecked_ref())

examples/todomvc/src/todo.rs+77−21

@@ -1,14 +1,19 @@

1//! Type definition and `dodrio::Render` implementation for a single todo item.

3use crate::keys;

4−use dodrio::{Node, Render, RenderContext, RootRender, VdomWeak};

4+use dodrio::{Cached, Node, Render, RenderContext, RootRender, VdomWeak};

5use serde::{Deserialize, Serialize};

6use std::marker::PhantomData;

7use wasm_bindgen::{prelude::*, JsCast};

9/// A single todo item.

10−#[derive(Serialize, Deserialize)]

10+#[derive(Default)]

11pub struct Todo<C> {

12+ inner: Cached<TodoInner<C>>,

13+}

14+

15+#[derive(Serialize, Deserialize)]

16+struct TodoInner<C> {

12 id: usize,

17 id: usize,

13 title: String,

18 title: String,

14 completed: bool,

19 completed: bool,

@@ -48,68 +53,87 @@ impl<C> Todo<C> {

48 let completed = false;

53 let completed = false;

49 let edits = None;

54 let edits = None;

50 Todo {

55 Todo {

56+ inner: Cached::new(TodoInner {

51− id,

57+ id,

52− title,

58+ title,

53− completed,

59+ completed,

54− edits,

60+ edits,

55− _controller: PhantomData,

61+ _controller: PhantomData,

62+ }),

56 }

63 }

57 }

64 }

59 /// Set this todo item's id.

66 /// Set this todo item's id.

60 pub fn set_id(&mut self, id: usize) {

67 pub fn set_id(&mut self, id: usize) {

68+ if id != self.inner.id {

69+ Cached::invalidate(&self.inner);

70+ }

61− self.id = id;

71+ self.inner.id = id;

62 }

72 }

64 /// Is this `Todo` complete?

74 /// Is this `Todo` complete?

65 pub fn is_complete(&self) -> bool {

75 pub fn is_complete(&self) -> bool {

66− self.completed

76+ self.inner.completed

67 }

77 }

69 /// Mark the `Todo` as complete or not.

79 /// Mark the `Todo` as complete or not.

70 pub fn set_complete(&mut self, to: bool) {

80 pub fn set_complete(&mut self, to: bool) {

81+ if to != self.inner.completed {

82+ Cached::invalidate(&self.inner);

83+ }

71− self.completed = to;

84+ self.inner.completed = to;

72 }

85 }

74 /// Get this todo's title.

87 /// Get this todo's title.

75 pub fn title(&self) -> &str {

88 pub fn title(&self) -> &str {

76− &self.title

89+ &self.inner.title

77 }

90 }

79 /// Set this todo item's title.

92 /// Set this todo item's title.

80 pub fn set_title<S: Into<String>>(&mut self, title: S) {

93 pub fn set_title<S: Into<String>>(&mut self, title: S) {

81− self.title = title.into();

94+ let title = title.into();

95+ if title != self.inner.title {

96+ Cached::invalidate(&self.inner);

97+ }

98+ self.inner.title = title;

82 }

99 }

100

84 /// Set the edits for this todo.

101 /// Set the edits for this todo.

85 pub fn set_edits<S: Into<String>>(&mut self, edits: Option<S>) {

102 pub fn set_edits<S: Into<String>>(&mut self, edits: Option<S>) {

86− self.edits = edits.map(Into::into);

103+ let edits = edits.map(Into::into);

104+ if edits != self.inner.edits {

105+ Cached::invalidate(&self.inner);

106+ }

107+ self.inner.edits = edits;

87 }

108 }

109

89 /// Take this todo's edits, leaving `None` in their place.

110 /// Take this todo's edits, leaving `None` in their place.

90 pub fn take_edits(&mut self) -> Option<String> {

111 pub fn take_edits(&mut self) -> Option<String> {

112+ if self.inner.edits.is_some() {

113+ Cached::invalidate(&self.inner);

114+ }

91− self.edits.take()

115+ self.inner.edits.take()

92 }

116 }

93}

117}

118

95−impl<C: TodoActions> Render for Todo<C> {

119+impl<'a, C: TodoActions> Render<'a> for Todo<C> {

96− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

120+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

97 use dodrio::{

121 use dodrio::{

98 builder::*,

122 builder::*,

99 bumpalo::{self, collections::String},

123 bumpalo::{self, collections::String},

100 };

124 };

101

125

102− let id = self.id;

126+ let id = self.inner.id;

103− let title = self.edits.as_ref().unwrap_or(&self.title);

127+ let title = self.inner.edits.as_ref().unwrap_or(&self.inner.title);

104 let title = bumpalo::format!(in cx.bump, "{}", title).into_bump_str();

128 let title = bumpalo::format!(in cx.bump, "{}", title).into_bump_str();

105

129

106 li(&cx)

130 li(&cx)

107 .attr("class", {

131 .attr("class", {

108 let mut class = String::new_in(cx.bump);

132 let mut class = String::new_in(cx.bump);

109− if self.completed {

133+ if self.inner.completed {

110 class.push_str("completed ");

134 class.push_str("completed ");

111 }

135 }

112− if self.edits.is_some() {

136+ if self.inner.edits.is_some() {

113 class.push_str("editing");

137 class.push_str("editing");

114 }

138 }

115 class.into_bump_str()

139 class.into_bump_str()

@@ -121,7 +145,7 @@ impl<C: TodoActions> Render for Todo<C> {

121 input(&cx)

145 input(&cx)

122 .attr("class", "toggle")

146 .attr("class", "toggle")

123 .attr("type", "checkbox")

147 .attr("type", "checkbox")

124− .bool_attr("checked", self.completed)

148+ .bool_attr("checked", self.inner.completed)

125 .on("click", move |root, vdom, _event| {

149 .on("click", move |root, vdom, _event| {

126 C::toggle_completed(root, vdom, id);

150 C::toggle_completed(root, vdom, id);

127 })

151 })

@@ -171,3 +195,35 @@ impl<C: TodoActions> Render for Todo<C> {

171 .finish()

195 .finish()

172 }

196 }

173}

197}

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 100644 → 100755+5−6

@@ -9,8 +9,7 @@ use dodrio::{bumpalo, Node, Render, RenderContext, RootRender, VdomWeak};

9use serde::{Deserialize, Serialize};

10use std::marker::PhantomData;

11use std::mem;

12−use wasm_bindgen::prelude::*;

12+use wasm_bindgen::{prelude::*, JsCast};

13−use wasm_bindgen::JsCast;

15/// A collection of todos.

14/// A collection of todos.

16#[derive(Default, Serialize, Deserialize)]

15#[derive(Default, Serialize, Deserialize)]

@@ -29,7 +28,7 @@ pub struct Todos<C = Controller> {

29}

28}

31/// Actions for `Todos` that can be triggered by UI interactions.

30/// Actions for `Todos` that can be triggered by UI interactions.

32−pub trait TodosActions: TodoActions {

31+pub trait TodosActions: 'static + TodoActions {

33 /// Toggle the completion state of all todo items.

32 /// Toggle the completion state of all todo items.

34 fn toggle_all(root: &mut dyn RootRender, vdom: VdomWeak);

33 fn toggle_all(root: &mut dyn RootRender, vdom: VdomWeak);

@@ -50,7 +49,7 @@ pub trait TodosActions: TodoActions {

50impl<C> Todos<C> {

49impl<C> Todos<C> {

51 /// Construct a new todos set.

50 /// Construct a new todos set.

52 ///

51 ///

53− /// If an existing set is available in local storage, then us that,

52+ /// If an existing set is available in local storage, then use that,

54 /// otherwise create a new set.

53 /// otherwise create a new set.

55 pub fn new() -> Self

54 pub fn new() -> Self

56 where

55 where

@@ -290,8 +289,8 @@ impl<C: TodosActions> Todos<C> {

290 }

289 }

291}

290}

292

291

293−impl<C: TodosActions> Render for Todos<C> {

292+impl<'a, C: TodosActions> Render<'a> for Todos<C> {

294− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

293+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

295 use dodrio::builder::*;

294 use dodrio::builder::*;

296

295

297 div(&cx)

296 div(&cx)

js/change-list-interpreter.js+52−7

@@ -86,15 +86,23 @@ const OP_TABLE = [

86 },

88 // 5

89− function pushFirstChild(interpreter, mem8, mem32, i) {

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];

90− interpreter.stack.push(top(interpreter.stack).firstChild);

94+ interpreter.stack.push(child);

91 return i;

95 return i;

92 },

96 },

94 // 6

98 // 6

95− function popPushNextSibling(interpreter, mem8, mem32, i) {

99+ function popPushChild(interpreter, mem8, mem32, i) {

100+ const n = mem32[i++];

96− const node = interpreter.stack.pop();

101+ interpreter.stack.pop();

102+ const parent = top(interpreter.stack);

103+ const children = parent.childNodes;

104+ const child = children[n];

97− interpreter.stack.push(node.nextSibling);

105+ interpreter.stack.push(child);

98 return i;

106 return i;

99 },

107 },

100

108

@@ -226,9 +234,12 @@ const OP_TABLE = [

226 },

234 },

227

235

228 // 21

236 // 21

229− function pushLastChild(interpreter, mem8, mem32, i) {

237+ function popPushReverseChild(interpreter, mem8, mem32, i) {

238+ const n = mem32[i++];

239+ interpreter.stack.pop();

230 const parent = top(interpreter.stack);

240 const parent = top(interpreter.stack);

231− const child = parent.lastChild;

241+ const children = parent.childNodes;

242+ const child = children[children.length - n - 1];

232 interpreter.stack.push(child);

243 interpreter.stack.push(child);

233 return i;

244 return i;

234 },

245 },

@@ -240,6 +251,30 @@ const OP_TABLE = [

240 const child = parent.childNodes[n];

251 const child = parent.childNodes[n];

241 child.remove();

252 child.remove();

242 return i;

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;

243 }

278 }

244];

279];

245

280

@@ -251,6 +286,7 @@ export class ChangeListInterpreter {

251 this.stack = [];

286 this.stack = [];

252 this.strings = new Map();

287 this.strings = new Map();

253 this.temporaries = [];

288 this.temporaries = [];

289+ this.templates = new Map();

254 }

290 }

255

291

256 unmount() {

292 unmount() {

@@ -264,6 +300,7 @@ export class ChangeListInterpreter {

264 this.stack = null;

300 this.stack = null;

265 this.strings = null;

301 this.strings = null;

266 this.temporaries = null;

302 this.temporaries = null;

303+ this.templates = null;

267 }

304 }

268

305

269 addChangeListRange(start, len) {

306 addChangeListRange(start, len) {

@@ -311,6 +348,14 @@ export class ChangeListInterpreter {

311 return this.strings.get(id);

348 return this.strings.get(id);

312 }

349 }

313

350

351+ saveTemplate(id, template) {

352+ this.templates.set(id, template);

353+ }

354+

355+ getTemplate(id) {

356+ return this.templates.get(id);

357+ }

358+

314 initEventsTrampoline(trampoline) {

359 initEventsTrampoline(trampoline) {

315 this.trampoline = trampoline;

360 this.trampoline = trampoline;

316 trampoline.mounted = true;

361 trampoline.mounted = true;

js/strace.jsnew file+80

@@ -0,0 +1,80 @@

1+export function initStrace() {

2+ instrumentAll(Element.prototype);

3+ instrumentAll(Document.prototype);

4+ instrumentAll(Node.prototype);

5+ instrumentAll(EventTarget.prototype);

6+}

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+16−3

@@ -282,13 +282,22 @@ where

282 /// ```

283 #[inline]

284 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+

285 Node::element(

294 Node::element(

286 self.bump,

295 self.bump,

287 self.key,

296 self.key,

288 self.tag_name,

297 self.tag_name,

289− self.listeners,

298+ listeners,

290− self.attributes,

299+ attributes,

291− self.children,

300+ children,

292 self.namespace,

301 self.namespace,

293 )

302 )

294 }

303 }

@@ -1001,6 +1010,10 @@ builder_constructors! {

1001 /// [`<rect>`](https://developer.mozilla.org/en-US/docs/Web/SVG/Element/rect)

1010 /// [`<rect>`](https://developer.mozilla.org/en-US/docs/Web/SVG/Element/rect)

1002 /// element.

1011 /// element.

1003 rect <> "http://www.w3.org/2000/svg";

1012 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";

1004}

1017}

1005

1018

1006/// Construct a text node.

1019/// Construct a text node.

src/cached.rs+75−13

@@ -3,18 +3,36 @@ use crate::{

3 node::{CachedNode, NodeKey},

4 Node, Render, RenderContext,

5};

6+use std::any::TypeId;

6use std::cell::Cell;

7use std::cell::Cell;

7use std::ops::{Deref, DerefMut};

8use std::ops::{Deref, DerefMut};

9/// A renderable that supports caching for when rendering is expensive but can

10/// A renderable that supports caching for when rendering is expensive but can

10/// generate the same DOM tree.

11/// 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.

11−#[derive(Clone, Debug)]

18+#[derive(Clone, Debug, Default)]

12−pub struct Cached<R> {

19+pub struct Cached<R>

20+where

21+ R: Default,

22+{

13 inner: R,

23 inner: R,

14 cached: Cell<Option<CachedNode>>,

24 cached: Cell<Option<CachedNode>>,

15}

25}

27+pub_unstable_internal! {

28+ #[derive(Clone, Copy, PartialEq, Eq, Debug, Hash)]

29+ pub(crate) struct TemplateId(TypeId);

30+}

31+

17−impl<R> Cached<R> {

32+impl<R> Cached<R>

33+where

34+ R: Default,

35+{

18 /// Construct a new `Cached<R>` of an inner `R`.

36 /// Construct a new `Cached<R>` of an inner `R`.

19 ///

37 ///

20 /// # Example

38 /// # Example

@@ -22,12 +40,13 @@ impl<R> Cached<R> {

22 /// ```

40 /// ```

23 /// use dodrio::{Cached, Node, Render, RenderContext};

41 /// use dodrio::{Cached, Node, Render, RenderContext};

24 ///

42 ///

43+ /// #[derive(Default)]

25 /// pub struct Counter {

44 /// pub struct Counter {

26 /// count: u32,

45 /// count: u32,

27 /// }

46 /// }

28 ///

47 ///

29− /// impl Render for Counter {

48+ /// impl<'a> Render<'a> for Counter {

30− /// fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

49+ /// fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

31 /// // ...

50 /// // ...

32 /// # unimplemented!()

51 /// # unimplemented!()

33 /// }

52 /// }

@@ -61,12 +80,13 @@ impl<R> Cached<R> {

61 /// use dodrio::{bumpalo, Cached, Node, Render, RenderContext};

80 /// use dodrio::{bumpalo, Cached, Node, Render, RenderContext};

62 ///

81 ///

63 /// /// A component that renders to "<p>Hello, {who}!</p>"

82 /// /// A component that renders to "<p>Hello, {who}!</p>"

83+ /// #[derive(Default)]

64 /// pub struct Hello {

84 /// pub struct Hello {

65 /// who: String

85 /// who: String

66 /// }

86 /// }

67 ///

87 ///

68− /// impl Render for Hello {

88+ /// impl<'a> Render<'a> for Hello {

69− /// fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

89+ /// fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

70 /// use dodrio::builder::*;

90 /// use dodrio::builder::*;

71 /// let greeting = bumpalo::format!(in cx.bump, "Hello, {}!", self.who);

91 /// let greeting = bumpalo::format!(in cx.bump, "Hello, {}!", self.who);

72 /// p(&cx)

92 /// p(&cx)

@@ -94,7 +114,19 @@ impl<R> Cached<R> {

94 }

114 }

95}

115}

116

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+

97−impl<R> Deref for Cached<R> {

126+impl<R> Deref for Cached<R>

127+where

128+ R: Default,

129+{

98 type Target = R;

130 type Target = R;

131

100 fn deref(&self) -> &R {

132 fn deref(&self) -> &R {

@@ -102,17 +134,21 @@ impl<R> Deref for Cached<R> {

102 }

134 }

103}

135}

104

136

105−impl<R> DerefMut for Cached<R> {

137+impl<R> DerefMut for Cached<R>

138+where

139+ R: Default,

140+{

106 fn deref_mut(&mut self) -> &mut R {

141 fn deref_mut(&mut self) -> &mut R {

107 &mut self.inner

142 &mut self.inner

108 }

143 }

109}

144}

110

145

111−impl<R> Render for Cached<R>

146+impl<'a, R> Render<'a> for Cached<R>

112where

147where

113− R: Render,

148+ R: 'static + Default + for<'b> Render<'b>,

114{

149{

115− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

150+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

151+ let template = cx.template::<R>();

116 let cached = match self.cached.get() {

152 let cached = match self.cached.get() {

117 // This does-the-cache-contain-this-id check is necessary because

153 // This does-the-cache-contain-this-id check is necessary because

118 // the same `Cached<R>` instance can be rendered into vdom A, which

154 // the same `Cached<R>` instance can be rendered into vdom A, which

@@ -151,7 +187,7 @@ where

151 }

187 }

152 _ => {

188 _ => {

153 let mut key = NodeKey::NONE;

189 let mut key = NodeKey::NONE;

154− let id = CachedSet::insert(cx, |nested_cx| {

190+ let id = CachedSet::insert(cx, false, template, |nested_cx| {

155 let node = self.inner.render(nested_cx);

191 let node = self.inner.render(nested_cx);

156 key = node.key();

192 key = node.key();

157 node

193 node

@@ -165,3 +201,29 @@ where

165 cached.into()

201 cached.into()

166 }

202 }

167}

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)

228+ }

229+}

src/cached_set.rs+58−26

@@ -35,6 +35,28 @@ pub(crate) struct CacheEntry {

35 // once, we don't have to repeat the tracing every time we want to garbage

36 // collect cache entries.

37 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+ }

38}

60}

40impl CachedSet {

62impl CachedSet {

@@ -62,7 +84,7 @@ impl CachedSet {

62 }

84 }

64 self.items.retain(|id, entry| {

86 self.items.retain(|id, entry| {

65− let keep = marked.contains(id);

87+ let keep = entry.pinned || marked.contains(id);

66 if !keep {

88 if !keep {

67 let node: &Node = unsafe { &*entry.node };

89 let node: &Node = unsafe { &*entry.node };

68 registry.remove_subtree(node);

90 registry.remove_subtree(node);

@@ -108,21 +130,38 @@ impl CachedSet {

108 CacheId(next.expect_throw("ID_COUNTER overflowed"))

130 CacheId(next.expect_throw("ID_COUNTER overflowed"))

109 }

131 }

110

132

133+ pub(crate) fn insert<F>(

111− pub(crate) fn insert<F>(cx: &mut RenderContext, f: F) -> CacheId

134+ cx: &mut RenderContext,

135+ pinned: bool,

136+ template: Option<CacheId>,

137+ f: F,

138+ ) -> CacheId

112 where

139 where

113 F: for<'a> FnOnce(&mut RenderContext<'a>) -> Node<'a>,

140 F: for<'a> FnOnce(&mut RenderContext<'a>) -> Node<'a>,

114 {

141 {

115− let bump = Bump::new();

116 let set = cx.cached_set;

142 let set = cx.cached_set;

143+ let bump = Bump::new();

144+ let (node, edges) = {

117− let mut nested_cx = RenderContext::new(&bump, set);

145+ let mut nested_cx = RenderContext::new(&bump, cx.cached_set, cx.templates);

118− let node = f(&mut nested_cx);

146+ let node = f(&mut nested_cx);

119− let node = bump.alloc(node);

147+ let node = bump.alloc(node);

120− let edges = {

148+ let edges = {

121− let set = set.borrow();

149+ let set = set.borrow();

122− set.trace(node)

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,

123 };

164 };

124− let node = node as *mut Node<'_> as usize as *const Node<'static>;

125− let entry = CacheEntry { bump, node, edges };

126

165

127 let mut set = set.borrow_mut();

166 let mut set = set.borrow_mut();

128 let id = set.next_id();

167 let id = set.next_id();

@@ -135,20 +174,13 @@ impl CachedSet {

135 self.items.contains_key(&id)

174 self.items.contains_key(&id)

136 }

175 }

137

176

138− /// Get the node for the given cache id.

177+ /// Get the cached node and its template (if any) for the given cache id.

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

178+ pub fn get(&self, id: CacheId) -> (&Node, Option<CacheId>) {

140− loop {

141− let entry = self

179+ let entry = self

142− .items

180+ .items

143− .get(&id)

181+ .get(&id)

144− .expect_throw("CachedSet::get: should have id in set");

182+ .expect_throw("CachedSet::get: should have id in set");

145− let node: &Node = unsafe { &*entry.node };

183+ let node: &Node = unsafe { &*entry.node };

146− if let NodeKind::Cached(ref c) = node.kind {

184+ (node, entry.template)

147− id = c.id;

148− continue;

149− } else {

150− return node;

151− }

152− }

153 }

185 }

154}

186}

src/change_list/emitter.rsmode 100644 → 100755+40−8

@@ -30,6 +30,7 @@ impl InstructionEmitter {

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))]

33 pub fn each_instruction_sequence<F>(&mut self, f: F)

34 pub fn each_instruction_sequence<F>(&mut self, f: F)

34 where

35 where

35 F: FnMut(&[u8]),

36 F: FnMut(&[u8]),

@@ -114,16 +115,21 @@ define_change_list_instructions! {

114 /// Stack: `[... Node] -> [... Node Node]`

115 /// Stack: `[... Node] -> [... Node Node]`

115 ///

116 ///

116 /// ```text

117 /// ```text

117− /// stack.push(stack.top().firstChild)

118+ /// parent = stack.top()

119+ /// child = parent.childNodes[parent.childNodes.length - n - 1]

120+ /// stack.push(child)

118 /// ```

121 /// ```

119− push_first_child() = 5,

122+ push_reverse_child(n) = 5,

120

123

121− /// Stack: `[... Node] -> [... Node]`

124+ /// Stack: `[... Node Node] -> [... Node Node]`

122 ///

125 ///

123 /// ```text

126 /// ```text

124− /// stack.push(stack.pop().nextSibling)

127+ /// stack.pop();

128+ /// parent = stack.top();

129+ /// child = parent.childNodes[n]

130+ /// stack.push(child)

125 /// ```

131 /// ```

126− pop_push_next_sibling() = 6,

132+ pop_push_child(n) = 6,

127

133

128 /// Stack: `[... T] -> [...]`

134 /// Stack: `[... T] -> [...]`

129 ///

135 ///

@@ -240,14 +246,15 @@ define_change_list_instructions! {

240 /// ```

246 /// ```

241 insert_before() = 20,

247 insert_before() = 20,

242

248

243− /// Stack: `[... Node] -> [... Node Node]`

249+ /// Stack: `[... Node Node] -> [... Node Node]`

244 ///

250 ///

245 /// ```text

251 /// ```text

252+ /// stack.pop()

246 /// parent = stack.top()

253 /// parent = stack.top()

247− /// child = parent.lastChild

254+ /// child = parent.childNodes[parent.childNodes.length - n - 1]

248 /// stack.push(child)

255 /// stack.push(child)

249 /// ```

256 /// ```

250− push_last_child() = 21,

257+ pop_push_reverse_child(n) = 21,

251

258

252 /// Stack: `[... Node] -> [... Node]`

259 /// Stack: `[... Node] -> [... Node]`

253 ///

260 ///

@@ -257,4 +264,29 @@ define_change_list_instructions! {

257 /// child.remove()

264 /// child.remove()

258 /// ```

265 /// ```

259 remove_child(n) = 22,

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,

260}

292}

src/change_list/mod.rs+153−33

@@ -1,23 +1,29 @@

1pub(crate) mod emitter;

2pub(crate) mod strings;

3+pub(crate) mod traversal;

4// Note: has to be `pub` because of `wasm-bindgen` visibility restrictions.

5// Note: has to be `pub` because of `wasm-bindgen` visibility restrictions.

5pub mod js;

6pub mod js;

7use self::emitter::InstructionEmitter;

8use self::emitter::InstructionEmitter;

8use self::strings::{StringKey, StringsCache};

9use self::strings::{StringKey, StringsCache};

10+use self::traversal::{MoveTo, Traversal};

9−use crate::Listener;

11+use crate::{cached_set::CacheId, Listener};

12+use fxhash::FxHashSet;

11#[derive(Debug)]

14#[derive(Debug)]

12pub(crate) struct ChangeListPersistentState {

15pub(crate) struct ChangeListPersistentState {

13 strings: StringsCache,

16 strings: StringsCache,

14 emitter: InstructionEmitter,

17 emitter: InstructionEmitter,

18+ traversal: Traversal,

15 interpreter: js::ChangeListInterpreter,

19 interpreter: js::ChangeListInterpreter,

20+ templates: FxHashSet<CacheId>,

16}

21}

18pub(crate) struct ChangeListBuilder<'a> {

23pub(crate) struct ChangeListBuilder<'a> {

19 state: &'a mut ChangeListPersistentState,

24 state: &'a mut ChangeListPersistentState,

20 next_temporary: u32,

25 next_temporary: u32,

26+ forcing_new_listeners: bool,

21}

27}

23impl Drop for ChangeListPersistentState {

29impl Drop for ChangeListPersistentState {

@@ -30,11 +36,15 @@ impl ChangeListPersistentState {

30 pub(crate) fn new(container: &crate::Element) -> ChangeListPersistentState {

36 pub(crate) fn new(container: &crate::Element) -> ChangeListPersistentState {

31 let strings = StringsCache::new();

37 let strings = StringsCache::new();

32 let emitter = InstructionEmitter::new();

38 let emitter = InstructionEmitter::new();

39+ let traversal = Traversal::new();

33 let interpreter = js::ChangeListInterpreter::new(container);

40 let interpreter = js::ChangeListInterpreter::new(container);

41+ let templates = Default::default();

34 ChangeListPersistentState {

42 ChangeListPersistentState {

35 strings,

43 strings,

36 emitter,

44 emitter,

45+ traversal,

37 interpreter,

46 interpreter,

47+ templates,

38 }

48 }

39 }

49 }

@@ -46,6 +56,7 @@ impl ChangeListPersistentState {

46 ChangeListBuilder {

56 ChangeListBuilder {

47 state: self,

57 state: self,

48 next_temporary: 0,

58 next_temporary: 0,

59+ forcing_new_listeners: false,

49 }

60 }

50 }

61 }

51}

62}

@@ -59,6 +70,7 @@ cfg_if::cfg_if! {

59 // Nothing to actually apply the changes to.

70 // Nothing to actually apply the changes to.

61 self.state.emitter.reset();

72 self.state.emitter.reset();

73+ self.state.traversal.reset();

62 }

74 }

63 }

75 }

64 } else {

76 } else {

@@ -74,11 +86,85 @@ cfg_if::cfg_if! {

74 interpreter.apply_changes(wasm_bindgen::memory());

86 interpreter.apply_changes(wasm_bindgen::memory());

76 self.state.emitter.reset();

88 self.state.emitter.reset();

89+ self.state.traversal.reset();

77 }

90 }

78 }

91 }

79 }

92 }

80}

93}

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+

82impl ChangeListBuilder<'_> {

168impl ChangeListBuilder<'_> {

83 pub fn next_temporary(&self) -> u32 {

169 pub fn next_temporary(&self) -> u32 {

84 self.next_temporary

170 self.next_temporary

@@ -89,6 +175,7 @@ impl ChangeListBuilder<'_> {

89 }

175 }

176

91 pub fn save_children_to_temporaries(&mut self, start: usize, end: usize) -> u32 {

177 pub fn save_children_to_temporaries(&mut self, start: usize, end: usize) -> u32 {

178+ debug_assert!(self.traversal_is_committed());

92 debug_assert!(start < end);

179 debug_assert!(start < end);

93 let temp_base = self.next_temporary;

180 let temp_base = self.next_temporary;

94 debug!(

181 debug!(

@@ -103,26 +190,19 @@ impl ChangeListBuilder<'_> {

103 }

190 }

104

191

105 pub fn push_temporary(&self, temp: u32) {

192 pub fn push_temporary(&self, temp: u32) {

193+ debug_assert!(self.traversal_is_committed());

106 debug!("emit: push_temporary({})", temp);

194 debug!("emit: push_temporary({})", temp);

107 self.state.emitter.push_temporary(temp);

195 self.state.emitter.push_temporary(temp);

108 }

196 }

109

197

110− pub fn push_child(&self, child: usize) {

111− debug!("emit: push_child({})", child);

112− self.state.emitter.push_child(child as u32);

113− }

114−

115 pub fn remove_child(&self, child: usize) {

198 pub fn remove_child(&self, child: usize) {

199+ debug_assert!(self.traversal_is_committed());

116 debug!("emit: remove_child({})", child);

200 debug!("emit: remove_child({})", child);

117 self.state.emitter.remove_child(child as u32);

201 self.state.emitter.remove_child(child as u32);

118 }

202 }

119

203

120− pub fn push_last_child(&self) {

121− debug!("emit: push_last_child()");

122− self.state.emitter.push_last_child();

123− }

124−

125 pub fn insert_before(&self) {

204 pub fn insert_before(&self) {

205+ debug_assert!(self.traversal_is_committed());

126 debug!("emit: insert_before()");

206 debug!("emit: insert_before()");

127 self.state.emitter.insert_before();

207 self.state.emitter.insert_before();

128 }

208 }

@@ -134,6 +214,7 @@ impl ChangeListBuilder<'_> {

134 }

214 }

135

215

136 pub fn set_text(&self, text: &str) {

216 pub fn set_text(&self, text: &str) {

217+ debug_assert!(self.traversal_is_committed());

137 debug!("emit: set_text({:?})", text);

218 debug!("emit: set_text({:?})", text);

138 self.state

219 self.state

139 .emitter

220 .emitter

@@ -141,51 +222,48 @@ impl ChangeListBuilder<'_> {

141 }

222 }

142

223

143 pub fn remove_self_and_next_siblings(&self) {

224 pub fn remove_self_and_next_siblings(&self) {

225+ debug_assert!(self.traversal_is_committed());

144 debug!("emit: remove_self_and_next_siblings()");

226 debug!("emit: remove_self_and_next_siblings()");

145 self.state.emitter.remove_self_and_next_siblings();

227 self.state.emitter.remove_self_and_next_siblings();

146 }

228 }

147

229

148 pub fn replace_with(&self) {

230 pub fn replace_with(&self) {

231+ debug_assert!(self.traversal_is_committed());

149 debug!("emit: replace_with()");

232 debug!("emit: replace_with()");

150 self.state.emitter.replace_with();

233 self.state.emitter.replace_with();

151 }

234 }

152

235

153− pub fn set_attribute(&mut self, name: &str, value: &str) {

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);

154− debug!("emit: set_attribute({:?}, {:?})", name, value);

240+ debug!("emit: set_class({:?})", value);

241+ self.state.emitter.set_class(class_id.into());

242+ } else {

155− let name_id = self.ensure_string(name);

243+ let name_id = self.ensure_string(name);

156− let value_id = self.ensure_string(value);

244+ let value_id = self.ensure_string(value);

245+ debug!("emit: set_attribute({:?}, {:?})", name, value);

157− self.state

246+ self.state

158− .emitter

247+ .emitter

159− .set_attribute(name_id.into(), value_id.into());

248+ .set_attribute(name_id.into(), value_id.into());

249+ }

160 }

250 }

161

251

162 pub fn remove_attribute(&mut self, name: &str) {

252 pub fn remove_attribute(&mut self, name: &str) {

253+ debug_assert!(self.traversal_is_committed());

163 debug!("emit: remove_attribute({:?})", name);

254 debug!("emit: remove_attribute({:?})", name);

164 let name_id = self.ensure_string(name);

255 let name_id = self.ensure_string(name);

165 self.state.emitter.remove_attribute(name_id.into());

256 self.state.emitter.remove_attribute(name_id.into());

166 }

257 }

167

258

168− pub fn push_first_child(&self) {

169− debug!("emit: push_first_child");

170− self.state.emitter.push_first_child();

171− }

172−

173− pub fn pop_push_next_sibling(&self) {

174− debug!("emit: pop_push_next_sibling");

175− self.state.emitter.pop_push_next_sibling();

176− }

177−

178− pub fn pop(&self) {

179− debug!("emit: pop");

180− self.state.emitter.pop();

181− }

182−

183 pub fn append_child(&self) {

259 pub fn append_child(&self) {

260+ debug_assert!(self.traversal_is_committed());

184 debug!("emit: append_child()");

261 debug!("emit: append_child()");

185 self.state.emitter.append_child();

262 self.state.emitter.append_child();

186 }

263 }

187

264

188 pub fn create_text_node(&self, text: &str) {

265 pub fn create_text_node(&self, text: &str) {

266+ debug_assert!(self.traversal_is_committed());

189 debug!("emit: create_text_node({:?})", text);

267 debug!("emit: create_text_node({:?})", text);

190 self.state

268 self.state

191 .emitter

269 .emitter

@@ -193,12 +271,14 @@ impl ChangeListBuilder<'_> {

193 }

271 }

194

272

195 pub fn create_element(&mut self, tag_name: &str) {

273 pub fn create_element(&mut self, tag_name: &str) {

274+ debug_assert!(self.traversal_is_committed());

196 debug!("emit: create_element({:?})", tag_name);

275 debug!("emit: create_element({:?})", tag_name);

197 let tag_name_id = self.ensure_string(tag_name);

276 let tag_name_id = self.ensure_string(tag_name);

198 self.state.emitter.create_element(tag_name_id.into());

277 self.state.emitter.create_element(tag_name_id.into());

199 }

278 }

200

279

201 pub fn create_element_ns(&mut self, tag_name: &str, ns: &str) {

280 pub fn create_element_ns(&mut self, tag_name: &str, ns: &str) {

281+ debug_assert!(self.traversal_is_committed());

202 debug!("emit: create_element_ns({:?}, {:?})", tag_name, ns);

282 debug!("emit: create_element_ns({:?}, {:?})", tag_name, ns);

203 let tag_name_id = self.ensure_string(tag_name);

283 let tag_name_id = self.ensure_string(tag_name);

204 let ns_id = self.ensure_string(ns);

284 let ns_id = self.ensure_string(ns);

@@ -207,7 +287,19 @@ impl ChangeListBuilder<'_> {

207 .create_element_ns(tag_name_id.into(), ns_id.into());

287 .create_element_ns(tag_name_id.into(), ns_id.into());

208 }

288 }

209

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+

210 pub fn new_event_listener(&mut self, listener: &Listener) {

301 pub fn new_event_listener(&mut self, listener: &Listener) {

302+ debug_assert!(self.traversal_is_committed());

211 debug!("emit: new_event_listener({:?})", listener);

303 debug!("emit: new_event_listener({:?})", listener);

212 let (a, b) = listener.get_callback_parts();

304 let (a, b) = listener.get_callback_parts();

213 debug_assert!(a != 0);

305 debug_assert!(a != 0);

@@ -216,6 +308,13 @@ impl ChangeListBuilder<'_> {

216 }

308 }

217

309

218 pub fn update_event_listener(&mut self, listener: &Listener) {

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+

219 debug!("emit: update_event_listener({:?})", listener);

318 debug!("emit: update_event_listener({:?})", listener);

220 let (a, b) = listener.get_callback_parts();

319 let (a, b) = listener.get_callback_parts();

221 debug_assert!(a != 0);

320 debug_assert!(a != 0);

@@ -226,8 +325,29 @@ impl ChangeListBuilder<'_> {

226 }

325 }

227

326

228 pub fn remove_event_listener(&mut self, event: &str) {

327 pub fn remove_event_listener(&mut self, event: &str) {

328+ debug_assert!(self.traversal_is_committed());

229 debug!("emit: remove_event_listener({:?})", event);

329 debug!("emit: remove_event_listener({:?})", event);

230 let event_id = self.ensure_string(event);

330 let event_id = self.ensure_string(event);

231 self.state.emitter.remove_event_listener(event_id.into());

331 self.state.emitter.remove_event_listener(event_id.into());

232 }

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+ }

233}

353}

src/change_list/traversal.rsnew file+344

@@ -0,0 +1,344 @@

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.

4+#[derive(Clone, Copy, Debug, PartialEq, Eq)]

5+pub enum MoveTo {

6+ /// Move from the current node up to its parent.

7+ Parent,

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+388−224

@@ -6,8 +6,8 @@ use crate::{

6};

7use fxhash::{FxHashMap, FxHashSet};

8use std::cmp::Ordering;

9−use std::ops::Range;

10use std::u32;

9use std::u32;

10+use wasm_bindgen::UnwrapThrowExt;

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`.

@@ -32,17 +32,20 @@ pub(crate) fn diff(

32 &NodeKind::Text(TextNode { text: old_text }),

33 ) => {

34 if new_text != old_text {

35+ change_list.commit_traversal();

35 change_list.set_text(new_text);

36 change_list.set_text(new_text);

36 }

37 }

38 }

39 (&NodeKind::Text(_), &NodeKind::Element(_)) => {

40 (&NodeKind::Text(_), &NodeKind::Element(_)) => {

41+ change_list.commit_traversal();

40 create(cached_set, change_list, registry, new, cached_roots);

42 create(cached_set, change_list, registry, new, cached_roots);

41 registry.remove_subtree(&old);

43 registry.remove_subtree(&old);

42 change_list.replace_with();

44 change_list.replace_with();

43 }

45 }

45 (&NodeKind::Element(_), &NodeKind::Text(_)) => {

47 (&NodeKind::Element(_), &NodeKind::Text(_)) => {

48+ change_list.commit_traversal();

46 create(cached_set, change_list, registry, new, cached_roots);

49 create(cached_set, change_list, registry, new, cached_roots);

47 // Note: text nodes cannot have event listeners, so we don't need to

50 // Note: text nodes cannot have event listeners, so we don't need to

48 // remove the old node's listeners from our registry her.

51 // remove the old node's listeners from our registry her.

@@ -68,13 +71,14 @@ pub(crate) fn diff(

68 }),

71 }),

69 ) => {

72 ) => {

70 if new_tag_name != old_tag_name || new_namespace != old_namespace {

73 if new_tag_name != old_tag_name || new_namespace != old_namespace {

74+ change_list.commit_traversal();

71 create(cached_set, change_list, registry, new, cached_roots);

75 create(cached_set, change_list, registry, new, cached_roots);

72 registry.remove_subtree(&old);

76 registry.remove_subtree(&old);

73 change_list.replace_with();

77 change_list.replace_with();

74 return;

78 return;

75 }

79 }

76 diff_listeners(change_list, registry, old_listeners, new_listeners);

80 diff_listeners(change_list, registry, old_listeners, new_listeners);

77− diff_attributes(change_list, old_attributes, new_attributes);

81+ diff_attributes(change_list, old_attributes, new_attributes, new_namespace.is_some());

78 diff_children(

82 diff_children(

79 cached_set,

83 cached_set,

80 change_list,

84 change_list,

@@ -94,25 +98,51 @@ pub(crate) fn diff(

94 return;

98 return;

95 }

99 }

100

97− let new = cached_set.get(new.id);

101+ let (new, new_template) = cached_set.get(new.id);

98− let old = cached_set.get(old.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.

99− diff(cached_set, change_list, registry, old, new, cached_roots);

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+ }

100 }

122 }

101

123

102 // New cached node when the old node was not cached. In this scenario,

124 // New cached node when the old node was not cached. In this scenario,

103 // we assume that they are pretty different, and it isn't worth diffing

125 // we assume that they are pretty different, and it isn't worth diffing

104 // the subtrees, so we just create the new cached node afresh.

126 // the subtrees, so we just create the new cached node afresh.

105 (&NodeKind::Cached(ref c), _) => {

127 (&NodeKind::Cached(ref c), _) => {

128+ change_list.commit_traversal();

106 cached_roots.insert(c.id);

129 cached_roots.insert(c.id);

107− let new = cached_set.get(c.id);

130+ let (new, new_template) = cached_set.get(c.id);

108− create(cached_set, change_list, registry, new, cached_roots);

131+ create_and_replace(

109− registry.remove_subtree(&old);

132+ cached_set,

110− change_list.replace_with();

133+ change_list,

134+ registry,

135+ new_template,

136+ old,

137+ new,

138+ cached_roots,

139+ );

111 }

140 }

112

141

113 // Old cached node and new non-cached node. Again, assume that they are

142 // Old cached node and new non-cached node. Again, assume that they are

114 // probably pretty different and create the new non-cached node afresh.

143 // probably pretty different and create the new non-cached node afresh.

115 (_, &NodeKind::Cached(_)) => {

144 (_, &NodeKind::Cached(_)) => {

145+ change_list.commit_traversal();

116 create(cached_set, change_list, registry, new, cached_roots);

146 create(cached_set, change_list, registry, new, cached_roots);

117 registry.remove_subtree(&old);

147 registry.remove_subtree(&old);

118 change_list.replace_with();

148 change_list.replace_with();

@@ -133,6 +163,10 @@ fn diff_listeners(

133 old: &[Listener],

163 old: &[Listener],

134 new: &[Listener],

164 new: &[Listener],

135) {

165) {

166+ if !old.is_empty() || !new.is_empty() {

167+ change_list.commit_traversal();

168+ }

169+

136 'outer1: for new_l in new {

170 'outer1: for new_l in new {

137 unsafe {

171 unsafe {

138 // Safety relies on removing `new_l` from the registry manually at

172 // Safety relies on removing `new_l` from the registry manually at

@@ -170,22 +204,26 @@ fn diff_listeners(

170// [... node]

204// [... node]

171//

205//

172// The change list stack is left unchanged.

206// The change list stack is left unchanged.

173−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) {

174 // Do O(n^2) passes to add/update and remove attributes, since

208 // Do O(n^2) passes to add/update and remove attributes, since

175 // there are almost always very few attributes.

209 // there are almost always very few attributes.

176 'outer: for new_attr in new {

210 'outer: for new_attr in new {

177 if new_attr.is_volatile() {

211 if new_attr.is_volatile() {

212+ change_list.commit_traversal();

178− change_list.set_attribute(new_attr.name, new_attr.value);

213+ change_list.set_attribute(new_attr.name, new_attr.value, is_namespaced);

179 } else {

214 } else {

180 for old_attr in old {

215 for old_attr in old {

181 if old_attr.name == new_attr.name {

216 if old_attr.name == new_attr.name {

182 if old_attr.value != new_attr.value {

217 if old_attr.value != new_attr.value {

218+ change_list.commit_traversal();

183− change_list.set_attribute(new_attr.name, new_attr.value);

219+ change_list.set_attribute(new_attr.name, new_attr.value, is_namespaced);

184 }

220 }

185 continue 'outer;

221 continue 'outer;

186 }

222 }

187 }

223 }

224+

225+ change_list.commit_traversal();

188− change_list.set_attribute(new_attr.name, new_attr.value);

226+ change_list.set_attribute(new_attr.name, new_attr.value, is_namespaced);

189 }

227 }

190 }

228 }

191

229

@@ -195,6 +233,8 @@ fn diff_attributes(change_list: &mut ChangeListBuilder, old: &[Attribute], new:

195 continue 'outer2;

233 continue 'outer2;

196 }

234 }

197 }

235 }

236+

237+ change_list.commit_traversal();

198 change_list.remove_attribute(old_attr.name);

238 change_list.remove_attribute(old_attr.name);

199 }

239 }

200}

240}

@@ -217,13 +257,46 @@ fn diff_children(

217) {

257) {

218 if new.is_empty() {

258 if new.is_empty() {

219 if !old.is_empty() {

259 if !old.is_empty() {

260+ change_list.commit_traversal();

220 remove_all_children(change_list, registry, old);

261 remove_all_children(change_list, registry, old);

221 }

262 }

222 return;

263 return;

223 }

264 }

224

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+

225 if old.is_empty() {

295 if old.is_empty() {

296+ if !new.is_empty() {

297+ change_list.commit_traversal();

226− create_and_append_children(cached_set, change_list, registry, new, cached_roots);

298+ create_and_append_children(cached_set, change_list, registry, new, cached_roots);

299+ }

227 return;

300 return;

228 }

301 }

229

302

@@ -384,42 +457,24 @@ fn diff_keyed_prefix(

384 new: &[Node],

457 new: &[Node],

385 cached_roots: &mut FxHashSet<CacheId>,

458 cached_roots: &mut FxHashSet<CacheId>,

386) -> KeyedPrefixResult {

459) -> KeyedPrefixResult {

387− let mut pushed = false;

460+ change_list.go_down();

388 let mut shared_prefix_count = 0;

461 let mut shared_prefix_count = 0;

389

462

390− for (old, new) in old.iter().zip(new.iter()) {

463+ for (i, (old, new)) in old.iter().zip(new.iter()).enumerate() {

391 if old.key() != new.key() {

464 if old.key() != new.key() {

392 break;

465 break;

393 }

466 }

394

467

395− if pushed {

468+ change_list.go_to_sibling(i);

396− debug_assert!(shared_prefix_count > 0);

397− change_list.pop_push_next_sibling();

398− } else {

399− debug_assert_eq!(shared_prefix_count, 0);

400− change_list.push_first_child();

401− pushed = true;

402− }

403−

404 diff(cached_set, change_list, registry, old, new, cached_roots);

469 diff(cached_set, change_list, registry, old, new, cached_roots);

405 shared_prefix_count += 1;

470 shared_prefix_count += 1;

406−

407− // At the end of the loop, the change list stack looks like

408− //

409− // [... parent child_we_just_diffed]

410− debug_assert!(pushed);

411 }

471 }

412

472

413 // If that was all of the old children, then create and append the remaining

473 // If that was all of the old children, then create and append the remaining

414 // new children and we're finished.

474 // new children and we're finished.

415 if shared_prefix_count == old.len() {

475 if shared_prefix_count == old.len() {

416− debug_assert!(

476+ change_list.go_up();

417− pushed,

418− "we handle the case of empty children before calling this method, so

419− `shared_prefix_count` must be greater than zero, and therefore we

420− must have pushed in the above loop"

421− );

422− change_list.pop();

477+ change_list.commit_traversal();

423 create_and_append_children(

478 create_and_append_children(

424 cached_set,

479 cached_set,

425 change_list,

480 change_list,

@@ -433,17 +488,13 @@ fn diff_keyed_prefix(

433 // And if that was all of the new children, then remove all of the remaining

488 // And if that was all of the new children, then remove all of the remaining

434 // old children and we're finished.

489 // old children and we're finished.

435 if shared_prefix_count == new.len() {

490 if shared_prefix_count == new.len() {

436− // Same as above.

491+ change_list.go_to_sibling(shared_prefix_count);

437− debug_assert!(pushed);

492+ change_list.commit_traversal();

438− change_list.pop_push_next_sibling();

439− change_list.remove_self_and_next_siblings();

493+ remove_self_and_next_siblings(change_list, registry, &old[shared_prefix_count..]);

440 return KeyedPrefixResult::Finished;

494 return KeyedPrefixResult::Finished;

441 }

495 }

442

496

443− if pushed {

444− debug_assert!(shared_prefix_count > 0);

445− change_list.pop();

497+ change_list.go_up();

446− }

447 KeyedPrefixResult::MoreWorkToDo(shared_prefix_count)

498 KeyedPrefixResult::MoreWorkToDo(shared_prefix_count)

448}

499}

449

500

@@ -465,7 +516,7 @@ fn diff_keyed_middle(

465 change_list: &mut ChangeListBuilder,

516 change_list: &mut ChangeListBuilder,

466 registry: &mut EventsRegistry,

517 registry: &mut EventsRegistry,

467 old: &[Node],

518 old: &[Node],

468− new: &[Node],

519+ mut new: &[Node],

469 cached_roots: &mut FxHashSet<CacheId>,

520 cached_roots: &mut FxHashSet<CacheId>,

470 shared_prefix_count: usize,

521 shared_prefix_count: usize,

471 shared_suffix_count: usize,

522 shared_suffix_count: usize,

@@ -507,31 +558,17 @@ fn diff_keyed_middle(

507 // afresh.

558 // afresh.

508 if shared_suffix_count == 0 && shared_keys.is_empty() {

559 if shared_suffix_count == 0 && shared_keys.is_empty() {

509 if shared_prefix_count == 0 {

560 if shared_prefix_count == 0 {

561+ change_list.commit_traversal();

510 remove_all_children(change_list, registry, old);

562 remove_all_children(change_list, registry, old);

511 } else {

563 } else {

512− change_list.pop_push_next_sibling();

564+ change_list.go_down_to_child(shared_prefix_count);

565+ change_list.commit_traversal();

513 remove_self_and_next_siblings(change_list, registry, &old[shared_prefix_count..]);

566 remove_self_and_next_siblings(change_list, registry, &old[shared_prefix_count..]);

514 }

567 }

515 create_and_append_children(cached_set, change_list, registry, new, cached_roots);

568 create_and_append_children(cached_set, change_list, registry, new, cached_roots);

516 return;

569 return;

517 }

570 }

518

571

519− // The longest increasing subsequence within `new_index_to_old_index` in

520− // reverse order (since `lis_with` adds the indices in reverse

521− // order). We will leave these nodes in place in the DOM, and only move

522− // nodes that are not part of the LIS. This results in the minimum

523− // number of DOM nodes moved.

524− let mut reverse_lis = Vec::with_capacity(new_index_to_old_index.len());

525− let mut predecessors = vec![0; new_index_to_old_index.len()];

526− let mut starts = vec![0; new_index_to_old_index.len()];

527− longest_increasing_subsequence::lis_with(

528− &new_index_to_old_index,

529− &mut reverse_lis,

530− |a, b| a < b,

531− &mut predecessors,

532− &mut starts,

533− );

534−

535 // Save each of the old children whose keys are reused in the new

572 // Save each of the old children whose keys are reused in the new

536 // children.

573 // children.

537 let mut old_index_to_temp = vec![u32::MAX; old.len()];

574 let mut old_index_to_temp = vec![u32::MAX; old.len()];

@@ -545,6 +582,7 @@ fn diff_keyed_middle(

545 .unwrap_or(old.len());

582 .unwrap_or(old.len());

546

583

547 if end - start > 0 {

584 if end - start > 0 {

585+ change_list.commit_traversal();

548 let mut t = change_list.save_children_to_temporaries(

586 let mut t = change_list.save_children_to_temporaries(

549 shared_prefix_count + start,

587 shared_prefix_count + start,

550 shared_prefix_count + end,

588 shared_prefix_count + end,

@@ -568,165 +606,138 @@ fn diff_keyed_middle(

568 let mut removed_count = 0;

606 let mut removed_count = 0;

569 for (i, old_child) in old.iter().enumerate().rev() {

607 for (i, old_child) in old.iter().enumerate().rev() {

570 if !shared_keys.contains(&old_child.key()) {

608 if !shared_keys.contains(&old_child.key()) {

609+ registry.remove_subtree(old_child);

610+ change_list.commit_traversal();

571 change_list.remove_child(i + shared_prefix_count);

611 change_list.remove_child(i + shared_prefix_count);

572 removed_count += 1;

612 removed_count += 1;

573 }

613 }

574 }

614 }

575

615

576− // Whether we have pushed a child onto the change list stack or not.

616+ // If there aren't any more new children, then we are done!

577− let mut pushed = false;

617+ if new.is_empty() {

578−

618+ return;

579− // Now iterate from the end of the new children back to the beginning,

580− // moving old children to their new destination, diffing them, and

581− // creating new children as necessary. Note that iterating in reverse

582− // order lets us use `Node.prototype.insertBefore` to move/insert

583− // children.

584− if shared_suffix_count > 0 {

585− change_list.push_child(old_shared_suffix_start - removed_count);

586− pushed = true;

587− }

588− let mut segment_end = new.len();

589− for lis_index in reverse_lis {

590− // Because we use `u32::MAX` as a sentinel value representing "a child

591− // with this key is not a member of `new`", we filter that out here.

592− let old_index = new_index_to_old_index[lis_index];

593− if old_index == u32::MAX as usize {

594− continue;

595− }

596−

597− // A segment begins with a member of the LIS, which will remain in

598− // place in the DOM, followed by zero or more new children that are

599− // not members of the LIS. If one of these new children shares a key

600− // with one of the old children, then we will move that old child in

601− // the DOM. Otherwise, we create the new child afresh.

602− debug_assert!(segment_end - lis_index > 0);

603−

604− // Go through each of the non-LIS child and move-and-diff or create

605− // it.

606− diff_and_move_or_create_segment(

607− cached_set,

608− change_list,

609− registry,

610− old,

611− new,

612− cached_roots,

613− lis_index + 1..segment_end,

614− &new_index_to_old_index,

615− &old_index_to_temp,

616− &mut pushed,

617− );

618−

619− // Now we push the member of the LIS and diff it with its

620− // correspondingly-keyed new child.

621− let new_child = &new[lis_index];

622− let temp = old_index_to_temp[old_index];

623− debug_assert_ne!(temp, u32::MAX);

624− if pushed {

625− change_list.pop();

626− }

627− change_list.push_temporary(temp);

628− pushed = true;

629− diff(

630− cached_set,

631− change_list,

632− registry,

633− &old[old_index],

634− new_child,

635− cached_roots,

636− );

637−

638− segment_end = lis_index;

639 }

619 }

640

620

641− // And now diff-and-move or create each of the non-LIS children that

621+ // The longest increasing subsequence within `new_index_to_old_index`. This

642− // appear before the first LIS-member.

622+ // is the longest sequence on DOM nodes in `old` that are relatively ordered

643− diff_and_move_or_create_segment(

623+ // correctly within `new`. We will leave these nodes in place in the DOM,

644− cached_set,

624+ // and only move nodes that are not part of the LIS. This results in the

645− change_list,

625+ // maximum number of DOM nodes left in place, AKA the minimum number of DOM

646− registry,

626+ // nodes moved.

647− old,

627+ let mut new_index_is_in_lis = FxHashSet::default();

648− new,

628+ new_index_is_in_lis.reserve(new_index_to_old_index.len());

649− cached_roots,

629+ let mut predecessors = vec![0; new_index_to_old_index.len()];

650− 0..segment_end,

630+ let mut starts = vec![0; new_index_to_old_index.len()];

631+ longest_increasing_subsequence::lis_with(

651 &new_index_to_old_index,

632 &new_index_to_old_index,

652− &old_index_to_temp,

633+ &mut new_index_is_in_lis,

653− &mut pushed,

634+ |a, b| a < b,

635+ &mut predecessors,

636+ &mut starts,

654 );

637 );

655

638

656− if pushed {

639+ // Now we will iterate from the end of the new children back to the

657− change_list.pop();

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]

656+ } 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]

686+ }

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+ }

658 }

697 }

659−}

660

698

661−// Diff-and-then-move or create each new node in the given segment. The

699+ for (new_index, new_child) in new.iter().enumerate().rev() {

662−// segment's nodes must _not_ be members of the LIS (those nodes we will diff in

663−// place elsewhere, and we should not move them nor create them afresh).

664−//

665−// On entering this function, the change list stack has the parent and

666−// optionally the next sibling after this segment of children:

667−//

668−// [... parent next_sibling] if *pushed == true

669−// [... parent] otherwise

670−//

671−// After exiting, if any children were moved or created, then `pushed` is set to

672−// true and the change list stack has the first child in this segment on

673−// top. Otherwise the stack is left as it was on entering.

674−//

675−// [... parent child] if *pushed == true

676−// [... parent] otherwise

677−fn diff_and_move_or_create_segment(

678− cached_set: &CachedSet,

679− change_list: &mut ChangeListBuilder,

680− registry: &mut EventsRegistry,

681− old: &[Node],

682− new: &[Node],

683− cached_roots: &mut FxHashSet<CacheId>,

684− segment: Range<usize>,

685− new_index_to_old_index: &[usize],

686− old_index_to_temp: &[u32],

687− pushed: &mut bool,

688−) {

689− for new_index in segment.rev() {

690− let new_child = &new[new_index];

691 let old_index = new_index_to_old_index[new_index];

700 let old_index = new_index_to_old_index[new_index];

692 if old_index == u32::MAX as usize {

701 if old_index == u32::MAX as usize {

693− // The key is not reused. Create this new child afresh.

702+ debug_assert!(!shared_keys.contains(&new_child.key()));

703+ change_list.commit_traversal();

704+ // [... parent successor]

694 create(cached_set, change_list, registry, new_child, cached_roots);

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]

695 } else {

709 } else {

696− // The key is reused. Diff it with the old node and then

710+ debug_assert!(shared_keys.contains(&new_child.key()));

697− // move the old node into its final destination.

698 let temp = old_index_to_temp[old_index];

711 let temp = old_index_to_temp[old_index];

699 debug_assert_ne!(temp, u32::MAX);

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]

700− change_list.push_temporary(temp);

721+ change_list.push_temporary(temp);

722+ // [... parent successor new_child]

723+ change_list.insert_before();

724+ // [... parent new_child]

725+ }

726+

701 diff(

727 diff(

702 cached_set,

728 cached_set,

703 change_list,

729 change_list,

704 registry,

730 registry,

705− new_child,

706 &old[old_index],

731 &old[old_index],

732+ new_child,

707 cached_roots,

733 cached_roots,

708 );

734 );

709 }

735 }

710−

711− // At this point the change list stack can have one of two shapes.

712− if *pushed {

713− // [... parent next_child new_child]

714− change_list.insert_before();

715− // [... parent new_child]

716− } else {

717− // [... parent new_child]

718− change_list.append_child();

719− // [... parent]

720− change_list.push_last_child();

721− // [... parent new_child]

722− *pushed = true;

723− }

724−

725− // At the end of each loop iteration, the change list stack looks like:

726− //

727− // [... parent new_child]

728− debug_assert!(*pushed);

729 }

736 }

737+

738+ // [... parent child]

739+ change_list.go_up();

740+ // [... parent]

730}

741}

731

742

732// Diff the suffix of keyed children that share the same keys in the same order.

743// Diff the suffix of keyed children that share the same keys in the same order.

@@ -749,10 +760,11 @@ fn diff_keyed_suffix(

749 debug_assert!(!old.is_empty());

760 debug_assert!(!old.is_empty());

750

761

751 // [... parent]

762 // [... parent]

752− change_list.push_child(new_shared_suffix_start);

763+ change_list.go_down();

753 // [... parent new_child]

764 // [... parent new_child]

754

765

755− for (old_child, new_child) in old.iter().zip(new.iter()) {

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);

756 diff(

768 diff(

757 cached_set,

769 cached_set,

758 change_list,

770 change_list,

@@ -761,14 +773,10 @@ fn diff_keyed_suffix(

761 new_child,

773 new_child,

762 cached_roots,

774 cached_roots,

763 );

775 );

764−

765− // [... parent this_new_child]

766− change_list.pop_push_next_sibling();

767− // [... parent next_new_child]

768 }

776 }

769

777

770 // [... parent]

778 // [... parent]

771− change_list.pop();

779+ change_list.go_up();

772}

780}

773

781

774// Diff children that are not keyed.

782// Diff children that are not keyed.

@@ -791,17 +799,14 @@ fn diff_non_keyed_children(

791 debug_assert!(!new.is_empty());

799 debug_assert!(!new.is_empty());

792 debug_assert!(!old.is_empty());

800 debug_assert!(!old.is_empty());

793

801

794− for (i, (new_child, old_child)) in new.iter().zip(old.iter()).enumerate() {

795− if i == 0 {

796− // [... parent]

797− change_list.push_first_child();

798− // [... parent first_child]

802+ // [... parent]

799− } else {

800− // [... parent prev_sibling]

801− change_list.pop_push_next_sibling();

803+ change_list.go_down();

802− // [... parent next_sibling]

804+ // [... parent child]

803− }

804

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]

805 diff(

810 diff(

806 cached_set,

811 cached_set,

807 change_list,

812 change_list,

@@ -812,23 +817,20 @@ fn diff_non_keyed_children(

812 );

817 );

813 }

818 }

814

819

815− // Note that because `new` and `old` are not empty, the previous loop always

816− // executes at least once, so the change list stack is now:

817− //

818− // [... parent child]

819−

820 match old.len().cmp(&new.len()) {

821 Ordering::Greater => {

822− // [... parent last_shared_child]

822+ // [... parent prev_child]

823− change_list.pop_push_next_sibling();

823+ change_list.go_to_sibling(new.len());

824 // [... parent first_child_to_remove]

825+ change_list.commit_traversal();

825 remove_self_and_next_siblings(change_list, registry, &old[new.len()..]);

826 remove_self_and_next_siblings(change_list, registry, &old[new.len()..]);

826 // [... parent]

827 // [... parent]

827 }

828 }

828 Ordering::Less => {

829 Ordering::Less => {

829 // [... parent last_child]

830 // [... parent last_child]

830− change_list.pop();

831+ change_list.go_up();

831 // [... parent]

832 // [... parent]

833+ change_list.commit_traversal();

832 create_and_append_children(

834 create_and_append_children(

833 cached_set,

835 cached_set,

834 change_list,

836 change_list,

@@ -839,7 +841,7 @@ fn diff_non_keyed_children(

839 }

841 }

840 Ordering::Equal => {

842 Ordering::Equal => {

841 // [... parent child]

843 // [... parent child]

842− change_list.pop();

844+ change_list.go_up();

843 // [... parent]

845 // [... parent]

844 }

846 }

845 }

847 }

@@ -859,6 +861,7 @@ fn create_and_append_children(

859 new: &[Node],

861 new: &[Node],

860 cached_roots: &mut FxHashSet<CacheId>,

862 cached_roots: &mut FxHashSet<CacheId>,

861) {

863) {

864+ debug_assert!(change_list.traversal_is_committed());

862 for child in new {

865 for child in new {

863 create(cached_set, change_list, registry, child, cached_roots);

866 create(cached_set, change_list, registry, child, cached_roots);

864 change_list.append_child();

867 change_list.append_child();

@@ -877,6 +880,7 @@ fn remove_all_children(

877 registry: &mut EventsRegistry,

880 registry: &mut EventsRegistry,

878 old: &[Node],

881 old: &[Node],

879) {

882) {

883+ debug_assert!(change_list.traversal_is_committed());

880 for child in old {

884 for child in old {

881 registry.remove_subtree(child);

885 registry.remove_subtree(child);

882 }

886 }

@@ -899,6 +903,7 @@ fn remove_self_and_next_siblings(

899 registry: &mut EventsRegistry,

903 registry: &mut EventsRegistry,

900 old: &[Node],

904 old: &[Node],

901) {

905) {

906+ debug_assert!(change_list.traversal_is_committed());

902 for child in old {

907 for child in old {

903 registry.remove_subtree(child);

908 registry.remove_subtree(child);

904 }

909 }

@@ -921,6 +926,7 @@ fn create(

921 node: &Node,

926 node: &Node,

922 cached_roots: &mut FxHashSet<CacheId>,

927 cached_roots: &mut FxHashSet<CacheId>,

923) {

928) {

929+ debug_assert!(change_list.traversal_is_committed());

924 match node.kind {

930 match node.kind {

925 NodeKind::Text(TextNode { text }) => {

931 NodeKind::Text(TextNode { text }) => {

926 change_list.create_text_node(text);

932 change_list.create_text_node(text);

@@ -938,15 +944,34 @@ fn create(

938 } else {

944 } else {

939 change_list.create_element(tag_name);

945 change_list.create_element(tag_name);

940 }

946 }

947+

941 for l in listeners {

948 for l in listeners {

942 unsafe {

949 unsafe {

943 registry.add(l);

950 registry.add(l);

944 }

951 }

945 change_list.new_event_listener(l);

952 change_list.new_event_listener(l);

946 }

953 }

954+

947 for attr in attributes {

955 for attr in attributes {

948− change_list.set_attribute(&attr.name, &attr.value);

956+ change_list.set_attribute(&attr.name, &attr.value, namespace.is_some());

949 }

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;

972+ }

973+ }

974+

950 for child in children {

975 for child in children {

951 create(cached_set, change_list, registry, child, cached_roots);

976 create(cached_set, change_list, registry, child, cached_roots);

952 change_list.append_child();

977 change_list.append_child();

@@ -954,8 +979,147 @@ fn create(

954 }

979 }

955 NodeKind::Cached(ref c) => {

980 NodeKind::Cached(ref c) => {

956 cached_roots.insert(c.id);

981 cached_roots.insert(c.id);

957− let node = cached_set.get(c.id);

982+ let (node, template) = cached_set.get(c.id);

983+ if let Some(template) = template {

984+ create_with_template(

985+ cached_set,

986+ change_list,

987+ registry,

988+ template,

989+ node,

990+ cached_roots,

991+ );

992+ } else {

958− create(cached_set, change_list, registry, node, cached_roots)

993+ create(cached_set, change_list, registry, node, cached_roots);

994+ }

959 }

995 }

960 }

996 }

961}

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);

1076+ }

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());

1108+ }

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();

1125+}

src/events.rs+2−2

@@ -86,7 +86,7 @@ cfg_if::cfg_if! {

86 callback(component, vdom_weak, event);

87 }

88 }

89− }) as Box<Fn(web_sys::Event, u32, u32)>);

89+ }) as Box<dyn Fn(web_sys::Event, u32, u32)>);

91 (registry, closure)

92 }

@@ -99,7 +99,7 @@ cfg_if::cfg_if! {

100 pub(crate) fn remove_subtree(&mut self, node: &Node) {

101 match node.kind {

102− NodeKind::Cached(_) | NodeKind::Text(_) => return,

102+ NodeKind::Cached(_) | NodeKind::Text(_) => {},

103 NodeKind::Element(&ElementNode {listeners, children, ..}) => {

104 for l in listeners {

105 self.remove(l);

src/lib.rs+5−4

@@ -18,8 +18,8 @@

18//! }

19//! }

20//!

21−//! impl<'who> Render for Hello<'who> {

21+//! impl<'a, 'who> Render<'a> for Hello<'who> {

22−//! fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

22+//! fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

23//! use dodrio::builder::*;

24//!

25//! let id = bumpalo::format!(in cx.bump, "hello-{}", self.who);

@@ -92,13 +92,14 @@ mod events;

92mod node;

93mod render;

94mod render_context;

95+mod strace;

95mod vdom;

96mod vdom;

97pub mod builder;

98pub mod builder;

99// Re-export items at the top level.

100// Re-export items at the top level.

100pub use self::cached::Cached;

101pub use self::cached::Cached;

101−pub use self::node::{Attribute, Listener, Node};

102+pub use self::node::{Attribute, Listener, Node, NodeKey};

102pub use self::render::{Render, RootRender};

103pub use self::render::{Render, RootRender};

103pub use self::render_context::RenderContext;

104pub use self::render_context::RenderContext;

104pub use self::vdom::{Vdom, VdomWeak};

105pub use self::vdom::{Vdom, VdomWeak};

@@ -122,7 +123,7 @@ cfg_if::cfg_if! {

122 /// An element node in the physical DOM.

123 /// An element node in the physical DOM.

123 pub type Element = web_sys::Element;

124 pub type Element = web_sys::Element;

124

125

125− pub(crate) type EventsTrampoline = wasm_bindgen::closure::Closure<Fn(web_sys::Event, u32, u32)>;

126+ pub(crate) type EventsTrampoline = wasm_bindgen::closure::Closure<dyn Fn(web_sys::Event, u32, u32)>;

126 }

127 }

127}

128}

128

129

src/node.rs+35−24

@@ -68,24 +68,44 @@ pub_unstable_internal! {

68 }

69}

71−pub_unstable_internal! {

72− /// The key for keyed children.

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.

73− #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]

76+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]

74− pub(crate) struct NodeKey(pub(crate) u32);

77+pub struct NodeKey(pub(crate) u32);

78+

79+impl Default for NodeKey {

80+ fn default() -> NodeKey {

81+ NodeKey::NONE

82+ }

75}

83}

77impl NodeKey {

85impl NodeKey {

86+ /// The default, lack of a key.

78 pub const NONE: NodeKey = NodeKey(u32::MAX);

87 pub const NONE: NodeKey = NodeKey(u32::MAX);

89+ /// Is this key `NodeKey::NONE`?

80 #[inline]

90 #[inline]

81 pub fn is_none(&self) -> bool {

91 pub fn is_none(&self) -> bool {

82 *self == Self::NONE

92 *self == Self::NONE

83 }

93 }

95+ /// Is this key not `NodeKey::NONE`?

85 #[inline]

96 #[inline]

86 pub fn is_some(&self) -> bool {

97 pub fn is_some(&self) -> bool {

87 !self.is_none()

98 !self.is_none()

88 }

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)

108+ }

89}

109}

110

91/// An event listener callback function.

111/// An event listener callback function.

@@ -162,31 +182,22 @@ impl<'a> Attribute<'a> {

162}

182}

163

183

164impl<'a> Node<'a> {

184impl<'a> Node<'a> {

165− /// Construct a new Node of type element with given tag name and children

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.

166 #[inline]

191 #[inline]

167− pub(crate) fn element<Listeners, Attributes, Children>(

192+ pub fn element(

168 bump: &'a Bump,

193 bump: &'a Bump,

169 key: NodeKey,

194 key: NodeKey,

170 tag_name: &'a str,

195 tag_name: &'a str,

171− listeners: Listeners,

196+ listeners: &'a [Listener<'a>],

172− attributes: Attributes,

197+ attributes: &'a [Attribute<'a>],

173− children: Children,

198+ children: &'a [Node<'a>],

174 namespace: Option<&'a str>,

199 namespace: Option<&'a str>,

175− ) -> Node<'a>

200+ ) -> Node<'a> {

176− where

177− Listeners: 'a + AsRef<[Listener<'a>]>,

178− Attributes: 'a + AsRef<[Attribute<'a>]>,

179− Children: 'a + AsRef<[Node<'a>]>,

180− {

181− let children: &'a Children = bump.alloc(children);

182− let children: &'a [Node<'a>] = children.as_ref();

183−

184− let listeners: &'a Listeners = bump.alloc(listeners);

185− let listeners: &'a [Listener<'a>] = listeners.as_ref();

186−

187− let attributes: &'a Attributes = bump.alloc(attributes);

188− let attributes: &'a [Attribute<'a>] = attributes.as_ref();

189−

190 let element = bump.alloc_with(|| ElementNode {

201 let element = bump.alloc_with(|| ElementNode {

191 key,

202 key,

192 tag_name,

203 tag_name,

src/render.rs+43−16

@@ -21,8 +21,8 @@ use wasm_bindgen::UnwrapThrowExt;

21///

22/// pub struct MyComponent;

23///

24−/// impl Render for MyComponent {

24+/// impl<'a> Render<'a> for MyComponent {

25−/// fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

25+/// fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

26/// use dodrio::builder::*;

27///

28/// p(&cx)

@@ -35,26 +35,26 @@ use wasm_bindgen::UnwrapThrowExt;

35/// }

36/// }

37/// ```

38−pub trait Render {

38+pub trait Render<'a> {

39 /// Render `self` as a virtual DOM. Use the given context's `Bump` for

40 /// temporary allocations.

41− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a>;

41+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a>;

42}

44−impl<'r, R> Render for &'r R

44+impl<'a, 'r, R> Render<'a> for &'r R

45where

46− R: Render,

46+ R: Render<'a>,

47{

48− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

48+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

49 (**self).render(cx)

50 }

51}

53−impl<R> Render for Rc<R>

53+impl<'a, R> Render<'a> for Rc<R>

54where

55− R: Render,

55+ R: Render<'a>,

56{

57− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

57+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

58 (**self).render(cx)

59 }

60}

@@ -69,24 +69,24 @@ where

69/// You do not need to implement this trait by hand: there is a blanket

70/// implementation for all `Render` types that fulfill the `RootRender`

71/// requirements.

72−pub trait RootRender: Any + Render {

72+pub trait RootRender: Any + for<'a> Render<'a> {

73 /// Get this `&RootRender` trait object as an `&Any` trait object reference.

74− fn as_any(&self) -> &Any;

74+ fn as_any(&self) -> &dyn Any;

76 /// Get this `&mut RootRender` trait object as an `&mut Any` trait object

77 /// reference.

78− fn as_any_mut(&mut self) -> &mut Any;

78+ fn as_any_mut(&mut self) -> &mut dyn Any;

79}

81impl<T> RootRender for T

82where

83− T: Any + Render,

83+ T: Any + for<'a> Render<'a>,

84{

85− fn as_any(&self) -> &Any {

85+ fn as_any(&self) -> &dyn Any {

86 self

87 }

89− fn as_any_mut(&mut self) -> &mut Any {

89+ fn as_any_mut(&mut self) -> &mut dyn Any {

90 self

91 }

92}

@@ -138,4 +138,31 @@ mod tests {

138 #[allow(dead_code)]

139 fn takes_dyn_render(_: &dyn super::RootRender) {}

140 }

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+ }

141}

168}

src/render_context.rs+43−2

@@ -1,5 +1,10 @@

1+use crate::{

2+ cached::{Cached, TemplateId},

1−use crate::cached_set::CachedSet;

3+ cached_set::{CacheId, CachedSet},

4+ Node, Render,

5+};

2use bumpalo::Bump;

6use bumpalo::Bump;

7+use fxhash::FxHashMap;

3use std::fmt;

8use std::fmt;

5/// Common context available to all `Render` implementations.

10/// Common context available to all `Render` implementations.

@@ -23,6 +28,8 @@ pub struct RenderContext<'a> {

24 pub(crate) cached_set: &'a crate::RefCell<CachedSet>,

29 pub(crate) cached_set: &'a crate::RefCell<CachedSet>,

31+ pub(crate) templates: &'a mut FxHashMap<TemplateId, Option<CacheId>>,

32+

26 // Prevent exhaustive matching on the rendering context, so we can always

33 // Prevent exhaustive matching on the rendering context, so we can always

27 // add more members in a semver-compatible way.

34 // add more members in a semver-compatible way.

28 _non_exhaustive: (),

35 _non_exhaustive: (),

@@ -38,14 +45,48 @@ impl fmt::Debug for RenderContext<'_> {

39impl<'a> RenderContext<'a> {

46impl<'a> RenderContext<'a> {

40 pub_unstable_internal! {

47 pub_unstable_internal! {

48+ pub(crate) fn new(

49+ bump: &'a Bump,

41− pub(crate) fn new(bump: &'a Bump, cached_set: &'a crate::RefCell<CachedSet>) -> Self {

50+ cached_set: &'a crate::RefCell<CachedSet>,

51+ templates: &'a mut FxHashMap<TemplateId, Option<CacheId>>

52+ ) -> Self {

42 RenderContext {

53 RenderContext {

43 bump,

54 bump,

44 cached_set,

55 cached_set,

56+ templates,

45 _non_exhaustive: (),

57 _non_exhaustive: (),

46 }

58 }

47 }

59 }

48 }

60 }

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+ }

49}

90}

51impl<'a, 'b> From<&'b RenderContext<'a>> for &'a Bump {

92impl<'a, 'b> From<&'b RenderContext<'a>> for &'a Bump {

src/strace.rsnew file+22

@@ -0,0 +1,22 @@

1+cfg_if::cfg_if! {

2+ if #[cfg(feature = "xxx-unstable-strace")] {

3+ use wasm_bindgen::prelude::*;

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+93−80

@@ -1,14 +1,16 @@

1use super::change_list::ChangeListPersistentState;

2use super::RootRender;

3+use crate::cached::TemplateId;

3−use crate::cached_set::CachedSet;

4+use crate::cached_set::{CacheId, CachedSet};

4use crate::events::EventsRegistry;

5use crate::events::EventsRegistry;

5use crate::node::{Node, NodeKey};

6use crate::node::{Node, NodeKey};

6use crate::RenderContext;

7use crate::RenderContext;

7use bumpalo::Bump;

8use bumpalo::Bump;

8−use futures::future::Future;

9+use fxhash::FxHashMap;

9use std::cell::Cell;

10use std::cell::Cell;

10use std::cell::RefCell;

11use std::cell::RefCell;

11use std::fmt;

12use std::fmt;

13+use std::future::Future;

12use std::mem;

14use std::mem;

13use std::mem::ManuallyDrop;

15use std::mem::ManuallyDrop;

14use std::rc::{Rc, Weak};

16use std::rc::{Rc, Weak};

@@ -53,7 +55,7 @@ pub(crate) struct VdomInnerExclusive {

53 // Always `Some` except just before we drop. Just an option so that

55 // Always `Some` except just before we drop. Just an option so that

54 // `unmount` can take the component out but we can still have a Drop

56 // `unmount` can take the component out but we can still have a Drop

55 // implementation.

57 // implementation.

56− component: Option<Box<RootRender>>,

58+ component: Option<Box<dyn RootRender>>,

58 dom_buffers: Option<[Bump; 2]>,

60 dom_buffers: Option<[Bump; 2]>,

59 change_list: ManuallyDrop<ChangeListPersistentState>,

61 change_list: ManuallyDrop<ChangeListPersistentState>,

@@ -61,6 +63,7 @@ pub(crate) struct VdomInnerExclusive {

61 events_registry: Option<Rc<RefCell<EventsRegistry>>>,

63 events_registry: Option<Rc<RefCell<EventsRegistry>>>,

62 events_trampoline: Option<crate::EventsTrampoline>,

64 events_trampoline: Option<crate::EventsTrampoline>,

63 cached_set: crate::RefCell<CachedSet>,

65 cached_set: crate::RefCell<CachedSet>,

66+ templates: FxHashMap<TemplateId, Option<CacheId>>,

65 // Actually a reference into `self.dom_buffers[0]` or if `self.component` is

68 // Actually a reference into `self.dom_buffers[0]` or if `self.component` is

66 // caching renders, into `self.component`'s bump.

69 // caching renders, into `self.component`'s bump.

@@ -155,18 +158,24 @@ impl Vdom {

155 where

158 where

156 R: RootRender,

159 R: RootRender,

157 {

160 {

158− Self::with_boxed_root_render(container, Box::new(component) as Box<RootRender>)

161+ Self::with_boxed_root_render(container, Box::new(component) as Box<dyn RootRender>)

159 }

162 }

160

163

161 /// Construct a `Vdom` with the already-boxed-as-a-trait-object root

164 /// Construct a `Vdom` with the already-boxed-as-a-trait-object root

162 /// rendering component.

165 /// rendering component.

163− pub fn with_boxed_root_render(container: &crate::Element, component: Box<RootRender>) -> Vdom {

166+ pub fn with_boxed_root_render(

167+ container: &crate::Element,

168+ component: Box<dyn RootRender>,

169+ ) -> Vdom {

170+ crate::strace::init_strace();

171+

164 let dom_buffers = [Bump::new(), Bump::new()];

172 let dom_buffers = [Bump::new(), Bump::new()];

165 let change_list = ManuallyDrop::new(ChangeListPersistentState::new(container));

173 let change_list = ManuallyDrop::new(ChangeListPersistentState::new(container));

166

174

167 // Create a dummy `<div/>` in our container.

175 // Create a dummy `<div/>` in our container.

168 initialize_container(container);

176 initialize_container(container);

177+ let current_root =

169− let current_root = Node::element(&dom_buffers[0], NodeKey::NONE, "div", [], [], [], None);

178+ Node::element(&dom_buffers[0], NodeKey::NONE, "div", &[], &[], &[], None);

170 let current_root = Some(unsafe { extend_node_lifetime(current_root) });

179 let current_root = Some(unsafe { extend_node_lifetime(current_root) });

171

180

172 let container = container.clone();

181 let container = container.clone();

@@ -183,6 +192,7 @@ impl Vdom {

183 events_registry: None,

192 events_registry: None,

184 events_trampoline: None,

193 events_trampoline: None,

185 cached_set: crate::RefCell::new(Default::default()),

194 cached_set: crate::RefCell::new(Default::default()),

195+ templates: Default::default(),

186 }),

196 }),

187 });

197 });

188

198

@@ -210,7 +220,7 @@ impl Vdom {

210 R: RootRender,

220 R: RootRender,

211 {

221 {

212 let mut exclusive = self.inner.exclusive.borrow_mut();

222 let mut exclusive = self.inner.exclusive.borrow_mut();

213− let component = Box::new(component) as Box<RootRender>;

223+ let component = Box::new(component) as Box<dyn RootRender>;

214 exclusive.component = Some(component);

224 exclusive.component = Some(component);

215 exclusive.render();

225 exclusive.render();

216 }

226 }

@@ -230,7 +240,7 @@ impl Vdom {

230 /// Unmount this virtual DOM, unregister its event listeners, and return its

240 /// Unmount this virtual DOM, unregister its event listeners, and return its

231 /// root render component.

241 /// root render component.

232 #[inline]

242 #[inline]

233− pub fn unmount(self) -> Box<RootRender> {

243+ pub fn unmount(self) -> Box<dyn RootRender> {

234 Rc::try_unwrap(self.inner.clone())

244 Rc::try_unwrap(self.inner.clone())

235 .map_err(|_| ())

245 .map_err(|_| ())

236 .unwrap_throw()

246 .unwrap_throw()

@@ -262,7 +272,8 @@ impl VdomInnerExclusive {

262 dom_buffers[1].reset();

272 dom_buffers[1].reset();

263

273

264 // Render the new current contents into the inactive bump arena.

274 // Render the new current contents into the inactive bump arena.

275+ let mut cx =

265− let mut cx = RenderContext::new(&dom_buffers[1], &self.cached_set);

276+ RenderContext::new(&dom_buffers[1], &self.cached_set, &mut self.templates);

266 let new_contents = self.component.as_ref().unwrap_throw().render(&mut cx);

277 let new_contents = self.component.as_ref().unwrap_throw().render(&mut cx);

267 let new_contents = extend_node_lifetime(new_contents);

278 let new_contents = extend_node_lifetime(new_contents);

268

279

@@ -315,7 +326,7 @@ impl VdomInnerExclusive {

315 }

326 }

316}

327}

317

328

318−fn request_animation_frame(f: &Closure<FnMut()>) {

329+fn request_animation_frame(f: &Closure<dyn FnMut()>) {

319 web_sys::window()

330 web_sys::window()

320 .expect_throw("should have a window")

331 .expect_throw("should have a window")

321 .request_animation_frame(f.as_ref().unchecked_ref())

332 .request_animation_frame(f.as_ref().unchecked_ref())

@@ -332,7 +343,7 @@ where

332 let f = Closure::wrap(Box::new(move || {

343 let f = Closure::wrap(Box::new(move || {

333 *g.borrow_mut() = None;

344 *g.borrow_mut() = None;

334 f();

345 f();

335− }) as Box<FnMut()>);

346+ }) as Box<dyn FnMut()>);

336 request_animation_frame(&f);

347 request_animation_frame(&f);

337

348

338 *h.borrow_mut() = Some(f);

349 *h.borrow_mut() = Some(f);

@@ -363,25 +374,23 @@ impl VdomWeak {

363 /// Replace the root rendering component with the new `root`.

374 /// Replace the root rendering component with the new `root`.

364 ///

375 ///

365 /// Returns a future that resolves to the *old* root component.

376 /// Returns a future that resolves to the *old* root component.

366− pub fn set_component(

377+ pub async fn set_component(

367 self,

378 self,

368 root: Box<dyn RootRender>,

379 root: Box<dyn RootRender>,

369− ) -> impl Future<Item = Box<dyn RootRender + 'static>, Error = VdomDroppedError> {

380+ ) -> Result<Box<dyn RootRender + 'static>, VdomDroppedError> {

370− futures::future::ok(self.inner.upgrade())

371− .and_then(|inner| inner.ok_or(()))

372− .map_err(|_| VdomDroppedError {})

381+ let inner = self.inner.upgrade().ok_or(VdomDroppedError {})?;

373− .and_then(|inner| {

382+

383+ // Wait for a new tick of the micro-task queue

374− let promise = js_sys::Promise::resolve(&JsValue::null());

384+ let _ = JsFuture::from(js_sys::Promise::resolve(&JsValue::null())).await;

375− JsFuture::from(promise)

385+

376− .map_err(|_| VdomDroppedError {})

377− .and_then(move |_| {

378− let old = {

386+ let old = {

379− let mut exclusive = inner.exclusive.borrow_mut();

387+ let mut exclusive = inner.exclusive.borrow_mut();

380− mem::replace(&mut *exclusive.component.as_mut().unwrap_throw(), root)

388+ mem::replace(&mut *exclusive.component.as_mut().unwrap_throw(), root)

381− };

389+ };

390+

382− VdomWeak::new(&inner).render().map(|_| old)

391+ VdomWeak::new(&inner).render().await?;

383− })

392+

384− })

393+ Ok(old)

385 }

394 }

386

395

387 /// Execute `f` with a reference to this virtual DOM's root rendering

396 /// Execute `f` with a reference to this virtual DOM's root rendering

@@ -389,24 +398,18 @@ impl VdomWeak {

389 ///

398 ///

390 /// To ensure exclusive access to the root rendering component, the

399 /// To ensure exclusive access to the root rendering component, the

391 /// invocation takes place on a new tick of the micro-task queue.

400 /// invocation takes place on a new tick of the micro-task queue.

392− pub fn with_component<F, T>(&self, f: F) -> impl Future<Item = T, Error = VdomDroppedError>

401+ pub async fn with_component<F, T>(&self, f: F) -> Result<T, VdomDroppedError>

393 where

402 where

394 F: 'static + FnOnce(&mut dyn RootRender) -> T,

403 F: 'static + FnOnce(&mut dyn RootRender) -> T,

395 {

404 {

396− futures::future::ok(self.inner.upgrade())

397− .and_then(|inner| inner.ok_or(()))

398− .map_err(|_| VdomDroppedError {})

405+ let inner = self.inner.upgrade().ok_or(VdomDroppedError {})?;

399− .and_then(|inner| {

406+

400− let mut f = Some(f);

407+ // Wait for a new tick of the micro-task queue

401− let promise = js_sys::Promise::resolve(&JsValue::null());

408+ let _ = JsFuture::from(js_sys::Promise::resolve(&JsValue::null())).await;

402− JsFuture::from(promise)

409+

403− .map_err(|_| VdomDroppedError {})

404− .map(move |_| {

405− let f = f.take().unwrap_throw();

406− let mut exclusive = inner.exclusive.borrow_mut();

410+ let mut exclusive = inner.exclusive.borrow_mut();

411+

407− f(exclusive.component_raw_mut())

412+ Ok(f(exclusive.component_raw_mut()))

408− })

409− })

410 }

413 }

411

414

412 /// Schedule a render to occur during the next animation frame.

415 /// Schedule a render to occur during the next animation frame.

@@ -415,7 +418,12 @@ impl VdomWeak {

415 /// `render` instead.

418 /// `render` instead.

416 pub fn schedule_render(&self) {

419 pub fn schedule_render(&self) {

417 debug!("VdomWeak::schedule_render");

420 debug!("VdomWeak::schedule_render");

421+

422+ let future = self.render();

423+

418− wasm_bindgen_futures::spawn_local(self.render().map_err(|_| ()));

424+ wasm_bindgen_futures::spawn_local(async move {

425+ let _ = future.await;

426+ });

419 }

427 }

420

428

421 /// Schedule a render to occur during the next animation frame and return a

429 /// Schedule a render to occur during the next animation frame and return a

@@ -423,41 +431,46 @@ impl VdomWeak {

423 ///

431 ///

424 /// If you don't want to do more things after the render completes, then use

432 /// If you don't want to do more things after the render completes, then use

425 /// `schedule_render` instead of `render`.

433 /// `schedule_render` instead of `render`.

426− pub fn render(&self) -> impl Future<Item = (), Error = VdomDroppedError> {

434+ pub fn render(&self) -> impl Future<Output = Result<(), VdomDroppedError>> {

427− futures::future::ok(self.inner.upgrade())

435+ let inner = self.inner.upgrade();

428− .and_then(|inner| inner.ok_or(()))

436+

429− .map_err(|_| VdomDroppedError {})

437+ async move {

430− .and_then(|inner| {

438+ let inner = inner.ok_or(VdomDroppedError {})?;

431− let promise = inner.shared.render_scheduled.take().unwrap_or_else(|| {

439+

432− js_sys::Promise::new(&mut |resolve, reject| {

440+ let promise = inner.shared.render_scheduled.take().unwrap_or_else(|| {

433− let vdom = VdomWeak {

441+ js_sys::Promise::new(&mut |resolve, reject| {

434− inner: Rc::downgrade(&inner),

442+ let vdom = VdomWeak {

435− };

443+ inner: Rc::downgrade(&inner),

436− with_animation_frame(move || match vdom.inner.upgrade() {

444+ };

437− None => {

445+

438− warn!("VdomWeak::render: vdom unmounted before we could render");

446+ with_animation_frame(move || match vdom.inner.upgrade() {

439− let r = reject.call0(&JsValue::null());

447+ None => {

440− debug_assert!(r.is_ok());

448+ warn!("VdomWeak::render: vdom unmounted before we could render");

441− }

449+ let r = reject.call0(&JsValue::null());

442− Some(inner) => {

450+ debug_assert!(r.is_ok());

443− let mut exclusive = inner.exclusive.borrow_mut();

451+ }

444− exclusive.render();

452+ Some(inner) => {

445−

453+ let mut exclusive = inner.exclusive.borrow_mut();

446− // We did the render, so take the promise away

454+ exclusive.render();

447− // and let future `render` calls request new

455+

448− // animation frames.

456+ // We did the render, so take the promise away

449− let _ = inner.shared.render_scheduled.take();

457+ // and let future `render` calls request new

450−

458+ // animation frames.

451− let r = resolve.call0(&JsValue::null());

459+ let _ = inner.shared.render_scheduled.take();

452− debug_assert!(r.is_ok());

460+

453− }

461+ let r = resolve.call0(&JsValue::null());

454− });

462+ debug_assert!(r.is_ok());

455− })

463+ }

456− });

464+ });

457− inner.shared.render_scheduled.set(Some(promise.clone()));

465+ })

458− JsFuture::from(promise)

466+ });

459− .map(|_| ())

467+

460− .map_err(|_| VdomDroppedError {})

468+ inner.shared.render_scheduled.set(Some(promise.clone()));

461− })

469+

470+ JsFuture::from(promise)

471+ .await

472+ .map(drop)

473+ .map_err(|_| VdomDroppedError {})

474+ }

462 }

475 }

463}

476}

tests/web/cached.jsnew file+11

@@ -0,0 +1,11 @@

1+let cloneNodeCount = 0;

3+const origCloneNode = Node.prototype.cloneNode;

4+Node.prototype.cloneNode = function (...args) {

5+ cloneNodeCount += 1;

6+ return origCloneNode.apply(this, args);

7+};

9+export function getCloneNodeCount() {

10+ return cloneNodeCount;

11+}

tests/web/cached.rs+103−48

@@ -1,11 +1,11 @@

1use super::{assert_rendered, before_after, create_element, RenderFn};

2−use dodrio::{builder::*, bumpalo, Cached, Node, Render, RenderContext, Vdom};

2+use dodrio::{builder::*, bumpalo, Cached, Node, Render, RenderContext, RootRender, Vdom};

3−use futures::prelude::*;

4use std::cell::Cell;

3use std::cell::Cell;

5use std::rc::Rc;

4use std::rc::Rc;

6−use wasm_bindgen::*;

5+use wasm_bindgen::prelude::*;

7use wasm_bindgen_test::*;

6use wasm_bindgen_test::*;

8+#[derive(Default)]

9pub struct CountRenders {

10 render_count: Cell<usize>,

11}

@@ -18,8 +18,8 @@ impl CountRenders {

18 }

19}

21−impl Render for CountRenders {

21+impl<'a> Render<'a> for CountRenders {

22− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

22+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

23 let count = self.render_count.get() + 1;

24 self.render_count.set(count);

@@ -28,8 +28,8 @@ impl Render for CountRenders {

28 }

29}

31−#[wasm_bindgen_test(async)]

31+#[wasm_bindgen_test]

32−fn uses_cached_render() -> impl Future<Item = (), Error = JsValue> {

32+async fn uses_cached_render() {

33 use dodrio::builder::*;

35 let cached = Cached::new(CountRenders::new());

@@ -49,57 +49,112 @@ fn uses_cached_render() -> impl Future<Item = (), Error = JsValue> {

49 let vdom6 = vdom0.clone();

50 let vdom7 = vdom0.clone();

52+ // We render, populate the cache, and get "1".

53+ vdom0.weak().render().await.unwrap();

52 vdom0

54 vdom0

53 .weak()

55 .weak()

54− // We render, populate the cache, and get "1".

56+ .with_component(move |comp| {

55− .render()

57+ let comp = comp.unwrap_mut::<Cached<CountRenders>>();

56− .and_then(move |_| {

58+ assert_eq!(comp.render_count.get(), 1);

57− vdom0.weak().with_component(move |comp| {

59+ assert_rendered(&container1, &RenderFn(|_| text("1")));

58− let comp = comp.unwrap_mut::<Cached<CountRenders>>();

59− assert_eq!(comp.render_count.get(), 1);

60− assert_rendered(&container1, &RenderFn(|_| text("1")));

61− })

62 })

60 })

63− // We re-render, re-use the cached node, and get "1" again.

61+ .await

64− .and_then(move |_| vdom1.weak().render())

62+ .unwrap();

65− .and_then(move |_| {

63+

66− vdom2.weak().with_component(move |comp| {

64+ // We re-render, re-use the cached node, and get "1" again.

67− let comp = comp.unwrap_mut::<Cached<CountRenders>>();

65+ vdom1.weak().render().await.unwrap();

68− assert_eq!(comp.render_count.get(), 1);

66+ vdom2

69− assert_rendered(&container2, &RenderFn(|_| text("1")));

67+ .weak()

70− })

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")));

71 })

72 })

72− // We invalidate the cache, re-render, re-populate the cache, and should

73+ .await

73− // now have "2".

74+ .unwrap();

74− .and_then(move |_| {

75+

75− vdom3.weak().with_component(move |comp| {

76+ // We invalidate the cache, re-render, re-populate the cache, and should now have "2".

76− let comp = comp.unwrap_mut::<Cached<CountRenders>>();

77+ vdom3

77− Cached::invalidate(comp);

78+ .weak()

78− })

79+ .with_component(move |comp| {

80+ let comp = comp.unwrap_mut::<Cached<CountRenders>>();

81+ Cached::invalidate(comp);

79 })

82 })

80− .and_then(move |_| vdom4.weak().render())

83+ .await

81− .and_then(move |_| {

84+ .unwrap();

82− vdom5.weak().with_component(move |comp| {

85+ vdom4.weak().render().await.unwrap();

83− let comp = comp.unwrap_mut::<Cached<CountRenders>>();

86+ vdom5

84− assert_eq!(comp.render_count.get(), 2);

87+ .weak()

85− assert_rendered(&container3, &RenderFn(|_| text("2")));

88+ .with_component(move |comp| {

86− })

89+ let comp = comp.unwrap_mut::<Cached<CountRenders>>();

90+ assert_eq!(comp.render_count.get(), 2);

91+ assert_rendered(&container3, &RenderFn(|_| text("2")));

87 })

92 })

88− // We re-render, re-use the cached node, and get "2" again.

93+ .await

89− .and_then(move |_| vdom6.weak().render())

94+ .unwrap();

90− .and_then(move |_| {

95+

91− vdom7.weak().with_component(move |comp| {

96+ // We re-render, re-use the cached node, and get "2" again.

92− let comp = comp.unwrap_mut::<Cached<CountRenders>>();

97+ vdom6.weak().render().await.unwrap();

93− assert_eq!(comp.render_count.get(), 2);

98+ vdom7

94− assert_rendered(&container4, &RenderFn(|_| text("2")));

99+ .weak()

95− })

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")));

96 })

104 })

97− .map_err(|e| JsValue::from(e.to_string()))

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);

98}

146}

147

100struct Id(&'static str);

148struct Id(&'static str);

101−impl Render for Id {

149+

102− fn render<'a>(&self, _cx: &mut RenderContext<'a>) -> Node<'a> {

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> {

103 text(self.0)

158 text(self.0)

104 }

159 }

105}

160}

tests/web/events.rs+56−73

@@ -1,6 +1,6 @@

1use super::create_element;

2use dodrio::{Node, Render, RenderContext, Vdom};

3−use futures::Future;

3+use futures::future::{select, Either};

4use std::cell::{Cell, RefCell};

5use std::rc::Rc;

6use wasm_bindgen::prelude::*;

@@ -9,7 +9,7 @@ use wasm_bindgen_test::*;

10struct EventContainer {

11 event: &'static str,

12− on_event: Box<FnMut()>,

12+ on_event: Box<dyn FnMut()>,

13}

15impl EventContainer {

@@ -24,8 +24,8 @@ impl EventContainer {

24 }

25}

27−impl Render for EventContainer {

27+impl<'a> Render<'a> for EventContainer {

28− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

28+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

29 use dodrio::builder::*;

30 div(&cx)

31 .attr("id", "target")

@@ -44,14 +44,14 @@ fn target(container: &web_sys::Element) -> web_sys::HtmlElement {

44 .unchecked_into()

45}

47−#[wasm_bindgen_test(async)]

47+#[wasm_bindgen_test]

48−fn click() -> impl Future<Item = (), Error = JsValue> {

48+async fn click() {

49 let container = create_element("div");

51− let (sender, receiver) = futures::sync::oneshot::channel();

51+ let (sender, receiver) = futures::channel::oneshot::channel();

52 let mut sender = Some(sender);

54− let vdom = Vdom::new(

54+ let _vdom = Vdom::new(

55 &container,

56 EventContainer::new("click", move || {

57 sender

@@ -64,18 +64,14 @@ fn click() -> impl Future<Item = (), Error = JsValue> {

65 target(&container).click();

67− receiver

67+ receiver.await.unwrap();

68− .map(|_| {

69− drop(vdom);

70− })

71− .map_err(|e| JsValue::from(e.to_string()))

72}

68}

74−#[wasm_bindgen_test(async)]

70+#[wasm_bindgen_test]

75−fn updated_listener_is_called() -> impl Future<Item = (), Error = JsValue> {

71+async fn updated_listener_is_called() {

76 let container = create_element("div");

72 let container = create_element("div");

78− let (first_sender, first_receiver) = futures::sync::oneshot::channel();

74+ let (first_sender, first_receiver) = futures::channel::oneshot::channel();

79 let mut first_sender = Some(first_sender);

75 let mut first_sender = Some(first_sender);

81 let vdom = Vdom::new(

77 let vdom = Vdom::new(

@@ -89,7 +85,7 @@ fn updated_listener_is_called() -> impl Future<Item = (), Error = JsValue> {

89 }),

85 }),

90 );

86 );

92− let (second_sender, second_receiver) = futures::sync::oneshot::channel();

88+ let (second_sender, second_receiver) = futures::channel::oneshot::channel();

93 let mut second_sender = Some(second_sender);

89 let mut second_sender = Some(second_sender);

95 vdom.weak()

91 vdom.weak()

@@ -100,25 +96,22 @@ fn updated_listener_is_called() -> impl Future<Item = (), Error = JsValue> {

100 .send("second")

96 .send("second")

101 .expect_throw("should not have dropped the receiver");

97 .expect_throw("should not have dropped the receiver");

102 })))

98 })))

103− .map_err(|e| JsValue::from(e.to_string()))

99+ .await

104− .and_then(move |_| {

100+ .unwrap();

105− target(&container).click();

101+

106−

102+ target(&container).click();

107− first_receiver

103+

108− .select(second_receiver)

104+ match select(first_receiver, second_receiver).await {

109− .map(|(which, _other)| which)

105+ Either::Left((Ok(_), _)) => panic!(),

110− .or_else(|(_error, other)| other)

106+ Either::Left((Err(_), second)) => assert_eq!(second.await, Ok("second")),

111− .map(|which| {

107+ Either::Right((Ok(msg), _)) => assert_eq!(msg, "second"),

112− assert_eq!(which, "second");

108+ Either::Right((Err(_), _)) => panic!(),

113− drop(vdom);

109+ }

114− })

115− .map_err(|e| JsValue::from(e.to_string()))

116− })

117}

110}

118

111

119struct ListensOnlyOnFirstRender {

112struct ListensOnlyOnFirstRender {

120 count: Cell<usize>,

113 count: Cell<usize>,

121− callback: Box<FnMut()>,

114+ callback: Box<dyn FnMut()>,

122}

115}

123

116

124impl ListensOnlyOnFirstRender {

117impl ListensOnlyOnFirstRender {

@@ -133,8 +126,8 @@ impl ListensOnlyOnFirstRender {

133 }

126 }

134}

127}

135

128

136−impl Render for ListensOnlyOnFirstRender {

129+impl<'a> Render<'a> for ListensOnlyOnFirstRender {

137− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

130+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

138 use dodrio::builder::*;

131 use dodrio::builder::*;

139

132

140 let count = self.count.get();

133 let count = self.count.get();

@@ -150,11 +143,11 @@ impl Render for ListensOnlyOnFirstRender {

150 }

143 }

151}

144}

152

145

153−#[wasm_bindgen_test(async)]

146+#[wasm_bindgen_test]

154−fn removed_listener_is_not_called() -> impl Future<Item = (), Error = JsValue> {

147+async fn removed_listener_is_not_called() {

155 let container = create_element("div");

148 let container = create_element("div");

156

149

157− let (outer_sender, outer_receiver) = futures::sync::oneshot::channel();

150+ let (outer_sender, outer_receiver) = futures::channel::oneshot::channel();

158 let outer_sender = Rc::new(RefCell::new(Some(outer_sender)));

151 let outer_sender = Rc::new(RefCell::new(Some(outer_sender)));

159 let outer_listener = Closure::wrap(Box::new(move |_| {

152 let outer_listener = Closure::wrap(Box::new(move |_| {

160 outer_sender

153 outer_sender

@@ -163,13 +156,13 @@ fn removed_listener_is_not_called() -> impl Future<Item = (), Error = JsValue> {

163 .expect_throw("should only invoke outer_listener once")

156 .expect_throw("should only invoke outer_listener once")

164 .send("outer")

157 .send("outer")

165 .expect_throw("should not have dropped receiver");

158 .expect_throw("should not have dropped receiver");

166− }) as Box<FnMut(web_sys::Event)>);

159+ }) as Box<dyn FnMut(web_sys::Event)>);

167

160

168 container

161 container

169 .add_event_listener_with_callback("click", outer_listener.as_ref().unchecked_ref())

162 .add_event_listener_with_callback("click", outer_listener.as_ref().unchecked_ref())

170 .unwrap();

163 .unwrap();

171

164

172− let (vdom_sender, vdom_receiver) = futures::sync::oneshot::channel();

165+ let (vdom_sender, vdom_receiver) = futures::channel::oneshot::channel();

173 let mut vdom_sender = Some(vdom_sender);

166 let mut vdom_sender = Some(vdom_sender);

174

167

175 // Render a vdom with a listener into container.

168 // Render a vdom with a listener into container.

@@ -184,33 +177,26 @@ fn removed_listener_is_not_called() -> impl Future<Item = (), Error = JsValue> {

184 }),

177 }),

185 );

178 );

186

179

187− vdom.weak()

180+ // Re-render, so we aren't listening anymore.

188− // Re-render, so we aren't listening anymore.

181+ vdom.weak().render().await.unwrap();

189− .render()

182+

190− .map_err(|e| JsValue::from(e.to_string()))

183+ target(&container).click();

191− .and_then(move |_| {

184+

192− target(&container).click();

185+ // We should get our container's event handler fired, and not the unmounted

193−

186+ // vdom's event handler.

194− // We should get our container's event handler fired, and not the unmounted

187+ match select(outer_receiver, vdom_receiver).await {

195− // vdom's event handler.

188+ Either::Left((Ok(msg), _)) => assert_eq!(msg, ("outer")),

196− outer_receiver

189+ Either::Left((Err(_), _)) => panic!(),

197− .select(vdom_receiver)

190+ Either::Right((Ok(_), _)) => panic!(),

198− .map(|(which, _other)| which)

191+ Either::Right((Err(_), outer)) => assert_eq!(outer.await, Ok("outer")),

199− .or_else(|(_error, other)| other)

192+ }

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− })

207}

193}

208

194

209−#[wasm_bindgen_test(async)]

195+#[wasm_bindgen_test]

210−fn event_does_not_fire_after_unmounting() -> impl Future<Item = (), Error = JsValue> {

196+async fn event_does_not_fire_after_unmounting() {

211 let container = create_element("div");

197 let container = create_element("div");

212

198

213− let (outer_sender, outer_receiver) = futures::sync::oneshot::channel();

199+ let (outer_sender, outer_receiver) = futures::channel::oneshot::channel();

214 let outer_sender = Rc::new(RefCell::new(Some(outer_sender)));

200 let outer_sender = Rc::new(RefCell::new(Some(outer_sender)));

215 let outer_listener = Closure::wrap(Box::new(move |_| {

201 let outer_listener = Closure::wrap(Box::new(move |_| {

216 outer_sender

202 outer_sender

@@ -219,13 +205,13 @@ fn event_does_not_fire_after_unmounting() -> impl Future<Item = (), Error = JsVa

219 .expect_throw("should only invoke outer_listener once")

205 .expect_throw("should only invoke outer_listener once")

220 .send("outer")

206 .send("outer")

221 .expect_throw("should not have dropped receiver");

207 .expect_throw("should not have dropped receiver");

222− }) as Box<FnMut(web_sys::Event)>);

208+ }) as Box<dyn FnMut(web_sys::Event)>);

223

209

224 container

210 container

225 .add_event_listener_with_callback("click", outer_listener.as_ref().unchecked_ref())

211 .add_event_listener_with_callback("click", outer_listener.as_ref().unchecked_ref())

226 .unwrap();

212 .unwrap();

227

213

228− let (vdom_sender, vdom_receiver) = futures::sync::oneshot::channel();

214+ let (vdom_sender, vdom_receiver) = futures::channel::oneshot::channel();

229 let mut vdom_sender = Some(vdom_sender);

215 let mut vdom_sender = Some(vdom_sender);

230

216

231 // Render a vdom with a listener into container.

217 // Render a vdom with a listener into container.

@@ -255,13 +241,10 @@ fn event_does_not_fire_after_unmounting() -> impl Future<Item = (), Error = JsVa

255

241

256 // We should get our container's event handler fired, and not the unmounted

242 // We should get our container's event handler fired, and not the unmounted

257 // vdom's event handler.

243 // vdom's event handler.

258− outer_receiver

244+ match select(outer_receiver, vdom_receiver).await {

259− .select(vdom_receiver)

245+ Either::Left((Ok(msg), _)) => assert_eq!(msg, ("outer")),

260− .map(|(which, _other)| which)

246+ Either::Left((Err(_), _)) => panic!(),

261− .or_else(|(_error, other)| other)

247+ Either::Right((Ok(_), _)) => panic!(),

262− .map(|which| {

248+ Either::Right((Err(_), outer)) => assert_eq!(outer.await, Ok("outer")),

263− assert_eq!(which, "outer");

249+ }

264− drop(outer_listener);

265− })

266− .map_err(|e| JsValue::from(e.to_string()))

267}

250}

tests/web/js_api.rs+30−37

@@ -1,8 +1,7 @@

1use super::{assert_rendered, create_element, RenderFn};

2use dodrio::{builder::*, Node, Render, RenderContext, Vdom};

3use dodrio_js_api::JsRender;

4−use futures::prelude::*;

4+use futures::channel::oneshot;

5−use futures::sync::oneshot;

6use js_sys::Object;

5use js_sys::Object;

7use std::rc::Rc;

6use std::rc::Rc;

8use wasm_bindgen::prelude::*;

7use wasm_bindgen::prelude::*;

@@ -14,7 +13,7 @@ pub struct WrapJs {

14}

13}

16impl WrapJs {

15impl WrapJs {

17− pub fn new() -> (WrapJs, oneshot::Receiver<()>, Closure<FnMut()>) {

16+ pub fn new() -> (WrapJs, oneshot::Receiver<()>, Closure<dyn FnMut()>) {

18 let (sender, receiver) = oneshot::channel();

17 let (sender, receiver) = oneshot::channel();

20 let on_after_render = Closure::wrap(Box::new({

19 let on_after_render = Closure::wrap(Box::new({

@@ -26,7 +25,7 @@ impl WrapJs {

26 .send(())

25 .send(())

27 .expect_throw("receiver should not have been dropped");

26 .expect_throw("receiver should not have been dropped");

28 }

27 }

29− }) as Box<FnMut()>);

28+ }) as Box<dyn FnMut()>);

31 let component = WrapJs {

30 let component = WrapJs {

32 inner: JsRender::new(JsComponent::new(&on_after_render)),

31 inner: JsRender::new(JsComponent::new(&on_after_render)),

@@ -36,8 +35,8 @@ impl WrapJs {

36 }

35 }

37}

36}

39−impl Render for WrapJs {

38+impl<'a> Render<'a> for WrapJs {

40− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

39+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

41 div(&cx)

40 div(&cx)

42 .attr("class", "wrap-js")

41 .attr("class", "wrap-js")

43 .children([self.inner.render(cx)])

42 .children([self.inner.render(cx)])

@@ -52,7 +51,7 @@ extern "C" {

52 type JsComponent;

51 type JsComponent;

54 #[wasm_bindgen(constructor)]

53 #[wasm_bindgen(constructor)]

55− fn new(on_after_render: &Closure<FnMut()>) -> JsComponent;

54+ fn new(on_after_render: &Closure<dyn FnMut()>) -> JsComponent;

56}

55}

58fn eval_js_rendering_component() {

57fn eval_js_rendering_component() {

@@ -96,14 +95,14 @@ fn eval_js_rendering_component() {

96 });

95 });

97}

96}

99−#[wasm_bindgen_test(async)]

98+#[wasm_bindgen_test]

100−fn can_use_js_rendering_components() -> impl Future<Item = (), Error = JsValue> {

99+async fn can_use_js_rendering_components() {

101 eval_js_rendering_component();

100 eval_js_rendering_component();

102

101

103 let container = create_element("div");

102 let container = create_element("div");

104− let (component, receiver, closure) = WrapJs::new();

103+ let (component, receiver, _closure) = WrapJs::new();

104+ let _vdom = Rc::new(Vdom::new(&container, component));

105

106− let vdom = Rc::new(Vdom::new(&container, component));

107 assert_rendered(

106 assert_rendered(

108 &container,

107 &container,

109 &RenderFn(|cx| {

108 &RenderFn(|cx| {

@@ -131,30 +130,24 @@ fn can_use_js_rendering_components() -> impl Future<Item = (), Error = JsValue>

131 .expect_throw("should be an `HTMLElement` object")

130 .expect_throw("should be an `HTMLElement` object")

132 .click();

131 .click();

133

132

134− receiver

133+ receiver.await.unwrap();

135− .map(move |_| {

134+

136− assert_rendered(

135+ assert_rendered(

137− &container,

136+ &container,

138− &RenderFn(|cx| {

137+ &RenderFn(|cx| {

139− div(&cx)

138+ div(&cx)

140− .attr("class", "wrap-js")

139+ .attr("class", "wrap-js")

141− .children([span(&cx)

140+ .children([span(&cx)

142− .attr("class", "js-component")

141+ .attr("class", "js-component")

143− .children([

142+ .children([

144− text("Here is some plain text"),

143+ text("Here is some plain text"),

145− b(&cx)

144+ b(&cx)

146− .children([text("...and here is some bold text")])

145+ .children([text("...and here is some bold text")])

147− .finish(),

146+ .finish(),

148− text("1"),

147+ text("1"),

149− ])

148+ ])

150− .finish()])

149+ .finish()])

151− .finish()

150+ .finish()

152− }),

151+ }),

153− );

152+ );

154−

155− drop(vdom);

156− drop(container);

157− drop(closure);

158− })

159− .map_err(|e| e.to_string().into())

160}

153}

tests/web/keyed.rs+18−19

@@ -1,6 +1,5 @@

1use crate::{assert_rendered, create_element};

2use dodrio::{builder::*, bumpalo, Node, Render, RenderContext, Vdom};

3−use futures::Future;

4use log::*;

3use log::*;

5use std::rc::Rc;

4use std::rc::Rc;

6use wasm_bindgen::prelude::*;

5use wasm_bindgen::prelude::*;

@@ -8,8 +7,8 @@ use wasm_bindgen_test::*;

9struct Keyed(u16);

8struct Keyed(u16);

11−impl Render for Keyed {

10+impl<'a> Render<'a> for Keyed {

12− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

11+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

13 let key = bumpalo::format!(in cx.bump, "{}", self.0).into_bump_str();

12 let key = bumpalo::format!(in cx.bump, "{}", self.0).into_bump_str();

14 div(&cx)

13 div(&cx)

15 .attr("class", "keyed")

14 .attr("class", "keyed")

@@ -32,13 +31,10 @@ where

32 parent.finish()

31 parent.finish()

33}

32}

35−fn assert_keyed<Before, After>(

34+async fn assert_keyed<Before, After>(before: Before, after: After) -> Result<(), JsValue>

36− before: Before,

37− after: After,

38−) -> impl Future<Item = (), Error = JsValue>

39where

35where

40− Before: 'static + Render,

36+ Before: 'static + for<'a> Render<'a>,

41− After: 'static + Render,

37+ After: 'static + for<'a> Render<'a>,

42{

38{

43 #[wasm_bindgen(module = "/tests/web/keyed.js")]

39 #[wasm_bindgen(module = "/tests/web/keyed.js")]

44 extern "C" {

40 extern "C" {

@@ -56,7 +52,7 @@ where

57 debug!("====== Rendering the *before* DOM into the physical DOM ======");

53 debug!("====== Rendering the *before* DOM into the physical DOM ======");

58 let vdom1 = Rc::new(Vdom::new(&container, before.clone()));

54 let vdom1 = Rc::new(Vdom::new(&container, before.clone()));

59− let vdom2 = vdom1.clone();

55+ let _vdom2 = vdom1.clone();

60 let saved = save_keyed_elements(&container);

56 let saved = save_keyed_elements(&container);

62 debug!("====== Checking the *before* DOM against the physical DOM ======");

58 debug!("====== Checking the *before* DOM against the physical DOM ======");

@@ -65,13 +61,14 @@ where

65 debug!("====== Rendering the *after* DOM into the physical DOM ======");

61 debug!("====== Rendering the *after* DOM into the physical DOM ======");

66 let weak = vdom1.weak();

62 let weak = vdom1.weak();

67 weak.set_component(Box::new(after.clone()))

63 weak.set_component(Box::new(after.clone()))

68− .map(move |_| {

64+ .await

69− debug!("====== Checking the *after* DOM against the physical DOM ======");

65+ .map_err(|e| e.to_string())?;

70− assert_rendered(&container, &after);

66+

71− check_keyed_elements(&container, saved);

67+ debug!("====== Checking the *after* DOM against the physical DOM ======");

72− drop(vdom2);

68+ assert_rendered(&container, &after);

73− })

69+ check_keyed_elements(&container, saved);

74− .map_err(|e| JsValue::from(e.to_string()))

70+

71+ Ok(())

75}

72}

77macro_rules! keyed_tests {

74macro_rules! keyed_tests {

@@ -86,14 +83,16 @@ macro_rules! keyed_tests {

86 }

83 }

87 )* ) => {

84 )* ) => {

88 $(

85 $(

89− #[wasm_bindgen_test(async)]

86+ #[wasm_bindgen_test]

90− fn $name() -> impl Future<Item = (), Error = wasm_bindgen::JsValue> {

87+ async fn $name() {

91 use crate::RenderFn;

88 use crate::RenderFn;

92 log::debug!("############### {} ###############", stringify!($name));

89 log::debug!("############### {} ###############", stringify!($name));

93 assert_keyed(

90 assert_keyed(

94 RenderFn(|$before_cx| { $( $before )* }),

91 RenderFn(|$before_cx| { $( $before )* }),

95 RenderFn(|$after_cx| { $( $after )* }),

92 RenderFn(|$after_cx| { $( $after )* }),

96 )

93 )

94+ .await

95+ .unwrap()

97 }

96 }

98 )*

97 )*

99 }

98 }

tests/web/main.rs+23−19

@@ -6,7 +6,7 @@ use bumpalo::Bump;

6use dodrio::{

7 Attribute, CachedSet, ElementNode, Node, NodeKind, Render, RenderContext, TextNode, Vdom,

8};

9−use futures::prelude::*;

9+use fxhash::FxHashMap;

10use log::*;

11use std::cell::RefCell;

12use std::rc::Rc;

@@ -50,12 +50,13 @@ pub fn init_logging() {

51/// Assert that the `container` contains the physical DOM tree that matches

52/// `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) {

54 init_logging();

56 let cached_set = &RefCell::new(CachedSet::default());

57 let bump = &Bump::new();

58− let cx = &mut RenderContext::new(bump, cached_set);

58+ let templates = &mut FxHashMap::default();

59+ let cx = &mut RenderContext::new(bump, cached_set, templates);

59 let node = r.render(cx);

60 let node = r.render(cx);

60 let child = container

61 let child = container

61 .first_child()

62 .first_child()

@@ -111,7 +112,7 @@ pub fn assert_rendered<R: Render>(container: &web_sys::Element, r: &R) {

111 }

112 }

113 }

113 NodeKind::Cached(ref c) => {

114 NodeKind::Cached(ref c) => {

114− let expected = cached_set.get(c.id);

115+ let (expected, _template) = cached_set.get(c.id);

115 check_node(cached_set, actual, &expected);

116 check_node(cached_set, actual, &expected);

116 }

117 }

118 }

@@ -154,11 +155,11 @@ pub struct RenderFn<F>(F)

154where

155where

155 F: for<'a> Fn(&mut RenderContext<'a>) -> Node<'a>;

156 F: for<'a> Fn(&mut RenderContext<'a>) -> Node<'a>;

156

157

157−impl<F> Render for RenderFn<F>

158+impl<'a, F> Render<'a> for RenderFn<F>

158where

159where

159− F: for<'a> Fn(&mut RenderContext<'a>) -> Node<'a>,

160+ F: for<'b> Fn(&mut RenderContext<'b>) -> Node<'b>,

160{

161{

161− fn render<'a>(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

162+ fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> {

162 (self.0)(cx)

163 (self.0)(cx)

163 }

164 }

164}

165}

@@ -166,10 +167,10 @@ where

166/// Assert that if we start by rendering the `before` virtual DOM tree into a

167/// Assert that if we start by rendering the `before` virtual DOM tree into a

167/// physical DOM tree, and then diff it with the `after` virtual DOM tree, then

168/// physical DOM tree, and then diff it with the `after` virtual DOM tree, then

168/// the physical DOM tree correctly matches `after`.

169/// the physical DOM tree correctly matches `after`.

169−pub fn assert_before_after<R, S>(before: R, after: S) -> impl Future<Item = (), Error = JsValue>

170+pub async fn assert_before_after<R, S>(before: R, after: S) -> Result<(), JsValue>

170where

171where

171− R: 'static + Render,

172+ R: 'static + for<'a> Render<'a>,

172− S: 'static + Render,

173+ S: 'static + for<'a> Render<'a>,

173{

174{

174 let container = create_element("div");

175 let container = create_element("div");

175

176

@@ -178,7 +179,7 @@ where

178

179

179 debug!("====== Rendering the *before* DOM into the physical DOM ======");

180 debug!("====== Rendering the *before* DOM into the physical DOM ======");

180 let vdom1 = Rc::new(Vdom::new(&container, before.clone()));

181 let vdom1 = Rc::new(Vdom::new(&container, before.clone()));

181− let vdom2 = vdom1.clone();

182+ let _vdom2 = vdom1.clone();

182

183

183 debug!("====== Checking the *before* DOM against the physical DOM ======");

184 debug!("====== Checking the *before* DOM against the physical DOM ======");

184 assert_rendered(&container, &before);

185 assert_rendered(&container, &before);

@@ -186,12 +187,13 @@ where

186 debug!("====== Rendering the *after* DOM into the physical DOM ======");

187 debug!("====== Rendering the *after* DOM into the physical DOM ======");

187 let weak = vdom1.weak();

188 let weak = vdom1.weak();

188 weak.set_component(Box::new(after.clone()))

189 weak.set_component(Box::new(after.clone()))

189− .map(move |_| {

190+ .await

190− debug!("====== Checking the *after* DOM against the physical DOM ======");

191+ .map_err(|e| e.to_string())?;

191− assert_rendered(&container, &after);

192+

192− drop(vdom2);

193+ debug!("====== Checking the *after* DOM against the physical DOM ======");

193− })

194+ assert_rendered(&container, &after);

194− .map_err(|e| JsValue::from(e.to_string()))

195+

196+ Ok(())

195}

197}

196

198

197/// A helper macro for declaring a bunch of `assert_before_after` tests.

199/// A helper macro for declaring a bunch of `assert_before_after` tests.

@@ -208,14 +210,16 @@ macro_rules! before_after {

208 }

210 }

209 )* ) => {

211 )* ) => {

210 $(

212 $(

211− #[wasm_bindgen_test(async)]

213+ #[wasm_bindgen_test]

212− fn $name() -> impl Future<Item = (), Error = wasm_bindgen::JsValue> {

214+ async fn $name() {

213 use crate::{assert_before_after, RenderFn};

215 use crate::{assert_before_after, RenderFn};

214 log::debug!("############### {} ###############", stringify!($name));

216 log::debug!("############### {} ###############", stringify!($name));

215 assert_before_after(

217 assert_before_after(

216 RenderFn(|$before_bump| { $( $before )* }),

218 RenderFn(|$before_bump| { $( $before )* }),

217 RenderFn(|$after_bump| { $( $after )* })

219 RenderFn(|$after_bump| { $( $after )* })

218 )

220 )

221+ .await

222+ .unwrap()

219 }

223 }

220 )*

224 )*

221 }

225 }

tests/web/render.rs+89−2

@@ -1,7 +1,7 @@

1use super::{assert_rendered, before_after, create_element, RenderFn};

2−use dodrio::{builder::*, Vdom};

2+use dodrio::{builder::*, bumpalo::collections::String, Node, Render, RenderContext, Vdom};

3−use futures::prelude::*;

4use std::rc::Rc;

3use std::rc::Rc;

4+use wasm_bindgen::{ JsCast};

5use wasm_bindgen_test::*;

7#[wasm_bindgen_test]

@@ -35,6 +35,93 @@ fn container_is_emptied_upon_drop() {

35 assert!(container.first_child().is_none());

36}

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+

38before_after! {

125before_after! {

39 same_text {

126 same_text {

40 before(_cx) {

127 before(_cx) {