| blob | 79b7240b96f882d2aa76ff00c837105811abd8ee |
1 diff --git a/Cargo.lock b/Cargo.lock
2 index ae63793..4068e02 100644
3 --- a/Cargo.lock
4 +++ b/Cargo.lock
5 @@ -162,12 +162,46 @@ dependencies = [
6 "ansi_term",
7 "atty",
8 "bitflags",
9 - "strsim",
10 - "textwrap",
11 + "strsim 0.8.0",
12 + "textwrap 0.11.0",
13 "unicode-width",
14 "vec_map",
15 ]
17 +[[package]]
18 +name = "clap"
19 +version = "3.2.2"
20 +source = "registry+https://github.com/rust-lang/crates.io-index"
21 +checksum = "8e538f9ee5aa3b3963f09a997035f883677966ed50fce0292611927ce6f6d8c6"
22 +dependencies = [
23 + "atty",
24 + "bitflags",
25 + "clap_lex",
26 + "indexmap",
27 + "lazy_static",
28 + "strsim 0.10.0",
29 + "termcolor",
30 + "textwrap 0.15.1",
31 +]
32 +
33 +[[package]]
34 +name = "clap_complete"
35 +version = "3.2.5"
36 +source = "registry+https://github.com/rust-lang/crates.io-index"
37 +checksum = "3f7a2e0a962c45ce25afce14220bc24f9dade0a1787f185cecf96bfba7847cd8"
38 +dependencies = [
39 + "clap 3.2.2",
40 +]
41 +
42 +[[package]]
43 +name = "clap_lex"
44 +version = "0.2.4"
45 +source = "registry+https://github.com/rust-lang/crates.io-index"
46 +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
47 +dependencies = [
48 + "os_str_bytes",
49 +]
50 +
51 [[package]]
52 name = "cpufeatures"
53 version = "0.2.1"
54 @@ -222,9 +256,9 @@ dependencies = [
56 [[package]]
57 name = "env_logger"
58 -version = "0.7.1"
59 +version = "0.9.1"
60 source = "registry+https://github.com/rust-lang/crates.io-index"
61 -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
62 +checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272"
63 dependencies = [
64 "atty",
65 "humantime",
66 @@ -385,15 +419,6 @@ dependencies = [
67 "version_check",
68 ]
70 -[[package]]
71 -name = "getopts"
72 -version = "0.2.21"
73 -source = "registry+https://github.com/rust-lang/crates.io-index"
74 -checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
75 -dependencies = [
76 - "unicode-width",
77 -]
78 -
79 [[package]]
80 name = "getrandom"
81 version = "0.1.16"
82 @@ -471,7 +496,7 @@ dependencies = [
83 "log",
84 "pest",
85 "pest_derive",
86 - "quick-error 2.0.1",
87 + "quick-error",
88 "serde",
89 "serde_json",
90 ]
91 @@ -575,12 +600,9 @@ checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440"
93 [[package]]
94 name = "humantime"
95 -version = "1.3.0"
96 +version = "2.1.0"
97 source = "registry+https://github.com/rust-lang/crates.io-index"
98 -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
99 -dependencies = [
100 - "quick-error 1.2.3",
101 -]
102 +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
104 [[package]]
105 name = "hyper"
106 @@ -822,13 +844,14 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
108 [[package]]
109 name = "mdbook"
110 -version = "0.4.15"
111 +version = "0.4.21"
112 source = "registry+https://github.com/rust-lang/crates.io-index"
113 -checksum = "241f10687eb3b4e0634b3b4e423f97c5f1efbd69dc9522e24a8b94583eeec3c6"
114 +checksum = "23f3e133c6d515528745ffd3b9f0c7d975ae039f0b6abb099f2168daa2afb4f9"
115 dependencies = [
116 "anyhow",
117 "chrono",
118 - "clap",
119 + "clap 3.2.2",
120 + "clap_complete",
121 "env_logger",
122 "handlebars",
123 "lazy_static",
124 @@ -838,7 +861,6 @@ dependencies = [
125 "pulldown-cmark",
126 "regex",
127 "serde",
128 - "serde_derive",
129 "serde_json",
130 "shlex",
131 "tempfile",
132 @@ -1062,6 +1084,12 @@ dependencies = [
133 "winapi 0.3.9",
134 ]
136 +[[package]]
137 +name = "os_str_bytes"
138 +version = "6.3.0"
139 +source = "registry+https://github.com/rust-lang/crates.io-index"
140 +checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"
141 +
142 [[package]]
143 name = "parking_lot"
144 version = "0.11.2"
145 @@ -1258,17 +1286,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
146 checksum = "34f197a544b0c9ab3ae46c359a7ec9cbbb5c7bf97054266fecb7ead794a181d6"
147 dependencies = [
148 "bitflags",
149 - "getopts",
150 "memchr",
151 "unicase",
152 ]
154 -[[package]]
155 -name = "quick-error"
156 -version = "1.2.3"
157 -source = "registry+https://github.com/rust-lang/crates.io-index"
158 -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
159 -
160 [[package]]
161 name = "quick-error"
162 version = "2.0.1"
163 @@ -1386,9 +1407,9 @@ dependencies = [
165 [[package]]
166 name = "regex"
167 -version = "1.5.4"
168 +version = "1.6.0"
169 source = "registry+https://github.com/rust-lang/crates.io-index"
170 -checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
171 +checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
172 dependencies = [
173 "aho-corasick",
174 "memchr",
175 @@ -1403,9 +1424,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
177 [[package]]
178 name = "regex-syntax"
179 -version = "0.6.25"
180 +version = "0.6.27"
181 source = "registry+https://github.com/rust-lang/crates.io-index"
182 -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
183 +checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
185 [[package]]
186 name = "remove_dir_all"
187 @@ -1577,13 +1598,19 @@ version = "0.8.0"
188 source = "registry+https://github.com/rust-lang/crates.io-index"
189 checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
191 +[[package]]
192 +name = "strsim"
193 +version = "0.10.0"
194 +source = "registry+https://github.com/rust-lang/crates.io-index"
195 +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
196 +
197 [[package]]
198 name = "structopt"
199 version = "0.3.26"
200 source = "registry+https://github.com/rust-lang/crates.io-index"
201 checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10"
202 dependencies = [
203 - "clap",
204 + "clap 2.33.3",
205 "lazy_static",
206 "structopt-derive",
207 ]
208 @@ -1673,6 +1700,12 @@ dependencies = [
209 "unicode-width",
210 ]
212 +[[package]]
213 +name = "textwrap"
214 +version = "0.15.1"
215 +source = "registry+https://github.com/rust-lang/crates.io-index"
216 +checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16"
217 +
218 [[package]]
219 name = "thiserror"
220 version = "1.0.30"
221 diff --git a/Cargo.toml b/Cargo.toml
222 index dfeeb45..8b1e4e5 100644
223 --- a/Cargo.toml
224 +++ b/Cargo.toml
225 @@ -38,7 +38,7 @@ handlebars = "4.2.1"
226 ignore = "0.4.18"
227 lazy_static = "1.4.0"
228 lazy-regex = "2.2.2"
229 -mdbook = { version = "0.4.15", default-features = false }
230 +mdbook = { version = "0.4.21", default-features = false }
231 notify = "4.0.17"
232 pest = "2.1.3"
233 pest_derive = "2.1.0"
234 diff --git a/src/renderer/mdzk_renderer.rs b/src/renderer/mdzk_renderer.rs
235 index 55b2423..f8480ca 100644
236 --- a/src/renderer/mdzk_renderer.rs
237 +++ b/src/renderer/mdzk_renderer.rs
238 @@ -92,7 +92,7 @@ impl Renderer for HtmlMdzk {
239 "description",
240 json!(ctx.config.book.description.clone().unwrap_or_default()),
241 );
242 - if let Some(ref livereload) = html_config.livereload_url {
243 + if let Some(ref livereload) = html_config.live_reload_endpoint {
244 data.insert("livereload", json!(livereload));
245 }
246 data.insert("fold_enable", json!(html_config.fold.enable));