summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMinijackson <minijackson@riseup.net>2019-11-23 19:27:21 +0100
committerMinijackson <minijackson@riseup.net>2019-11-23 19:31:58 +0100
commit860b73f1644ecd6548ae403ec483625fb7b625ea (patch)
tree1e0ab5ecf2a77a66e2a176364ecb151a58468426
parent304d9f220cc208dd78fce11b703354ecd8d2168c (diff)
downloadposeidoc-860b73f1644ecd6548ae403ec483625fb7b625ea.tar.gz
poseidoc-860b73f1644ecd6548ae403ec483625fb7b625ea.zip
entities rework, allow "inline" documentation, merge config with cli
Diffstat
-rw-r--r--.envrc1
-rw-r--r--Cargo.lock259
-rw-r--r--Cargo.toml5
-rw-r--r--examples/.gitignore (renamed from res/.gitignore)0
-rw-r--r--examples/goal.md (renamed from res/goal.md)0
-rw-r--r--examples/sample-doxygen-project-1/Doxyfile (renamed from res/sample-doxygen-project-1/Doxyfile)0
-rw-r--r--examples/sample-doxygen-project-1/main.cpp (renamed from res/sample-doxygen-project-1/main.cpp)0
-rw-r--r--examples/sample-markdown-project-1/Doxyfile (renamed from res/sample-markdown-project-1/Doxyfile)0
-rw-r--r--examples/sample-markdown-project-1/main.cpp (renamed from res/sample-markdown-project-1/main.cpp)0
-rw-r--r--examples/sample-markdown-project-1/poseidoc.toml (renamed from res/sample-markdown-project-1/poseidoc.toml)0
-rw-r--r--src/config.rs54
-rw-r--r--src/entities.rs142
-rw-r--r--src/generator.rs146
-rw-r--r--src/main.rs16
-rw-r--r--src/pandoc.rs204
-rw-r--r--src/pandoc/types.rs39
-rw-r--r--src/parsing.rs55
17 files changed, 588 insertions, 333 deletions
diff --git a/.envrc b/.envrc
new file mode 100644
index 0000000..be81fed
--- /dev/null
+++ b/.envrc
@@ -0,0 +1 @@
eval "$(lorri direnv)" \ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index f8735bd..d53e912 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -18,7 +18,7 @@ dependencies = [
18 18
19[[package]] 19[[package]]
20name = "anyhow" 20name = "anyhow"
21version = "1.0.19" 21version = "1.0.23"
22source = "registry+https://github.com/rust-lang/crates.io-index" 22source = "registry+https://github.com/rust-lang/crates.io-index"
23 23
24[[package]] 24[[package]]
@@ -41,6 +41,14 @@ version = "1.2.1"
41source = "registry+https://github.com/rust-lang/crates.io-index" 41source = "registry+https://github.com/rust-lang/crates.io-index"
42 42
43[[package]] 43[[package]]
44name = "c2-chacha"
45version = "0.2.3"
46source = "registry+https://github.com/rust-lang/crates.io-index"
47dependencies = [
48 "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
49]
50
51[[package]]
44name = "cfg-if" 52name = "cfg-if"
45version = "0.1.10" 53version = "0.1.10"
46source = "registry+https://github.com/rust-lang/crates.io-index" 54source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -52,7 +60,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
52dependencies = [ 60dependencies = [
53 "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", 61 "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
54 "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", 62 "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
55 "num-traits 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", 63 "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
56 "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", 64 "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
57] 65]
58 66
@@ -104,6 +112,51 @@ dependencies = [
104] 112]
105 113
106[[package]] 114[[package]]
115name = "crossbeam-deque"
116version = "0.7.2"
117source = "registry+https://github.com/rust-lang/crates.io-index"
118dependencies = [
119 "crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
120 "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
121]
122
123[[package]]
124name = "crossbeam-epoch"
125version = "0.8.0"
126source = "registry+https://github.com/rust-lang/crates.io-index"
127dependencies = [
128 "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
129 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
130 "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
131 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
132 "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
133 "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
134]
135
136[[package]]
137name = "crossbeam-queue"
138version = "0.2.0"
139source = "registry+https://github.com/rust-lang/crates.io-index"
140dependencies = [
141 "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
142]
143
144[[package]]
145name = "crossbeam-utils"
146version = "0.7.0"
147source = "registry+https://github.com/rust-lang/crates.io-index"
148dependencies = [
149 "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
150 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
151 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
152]
153
154[[package]]
155name = "either"
156version = "1.5.3"
157source = "registry+https://github.com/rust-lang/crates.io-index"
158
159[[package]]
107name = "env_logger" 160name = "env_logger"
108version = "0.6.2" 161version = "0.6.2"
109source = "registry+https://github.com/rust-lang/crates.io-index" 162source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -116,6 +169,16 @@ dependencies = [
116] 169]
117 170
118[[package]] 171[[package]]
172name = "getrandom"
173version = "0.1.13"
174source = "registry+https://github.com/rust-lang/crates.io-index"
175dependencies = [
176 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
177 "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
178 "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
179]
180
181[[package]]
119name = "glob" 182name = "glob"
120version = "0.3.0" 183version = "0.3.0"
121source = "registry+https://github.com/rust-lang/crates.io-index" 184source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -173,17 +236,25 @@ version = "2.2.1"
173source = "registry+https://github.com/rust-lang/crates.io-index" 236source = "registry+https://github.com/rust-lang/crates.io-index"
174 237
175[[package]] 238[[package]]
239name = "memoffset"
240version = "0.5.3"
241source = "registry+https://github.com/rust-lang/crates.io-index"
242dependencies = [
243 "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
244]
245
246[[package]]
176name = "num-integer" 247name = "num-integer"
177version = "0.1.41" 248version = "0.1.41"
178source = "registry+https://github.com/rust-lang/crates.io-index" 249source = "registry+https://github.com/rust-lang/crates.io-index"
179dependencies = [ 250dependencies = [
180 "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", 251 "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
181 "num-traits 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", 252 "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
182] 253]
183 254
184[[package]] 255[[package]]
185name = "num-traits" 256name = "num-traits"
186version = "0.2.9" 257version = "0.2.10"
187source = "registry+https://github.com/rust-lang/crates.io-index" 258source = "registry+https://github.com/rust-lang/crates.io-index"
188dependencies = [ 259dependencies = [
189 "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", 260 "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -217,7 +288,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
217name = "poseidoc" 288name = "poseidoc"
218version = "0.1.0" 289version = "0.1.0"
219dependencies = [ 290dependencies = [
220 "anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", 291 "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)",
221 "clang 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", 292 "clang 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)",
222 "codemap 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", 293 "codemap 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
223 "codemap-diagnostic 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", 294 "codemap-diagnostic 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -226,18 +297,24 @@ dependencies = [
226 "pandoc_types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", 297 "pandoc_types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
227 "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 298 "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
228 "pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", 299 "pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
300 "rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
229 "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", 301 "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
230 "serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", 302 "serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
231 "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", 303 "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
232 "shell-words 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 304 "shell-words 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
233 "structopt 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", 305 "structopt 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
234 "thiserror 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", 306 "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
235 "threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)", 307 "thiserror 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
236 "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", 308 "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
237 "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", 309 "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
238] 310]
239 311
240[[package]] 312[[package]]
313name = "ppv-lite86"
314version = "0.2.6"
315source = "registry+https://github.com/rust-lang/crates.io-index"
316
317[[package]]
241name = "pretty_env_logger" 318name = "pretty_env_logger"
242version = "0.3.1" 319version = "0.3.1"
243source = "registry+https://github.com/rust-lang/crates.io-index" 320source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -279,6 +356,65 @@ dependencies = [
279] 356]
280 357
281[[package]] 358[[package]]
359name = "rand"
360version = "0.7.2"
361source = "registry+https://github.com/rust-lang/crates.io-index"
362dependencies = [
363 "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
364 "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
365 "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
366 "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
367 "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
368]
369
370[[package]]
371name = "rand_chacha"
372version = "0.2.1"
373source = "registry+https://github.com/rust-lang/crates.io-index"
374dependencies = [
375 "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
376 "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
377]
378
379[[package]]
380name = "rand_core"
381version = "0.5.1"
382source = "registry+https://github.com/rust-lang/crates.io-index"
383dependencies = [
384 "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
385]
386
387[[package]]
388name = "rand_hc"
389version = "0.2.0"
390source = "registry+https://github.com/rust-lang/crates.io-index"
391dependencies = [
392 "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
393]
394
395[[package]]
396name = "rayon"
397version = "1.2.1"
398source = "registry+https://github.com/rust-lang/crates.io-index"
399dependencies = [
400 "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
401 "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
402 "rayon-core 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
403]
404
405[[package]]
406name = "rayon-core"
407version = "1.6.1"
408source = "registry+https://github.com/rust-lang/crates.io-index"
409dependencies = [
410 "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
411 "crossbeam-queue 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
412 "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
413 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
414 "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
415]
416
417[[package]]
282name = "redox_syscall" 418name = "redox_syscall"
283version = "0.1.56" 419version = "0.1.56"
284source = "registry+https://github.com/rust-lang/crates.io-index" 420source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -300,11 +436,45 @@ version = "0.6.12"
300source = "registry+https://github.com/rust-lang/crates.io-index" 436source = "registry+https://github.com/rust-lang/crates.io-index"
301 437
302[[package]] 438[[package]]
439name = "remove_dir_all"
440version = "0.5.2"
441source = "registry+https://github.com/rust-lang/crates.io-index"
442dependencies = [
443 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
444]
445
446[[package]]
447name = "rustc_version"
448version = "0.2.3"
449source = "registry+https://github.com/rust-lang/crates.io-index"
450dependencies = [
451 "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
452]
453
454[[package]]
303name = "ryu" 455name = "ryu"
304version = "1.0.2" 456version = "1.0.2"
305source = "registry+https://github.com/rust-lang/crates.io-index" 457source = "registry+https://github.com/rust-lang/crates.io-index"
306 458
307[[package]] 459[[package]]
460name = "scopeguard"
461version = "1.0.0"
462source = "registry+https://github.com/rust-lang/crates.io-index"
463
464[[package]]
465name = "semver"
466version = "0.9.0"
467source = "registry+https://github.com/rust-lang/crates.io-index"
468dependencies = [
469 "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
470]
471
472[[package]]
473name = "semver-parser"
474version = "0.7.0"
475source = "registry+https://github.com/rust-lang/crates.io-index"
476
477[[package]]
308name = "serde" 478name = "serde"
309version = "1.0.102" 479version = "1.0.102"
310source = "registry+https://github.com/rust-lang/crates.io-index" 480source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -341,16 +511,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
341 511
342[[package]] 512[[package]]
343name = "structopt" 513name = "structopt"
344version = "0.3.4" 514version = "0.3.5"
345source = "registry+https://github.com/rust-lang/crates.io-index" 515source = "registry+https://github.com/rust-lang/crates.io-index"
346dependencies = [ 516dependencies = [
347 "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", 517 "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
348 "structopt-derive 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", 518 "structopt-derive 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
349] 519]
350 520
351[[package]] 521[[package]]
352name = "structopt-derive" 522name = "structopt-derive"
353version = "0.3.4" 523version = "0.3.5"
354source = "registry+https://github.com/rust-lang/crates.io-index" 524source = "registry+https://github.com/rust-lang/crates.io-index"
355dependencies = [ 525dependencies = [
356 "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", 526 "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -371,6 +541,19 @@ dependencies = [
371] 541]
372 542
373[[package]] 543[[package]]
544name = "tempfile"
545version = "3.1.0"
546source = "registry+https://github.com/rust-lang/crates.io-index"
547dependencies = [
548 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
549 "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
550 "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
551 "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
552 "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
553 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
554]
555
556[[package]]
374name = "termcolor" 557name = "termcolor"
375version = "1.0.5" 558version = "1.0.5"
376source = "registry+https://github.com/rust-lang/crates.io-index" 559source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -388,15 +571,15 @@ dependencies = [
388 571
389[[package]] 572[[package]]
390name = "thiserror" 573name = "thiserror"
391version = "1.0.5" 574version = "1.0.6"
392source = "registry+https://github.com/rust-lang/crates.io-index" 575source = "registry+https://github.com/rust-lang/crates.io-index"
393dependencies = [ 576dependencies = [
394 "thiserror-impl 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", 577 "thiserror-impl 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
395] 578]
396 579
397[[package]] 580[[package]]
398name = "thiserror-impl" 581name = "thiserror-impl"
399version = "1.0.5" 582version = "1.0.6"
400source = "registry+https://github.com/rust-lang/crates.io-index" 583source = "registry+https://github.com/rust-lang/crates.io-index"
401dependencies = [ 584dependencies = [
402 "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", 585 "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -413,14 +596,6 @@ dependencies = [
413] 596]
414 597
415[[package]] 598[[package]]
416name = "threadpool"
417version = "1.7.1"
418source = "registry+https://github.com/rust-lang/crates.io-index"
419dependencies = [
420 "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
421]
422
423[[package]]
424name = "time" 599name = "time"
425version = "0.1.42" 600version = "0.1.42"
426source = "registry+https://github.com/rust-lang/crates.io-index" 601source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -459,6 +634,11 @@ version = "0.8.1"
459source = "registry+https://github.com/rust-lang/crates.io-index" 634source = "registry+https://github.com/rust-lang/crates.io-index"
460 635
461[[package]] 636[[package]]
637name = "wasi"
638version = "0.7.0"
639source = "registry+https://github.com/rust-lang/crates.io-index"
640
641[[package]]
462name = "winapi" 642name = "winapi"
463version = "0.3.8" 643version = "0.3.8"
464source = "registry+https://github.com/rust-lang/crates.io-index" 644source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -502,10 +682,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
502[metadata] 682[metadata]
503"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" 683"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d"
504"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" 684"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
505"checksum anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)" = "57114fc2a6cc374bce195d3482057c846e706d252ff3604363449695684d7a0d" 685"checksum anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)" = "6f1072d8f55592084072d2d3cb23a4b680a8543c00f10d446118e85ad3718142"
506"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" 686"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
507"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" 687"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
508"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" 688"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
689"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
509"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" 690"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
510"checksum chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e8493056968583b0193c1bb04d6f7684586f3726992d6c573261941a895dbd68" 691"checksum chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e8493056968583b0193c1bb04d6f7684586f3726992d6c573261941a895dbd68"
511"checksum clang 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)" = "edaa418fdc81a329f3c8258a4e8776f7d2c31682147c5bda1c5c37ab8e818114" 692"checksum clang 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)" = "edaa418fdc81a329f3c8258a4e8776f7d2c31682147c5bda1c5c37ab8e818114"
@@ -513,7 +694,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
513"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" 694"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
514"checksum codemap 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa90095b7cbcca06055fed0e0bc0dcfc66a841bd9ea62bab2303a41e092ed72" 695"checksum codemap 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa90095b7cbcca06055fed0e0bc0dcfc66a841bd9ea62bab2303a41e092ed72"
515"checksum codemap-diagnostic 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ba0e6be8e2774e750f9e90625b490249715bece38a12f9d09e82477caba5028" 696"checksum codemap-diagnostic 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ba0e6be8e2774e750f9e90625b490249715bece38a12f9d09e82477caba5028"
697"checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca"
698"checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac"
699"checksum crossbeam-queue 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dfd6515864a82d2f877b42813d4553292c6659498c9a2aa31bab5a15243c2700"
700"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4"
701"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
516"checksum env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3" 702"checksum env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3"
703"checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407"
517"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" 704"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
518"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" 705"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
519"checksum hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120" 706"checksum hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120"
@@ -523,40 +710,54 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
523"checksum libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8" 710"checksum libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8"
524"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" 711"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
525"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" 712"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
713"checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9"
526"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" 714"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09"
527"checksum num-traits 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "443c53b3c3531dfcbfa499d8893944db78474ad7a1d87fa2d94d1a2231693ac6" 715"checksum num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c81ffc11c212fa327657cb19dd85eb7419e163b5b076bede2bdb5c974c07e4"
528"checksum num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72" 716"checksum num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72"
529"checksum pandoc_types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "29869c4f0ed84c2514105047415ff220679d7dbe566982c32f60a5c330cb77ed" 717"checksum pandoc_types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "29869c4f0ed84c2514105047415ff220679d7dbe566982c32f60a5c330cb77ed"
530"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" 718"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
719"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
531"checksum pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "717ee476b1690853d222af4634056d830b5197ffd747726a9a1eee6da9f49074" 720"checksum pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "717ee476b1690853d222af4634056d830b5197ffd747726a9a1eee6da9f49074"
532"checksum proc-macro-error 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aeccfe4d5d8ea175d5f0e4a2ad0637e0f4121d63bd99d356fb1f39ab2e7c6097" 721"checksum proc-macro-error 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aeccfe4d5d8ea175d5f0e4a2ad0637e0f4121d63bd99d356fb1f39ab2e7c6097"
533"checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27" 722"checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27"
534"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" 723"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
535"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" 724"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
725"checksum rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412"
726"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
727"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
728"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
729"checksum rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "43739f8831493b276363637423d3622d4bd6394ab6f0a9c4a552e208aeb7fddd"
730"checksum rayon-core 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8bf17de6f23b05473c437eb958b9c850bfc8af0961fe17b4cc92d5a627b4791"
536"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" 731"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
537"checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" 732"checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd"
538"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" 733"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716"
734"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
735"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
539"checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8" 736"checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
737"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
738"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
739"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
540"checksum serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4b39bd9b0b087684013a792c59e3e07a46a01d2322518d8a1104641a0b1be0" 740"checksum serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4b39bd9b0b087684013a792c59e3e07a46a01d2322518d8a1104641a0b1be0"
541"checksum serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "ca13fc1a832f793322228923fbb3aba9f3f44444898f835d31ad1b74fa0a2bf8" 741"checksum serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "ca13fc1a832f793322228923fbb3aba9f3f44444898f835d31ad1b74fa0a2bf8"
542"checksum serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)" = "2f72eb2a68a7dc3f9a691bfda9305a1c017a6215e5a4545c258500d2099a37c2" 742"checksum serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)" = "2f72eb2a68a7dc3f9a691bfda9305a1c017a6215e5a4545c258500d2099a37c2"
543"checksum shell-words 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "39acde55a154c4cd3ae048ac78cc21c25f3a0145e44111b523279113dce0d94a" 743"checksum shell-words 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "39acde55a154c4cd3ae048ac78cc21c25f3a0145e44111b523279113dce0d94a"
544"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" 744"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
545"checksum structopt 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c167b61c7d4c126927f5346a4327ce20abf8a186b8041bbeb1ce49e5db49587b" 745"checksum structopt 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "30b3a3e93f5ad553c38b3301c8a0a0cec829a36783f6a0c467fc4bf553a5f5bf"
546"checksum structopt-derive 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "519621841414165d2ad0d4c92be8f41844203f2b67e245f9345a5a12d40c69d7" 746"checksum structopt-derive 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea692d40005b3ceba90a9fe7a78fa8d4b82b0ce627eebbffc329aab850f3410e"
547"checksum syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "661641ea2aa15845cddeb97dad000d22070bb5c1fb456b96c1cba883ec691e92" 747"checksum syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "661641ea2aa15845cddeb97dad000d22070bb5c1fb456b96c1cba883ec691e92"
748"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
548"checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e" 749"checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e"
549"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" 750"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
550"checksum thiserror 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f9fb62ff737e573b1e677459bea6fd023cd5d6e868c3242d3cdf3ef2f0554824" 751"checksum thiserror 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "cc6b305ec0e323c7b6cfff6098a22516e0063d0bb7c3d88660a890217dca099a"
551"checksum thiserror-impl 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "24069c0ba08aab54289d6a25f5036d94afc61e1538bbc42ae5501df141c9027d" 752"checksum thiserror-impl 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45ba8d810d9c48fc456b7ad54574e8bfb7c7918a57ad7a6e6a0985d7959e8597"
552"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" 753"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
553"checksum threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e2f0c90a5f3459330ac8bc0d2f879c693bb7a2f59689c1083fc4ef83834da865"
554"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" 754"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
555"checksum toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf" 755"checksum toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf"
556"checksum unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" 756"checksum unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
557"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20" 757"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20"
558"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" 758"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
559"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" 759"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
760"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"
560"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" 761"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
561"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" 762"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
562"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9" 763"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"
diff --git a/Cargo.toml b/Cargo.toml
index 54e8670..9572fa9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,12 +16,15 @@ num_cpus = "1"
16pandoc_types = "0.2" 16pandoc_types = "0.2"
17percent-encoding = "2" 17percent-encoding = "2"
18pretty_env_logger = "0.3" 18pretty_env_logger = "0.3"
19rayon = "1"
19serde = "1" 20serde = "1"
20serde_derive = "1" 21serde_derive = "1"
21serde_json = "1" 22serde_json = "1"
22shell-words = "0.1" 23shell-words = "0.1"
23structopt = "0.3" 24structopt = "0.3"
25# TODO: remove tempfile
26# currently used to temporary store CSS, but CSS should be in output dir
27tempfile = "3"
24thiserror = "1" 28thiserror = "1"
25threadpool = "1"
26toml = "0.5" 29toml = "0.5"
27xml-rs = "0.8" 30xml-rs = "0.8"
diff --git a/res/.gitignore b/examples/.gitignore
index 28c26ed..28c26ed 100644
--- a/res/.gitignore
+++ b/examples/.gitignore
diff --git a/res/goal.md b/examples/goal.md
index 6c6ed24..6c6ed24 100644
--- a/res/goal.md
+++ b/examples/goal.md
diff --git a/res/sample-doxygen-project-1/Doxyfile b/examples/sample-doxygen-project-1/Doxyfile
index 6055092..6055092 100644
--- a/res/sample-doxygen-project-1/Doxyfile
+++ b/examples/sample-doxygen-project-1/Doxyfile
diff --git a/res/sample-doxygen-project-1/main.cpp b/examples/sample-doxygen-project-1/main.cpp
index ba501d0..ba501d0 100644
--- a/res/sample-doxygen-project-1/main.cpp
+++ b/examples/sample-doxygen-project-1/main.cpp
diff --git a/res/sample-markdown-project-1/Doxyfile b/examples/sample-markdown-project-1/Doxyfile
index c91a981..c91a981 100644
--- a/res/sample-markdown-project-1/Doxyfile
+++ b/examples/sample-markdown-project-1/Doxyfile
diff --git a/res/sample-markdown-project-1/main.cpp b/examples/sample-markdown-project-1/main.cpp
index 8a892a2..8a892a2 100644
--- a/res/sample-markdown-project-1/main.cpp
+++ b/examples/sample-markdown-project-1/main.cpp
diff --git a/res/sample-markdown-project-1/poseidoc.toml b/examples/sample-markdown-project-1/poseidoc.toml
index fe24995..fe24995 100644
--- a/res/sample-markdown-project-1/poseidoc.toml
+++ b/examples/sample-markdown-project-1/poseidoc.toml
diff --git a/src/config.rs b/src/config.rs
index 4463479..b448469 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,3 +1,5 @@
1use crate::cli::Cli;
2
1use anyhow::{anyhow, Context, Result}; 3use anyhow::{anyhow, Context, Result};
2use codemap::CodeMap; 4use codemap::CodeMap;
3use codemap_diagnostic::Diagnostic; 5use codemap_diagnostic::Diagnostic;
@@ -15,19 +17,61 @@ pub(super) const DEFAULT_PROJECT_CONFIGURATION_FILE_NAME: &str = "poseidoc.toml"
15#[serde(rename_all = "kebab-case", default)] 17#[serde(rename_all = "kebab-case", default)]
16pub(crate) struct Config { 18pub(crate) struct Config {
17 #[structopt(skip)] 19 #[structopt(skip)]
18 pub(crate) name: String, 20 pub(crate) name: Option<String>,
19 #[structopt(long, default_value = ".")] 21 #[structopt(long)]
20 pub(crate) compile_commands_location: PathBuf, 22 pub(crate) compile_commands_location: Option<PathBuf>,
21 #[structopt(skip = vec![])] 23 #[structopt(skip = vec![])]
22 pub(crate) extra_clang_args: Vec<String>, 24 pub(crate) extra_clang_args: Vec<String>,
25 #[structopt(flatten)]
26 pub(crate) class: ClassConfig,
27}
28
29impl Config {
30 pub(crate) fn merge_cli(self, cli: Cli) -> Self {
31 Config {
32 name: cli.common_options.name.or(self.name),
33 compile_commands_location: cli
34 .common_options
35 .compile_commands_location
36 .or(self.compile_commands_location),
37 extra_clang_args: cli
38 .extra_arg
39 .into_iter()
40 .flatten()
41 .chain(self.extra_clang_args)
42 .collect(),
43 class: self.class.merge_cli(cli.common_options.class),
44 }
45 }
23} 46}
24 47
25impl Default for Config { 48impl Default for Config {
26 fn default() -> Self { 49 fn default() -> Self {
27 Config { 50 Config {
28 name: "My Project".into(), 51 name: Some(String::from("My Project")),
29 compile_commands_location: PathBuf::from(r"."), 52 compile_commands_location: Some(PathBuf::from(r".")),
30 extra_clang_args: Vec::new(), 53 extra_clang_args: Vec::new(),
54 class: ClassConfig::default(),
55 }
56 }
57}
58
59#[derive(Debug, Clone, StructOpt, Deserialize, Serialize)]
60#[structopt(rename_all = "kebab-case")]
61#[serde(rename_all = "kebab-case", default)]
62pub(crate) struct ClassConfig {
63}
64
65impl ClassConfig {
66 fn merge_cli(self, _cli: ClassConfig) -> Self {
67 ClassConfig {
68 }
69 }
70}
71
72impl Default for ClassConfig {
73 fn default() -> Self {
74 ClassConfig {
31 } 75 }
32 } 76 }
33} 77}
diff --git a/src/entities.rs b/src/entities.rs
index b7368df..89905c6 100644
--- a/src/entities.rs
+++ b/src/entities.rs
@@ -1,16 +1,17 @@
1use std::collections::HashMap; 1use std::collections::HashMap;
2 2
3pub(crate) type DynEntity = dyn Entity + Sync + Send;
4
3#[derive(Debug, Clone, Hash, PartialEq, Eq)] 5#[derive(Debug, Clone, Hash, PartialEq, Eq)]
4pub(crate) struct Usr(pub(crate) String); 6pub(crate) struct Usr(pub(crate) String);
5 7
6#[derive(Debug, Clone)]
7pub(crate) struct EntitiesManager { 8pub(crate) struct EntitiesManager {
8 toplevel_entities: HashMap<Usr, Entity>, 9 toplevel_entities: HashMap<Usr, Box<DynEntity>>,
9 descriptions: HashMap<Usr, Description>, 10 descriptions: HashMap<Usr, Description>,
10} 11}
11 12
12pub(crate) struct EntitiesManagerComponents { 13pub(crate) struct EntitiesManagerComponents {
13 pub(crate) toplevel_entities: HashMap<Usr, Entity>, 14 pub(crate) toplevel_entities: HashMap<Usr, Box<DynEntity>>,
14 pub(crate) descriptions: HashMap<Usr, Description>, 15 pub(crate) descriptions: HashMap<Usr, Description>,
15} 16}
16 17
@@ -27,7 +28,7 @@ impl EntitiesManager {
27 self.descriptions.insert(usr, description); 28 self.descriptions.insert(usr, description);
28 } 29 }
29 30
30 pub fn insert_toplevel(&mut self, usr: Usr, entity: Entity) { 31 pub fn insert_toplevel(&mut self, usr: Usr, entity: Box<DynEntity>) {
31 self.toplevel_entities.insert(usr, entity); 32 self.toplevel_entities.insert(usr, entity);
32 } 33 }
33 34
@@ -61,33 +62,88 @@ pub(crate) struct Described<T> {
61 pub(crate) entity: T, 62 pub(crate) entity: T,
62} 63}
63 64
65pub(crate) struct ChildGroup<'a> {
66 pub(crate) name: &'static str,
67 pub(crate) children: Vec<(&'a Usr, &'a DynEntity)>,
68}
69
70pub(crate) trait Entity {
71 fn kind_name(&self) -> &'static str;
72 fn embeddable_children(&self) -> Vec<ChildGroup> {
73 Vec::new()
74 }
75 fn separate_children(&self) -> Vec<ChildGroup> {
76 Vec::new()
77 }
78}
79
64#[derive(Debug, Clone)] 80#[derive(Debug, Clone)]
65pub(crate) enum Entity { 81pub(crate) struct NameSpace {
82 // TODO: replace with Vec to keep order
83 pub(crate) members: HashMap<Usr, NameSpaceChild>,
84}
85
86#[derive(Debug, Clone)]
87pub(crate) enum NameSpaceChild {
66 NameSpace(NameSpace), 88 NameSpace(NameSpace),
89 Class(Class),
67 Variable(Variable), 90 Variable(Variable),
68 Function(Function), 91 Function(Function),
69 Class(Class),
70} 92}
71 93
72impl Entity { 94impl Entity for NameSpace {
73 fn kind_name(&self) -> &'static str { 95 fn kind_name(&self) -> &'static str {
74 match self { 96 "namespace"
75 Entity::NameSpace(_) => "namespace", 97 }
76 Entity::Variable(_) => "variable", 98
77 Entity::Function(_) => "function", 99 fn embeddable_children(&self) -> Vec<ChildGroup> {
78 Entity::Class(_) => "class", 100 let mut variables = Vec::new();
101 let mut functions = Vec::new();
102 for (usr, member) in &self.members {
103 match member {
104 NameSpaceChild::NameSpace(_) => {}
105 NameSpaceChild::Class(_) => {}
106 NameSpaceChild::Variable(variable) => variables.push((usr, variable as &DynEntity)),
107 NameSpaceChild::Function(function) => functions.push((usr, function as &DynEntity)),
108 }
79 } 109 }
110
111 vec![
112 ChildGroup {
113 name: "Variables",
114 children: variables,
115 },
116 ChildGroup {
117 name: "Functions",
118 children: functions,
119 },
120 ]
80 } 121 }
81}
82 122
83#[derive(Debug, Clone)] 123 fn separate_children(&self) -> Vec<ChildGroup> {
84pub(crate) struct NameSpace { 124 let mut namespaces = Vec::new();
85 pub(crate) members: HashMap<Usr, Entity>, 125 let mut classes = Vec::new();
86} 126 for (usr, member) in &self.members {
127 match member {
128 NameSpaceChild::NameSpace(namespace) => {
129 namespaces.push((usr, namespace as &DynEntity))
130 }
131 NameSpaceChild::Class(class) => classes.push((usr, class as &DynEntity)),
132 NameSpaceChild::Variable(_) => {}
133 NameSpaceChild::Function(_) => {}
134 }
135 }
87 136
88impl From<NameSpace> for Entity { 137 vec![
89 fn from(ns: NameSpace) -> Self { 138 ChildGroup {
90 Entity::NameSpace(ns) 139 name: "Namespaces",
140 children: namespaces,
141 },
142 ChildGroup {
143 name: "Classes",
144 children: classes,
145 },
146 ]
91 } 147 }
92} 148}
93 149
@@ -96,9 +152,9 @@ pub(crate) struct Variable {
96 pub(crate) r#type: String, 152 pub(crate) r#type: String,
97} 153}
98 154
99impl From<Variable> for Entity { 155impl Entity for Variable {
100 fn from(var: Variable) -> Self { 156 fn kind_name(&self) -> &'static str {
101 Entity::Variable(var) 157 "variable"
102 } 158 }
103} 159}
104 160
@@ -108,9 +164,9 @@ pub(crate) struct Function {
108 pub(crate) return_type: String, 164 pub(crate) return_type: String,
109} 165}
110 166
111impl From<Function> for Entity { 167impl Entity for Function {
112 fn from(func: Function) -> Self { 168 fn kind_name(&self) -> &'static str {
113 Entity::Function(func) 169 "function"
114 } 170 }
115} 171}
116 172
@@ -122,13 +178,39 @@ pub(crate) struct FunctionArgument {
122 178
123#[derive(Debug, Clone)] 179#[derive(Debug, Clone)]
124pub(crate) struct Class { 180pub(crate) struct Class {
125 pub(crate) member_types: Vec<Usr>, 181 //pub(crate) member_types: Vec<Usr>,
182 // TODO: replace with Vec to keep order
126 pub(crate) member_functions: HashMap<Usr, Function>, 183 pub(crate) member_functions: HashMap<Usr, Function>,
127 pub(crate) member_variables: HashMap<Usr, Variable>, 184 pub(crate) member_variables: HashMap<Usr, Variable>,
128} 185}
129 186
130impl From<Class> for Entity { 187impl Entity for Class {
131 fn from(class: Class) -> Self { 188 fn kind_name(&self) -> &'static str {
132 Entity::Class(class) 189 "class"
190 }
191
192 fn embeddable_children(&self) -> Vec<ChildGroup> {
193 vec![
194 ChildGroup {
195 name: "Functions",
196 children: self
197 .member_functions
198 .iter()
199 .map(|(usr, func)| (usr, func as &DynEntity))
200 .collect(),
201 },
202 ChildGroup {
203 name: "Variables",
204 children: self
205 .member_variables
206 .iter()
207 .map(|(usr, var)| (usr, var as &DynEntity))
208 .collect(),
209 },
210 ]
211 }
212
213 fn separate_children(&self) -> Vec<ChildGroup> {
214 Vec::new()
133 } 215 }
134} 216}
diff --git a/src/generator.rs b/src/generator.rs
index 0ab4511..0fa5a94 100644
--- a/src/generator.rs
+++ b/src/generator.rs
@@ -1,16 +1,20 @@
1use crate::config::Config;
1use crate::entities::{ 2use crate::entities::{
2 Described, Description, EntitiesManager, EntitiesManagerComponents, Entity, Usr, 3 Description, DynEntity, EntitiesManager, EntitiesManagerComponents, Usr,
3}; 4};
5use crate::pandoc::into_pandoc;
4 6
5use anyhow::{Context, Result}; 7use anyhow::{ensure, Context, Result};
8use rayon::Scope;
6use thiserror::Error; 9use thiserror::Error;
7use threadpool::ThreadPool;
8 10
9use std::collections::HashMap; 11use std::collections::HashMap;
12use std::io::Write;
10use std::path::Path; 13use std::path::Path;
11use std::sync::{mpsc::channel, Arc};
12 14
13pub(crate) fn generate(base_dir: &Path, manager: EntitiesManager) -> Result<()> { 15const DEFAULT_CSS: &[u8] = include_bytes!("../res/style.css");
16
17pub(crate) fn generate(base_dir: &Path, manager: EntitiesManager, config: &Config) -> Result<()> {
14 let EntitiesManagerComponents { 18 let EntitiesManagerComponents {
15 toplevel_entities, 19 toplevel_entities,
16 descriptions, 20 descriptions,
@@ -24,87 +28,78 @@ pub(crate) fn generate(base_dir: &Path, manager: EntitiesManager) -> Result<()>
24 std::fs::create_dir_all(&html_output_dir) 28 std::fs::create_dir_all(&html_output_dir)
25 .context("Failed to create the HTML output directory")?; 29 .context("Failed to create the HTML output directory")?;
26 30
27 let pool = ThreadPool::new(num_cpus::get()); 31 let mut css_tempfile = tempfile::Builder::new()
28 32 .prefix("style")
29 let descriptions = Arc::new(descriptions); 33 .suffix(".css")
30 34 .tempfile()?;
31 let (tx, rx) = channel::<()>(); 35 css_tempfile.write_all(DEFAULT_CSS)?;
32
33 for (usr, entity) in toplevel_entities {
34 generate_recursively(
35 usr,
36 entity,
37 pool.clone(),
38 tx.clone(),
39 descriptions.clone(),
40 &md_output_dir,
41 &html_output_dir,
42 );
43 }
44 36
45 drop(tx); 37 let css_path = css_tempfile.path();
38 debug!("Generated temporary file with CSS at: {:?}", css_path);
46 39
47 // This is not really idiomatic, but iter returns None when every Sender is destroyed, so just 40 rayon::scope(|scope| {
48 // by passing around Senders in generate_recursively, we wait for every job. 41 for (usr, entity) in &toplevel_entities {
49 rx.iter().for_each(drop); 42 generate_recursively(
43 &usr,
44 entity.as_ref(),
45 scope,
46 &descriptions,
47 &md_output_dir,
48 &html_output_dir,
49 css_path,
50 );
51 }
52 });
50 53
51 Ok(()) 54 Ok(())
52} 55}
53 56
54fn generate_recursively( 57fn generate_recursively<'a>(
55 usr: Usr, 58 usr: &'a Usr,
56 entity: Entity, 59 entity: &'a DynEntity,
57 pool: ThreadPool, 60 pool: &Scope<'a>,
58 tx: std::sync::mpsc::Sender<()>, 61 descriptions: &'a HashMap<Usr, Description>,
59 descriptions: Arc<HashMap<Usr, Description>>, 62 md_output_dir: &'a Path,
60 md_output_dir: impl AsRef<Path>, 63 html_output_dir: &'a Path,
61 html_output_dir: impl AsRef<Path>, 64 css_path: &'a Path,
62) { 65) {
63 let descriptions = descriptions.clone(); 66 pool.spawn(move |pool| {
64 let md_output_dir = md_output_dir.as_ref().to_owned();
65 let html_output_dir = html_output_dir.as_ref().to_owned();
66
67 let pool2 = pool.clone();
68 pool.execute(move || {
69 trace!("Trying to generate {}", usr.0); 67 trace!("Trying to generate {}", usr.0);
70 68
71 let entity = Described::<Entity> {
72 entity,
73 description: descriptions.get(&usr).unwrap().clone(),
74 };
75
76 let leftovers = generate_single( 69 let leftovers = generate_single(
77 &usr, 70 &usr,
78 entity, 71 entity,
72 descriptions.get(&usr).unwrap(),
79 &descriptions, 73 &descriptions,
80 &md_output_dir, 74 &md_output_dir,
81 &html_output_dir, 75 &html_output_dir,
76 &css_path,
82 ) 77 )
83 .unwrap(); 78 .unwrap();
84 79
85 for (usr, entity) in leftovers { 80 for (usr, entity) in leftovers {
86 let pool = pool2.clone();
87 let tx = tx.clone();
88 generate_recursively( 81 generate_recursively(
89 usr, 82 usr,
90 entity, 83 entity,
91 pool, 84 pool,
92 tx, 85 descriptions,
93 descriptions.clone(), 86 md_output_dir,
94 md_output_dir.clone(), 87 html_output_dir,
95 html_output_dir.clone(), 88 css_path,
96 ); 89 );
97 } 90 }
98 }); 91 });
99} 92}
100 93
101fn generate_single( 94fn generate_single<'e>(
102 usr: &Usr, 95 usr: &Usr,
103 entity: Described<Entity>, 96 entity: &'e DynEntity,
97 description: &Description,
104 descriptions: &HashMap<Usr, Description>, 98 descriptions: &HashMap<Usr, Description>,
105 md_output_dir: impl AsRef<Path>, 99 md_output_dir: impl AsRef<Path>,
106 html_output_dir: impl AsRef<Path>, 100 html_output_dir: impl AsRef<Path>,
107) -> Result<HashMap<Usr, Entity>> { 101 css_path: impl AsRef<Path>,
102) -> Result<HashMap<&'e Usr, &'e DynEntity>> {
108 use std::io::prelude::*; 103 use std::io::prelude::*;
109 use std::process::{Command, Stdio}; 104 use std::process::{Command, Stdio};
110 105
@@ -132,7 +127,7 @@ fn generate_single(
132 .spawn() 127 .spawn()
133 .context("Failed to execute Pandoc command")?; 128 .context("Failed to execute Pandoc command")?;
134 129
135 let (pandoc_ast, leftovers) = entity.into_pandoc(&descriptions); 130 let (pandoc_ast, leftovers) = into_pandoc(entity, description, descriptions);
136 131
137 if log_enabled!(log::Level::Trace) { 132 if log_enabled!(log::Level::Trace) {
138 let json = 133 let json =
@@ -152,17 +147,20 @@ fn generate_single(
152 .context("Failed to convert Pandoc AST to JSON")?; 147 .context("Failed to convert Pandoc AST to JSON")?;
153 } 148 }
154 149
150 let command_str = format!("{:?}", pandoc);
151
155 let output = pandoc 152 let output = pandoc
156 .wait_with_output() 153 .wait_with_output()
157 .expect("Pandoc command wasn't running"); 154 .expect("Pandoc command wasn't running");
158 155
159 if !output.status.success() { 156 ensure!(
160 Err(CommandError { 157 output.status.success(),
158 CommandError {
159 command: format!("{:?}", command_str),
161 status: output.status, 160 status: output.status,
162 stderr: String::from_utf8(output.stderr).expect("Pandoc outputted invalid UTF-8"), 161 stderr: String::from_utf8(output.stderr).expect("Pandoc outputted invalid UTF-8"),
163 }) 162 }
164 .context("Pandoc command failed")?; 163 );
165 }
166 164
167 let mut command = Command::new("pandoc"); 165 let mut command = Command::new("pandoc");
168 command 166 command
@@ -172,7 +170,11 @@ fn generate_single(
172 .args(&[ 170 .args(&[
173 "--from=markdown", 171 "--from=markdown",
174 "--to=html", 172 "--to=html",
175 "--css=res/style.css", 173 "--css",
174 css_path
175 .as_ref()
176 .to_str()
177 .context("CSS path is not valid UTF-8")?,
176 "--standalone", 178 "--standalone",
177 "--self-contained", 179 "--self-contained",
178 md_output_file 180 md_output_file
@@ -184,26 +186,34 @@ fn generate_single(
184 .context("Entity name is not valid UTF-8")?, 186 .context("Entity name is not valid UTF-8")?,
185 ]); 187 ]);
186 188
187 debug!("Launching command: {:?}", command); 189 let command_str = format!("{:?}", command);
190 debug!("Launching command: {}", command_str);
188 191
189 let output = command 192 let output = command
190 .output() 193 .output()
191 .context("Failed to execute Pandoc command")?; 194 .context("Failed to execute Pandoc command")?;
192 195
193 if !output.status.success() { 196 ensure!(
194 Err(CommandError { 197 output.status.success(),
198 CommandError {
199 command: command_str,
195 status: output.status, 200 status: output.status,
196 stderr: String::from_utf8(output.stderr).expect("Pandoc outputted invalid UTF-8"), 201 stderr: String::from_utf8(output.stderr).expect("Pandoc outputted invalid UTF-8"),
197 }) 202 }
198 .context("Pandoc command failed")?; 203 );
199 }
200 204
201 Ok(leftovers) 205 Ok(leftovers)
202} 206}
203 207
204#[derive(Debug, Clone, Error)] 208#[derive(Debug, Clone, Error)]
205#[error("Command returned status {:?} and stderr {:?}", status, stderr)] 209#[error(
210 "Command {} returned status {:?} and stderr {:?}",
211 command,
212 status,
213 stderr
214)]
206struct CommandError { 215struct CommandError {
216 command: String,
207 status: std::process::ExitStatus, 217 status: std::process::ExitStatus,
208 stderr: String, 218 stderr: String,
209} 219}
diff --git a/src/main.rs b/src/main.rs
index 503688e..e6e36d9 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,3 +1,5 @@
1#![warn(clippy::all)]
2
1//mod doxygen; 3//mod doxygen;
2mod cli; 4mod cli;
3mod config; 5mod config;
@@ -83,13 +85,15 @@ fn start(codemap: &mut CodeMap) -> Result<()> {
83 std::env::set_current_dir(&cli.directory) 85 std::env::set_current_dir(&cli.directory)
84 .with_context(|| format!("Cannot change current directory to: {:?}", cli.directory))?; 86 .with_context(|| format!("Cannot change current directory to: {:?}", cli.directory))?;
85 87
86 match cli.command { 88 match &cli.command {
87 Command::Generate { file } => { 89 Command::Generate { file } => {
88 let extra_args = cli.extra_arg.iter().flatten().map(AsRef::as_ref).collect(); 90 let file = file.clone();
89 let manager = parse_file(file, extra_args); 91 let config = load_effective_config(cli, codemap)?;
92
93 let manager = parse_file(file, &config.extra_clang_args);
90 94
91 let base_output_dir = std::path::Path::new("doc"); 95 let base_output_dir = std::path::Path::new("doc");
92 generate(&base_output_dir, manager)?; 96 generate(&base_output_dir, manager, &config)?;
93 } 97 }
94 Command::Config { 98 Command::Config {
95 command: ConfigCommand::Default, 99 command: ConfigCommand::Default,
@@ -108,3 +112,7 @@ fn start(codemap: &mut CodeMap) -> Result<()> {
108 112
109 Ok(()) 113 Ok(())
110} 114}
115
116fn load_effective_config(cli: cli::Cli, codemap: &mut CodeMap) -> Result<config::Config> {
117 Ok(config::load_config(".", codemap)?.merge_cli(cli))
118}
diff --git a/src/pandoc.rs b/src/pandoc.rs
index 5ca84e7..8477f28 100644
--- a/src/pandoc.rs
+++ b/src/pandoc.rs
@@ -1,186 +1,106 @@
1//mod types;
2
3use crate::entities::*; 1use crate::entities::*;
4 2
5use pandoc_types::definition::{Attr, Block, Inline, Meta, MetaValue, Pandoc}; 3use pandoc_types::definition::{Attr, Block, Inline, Meta, MetaValue, Pandoc};
6 4
7use std::collections::HashMap; 5use std::collections::HashMap;
8 6
9impl Described<Entity> { 7pub(crate) fn into_pandoc<'e>(
10 pub fn into_pandoc( 8 entity: &'e dyn Entity,
11 self, 9 description: &Description,
12 descriptions: &HashMap<Usr, Description>, 10 descriptions: &HashMap<Usr, Description>,
13 ) -> (Pandoc, HashMap<Usr, Entity>) { 11) -> (Pandoc, HashMap<&'e Usr, &'e DynEntity>) {
14 let mut meta = Meta::null(); 12 let mut meta = Meta::null();
15
16 let title = self.title();
17 let mut content_before = self.content_before(&descriptions);
18 let mut content_after = self.content_after(&descriptions);
19 let leftovers = self.leftovers();
20
21 meta.0.insert(
22 "title".to_string(),
23 MetaValue::MetaString(self.description.name),
24 );
25
26 let mut content = Vec::new();
27
28 content.push(Block::Header(1, Attr::null(), title));
29
30 content.append(&mut content_before);
31
32 if !self.description.detailed.is_empty() {
33 content.push(Block::Header(
34 2,
35 Attr::null(),
36 vec![Inline::Str(String::from("Description"))],
37 ));
38
39 content.push(Block::Div(
40 Attr(String::new(), vec![String::from("doc")], vec![]),
41 vec![raw_markdown(self.description.detailed)],
42 ));
43 }
44
45 content.append(&mut content_after);
46
47 (Pandoc(meta, content), leftovers)
48 }
49}
50
51// TODO: replace with single function so we can move out, and remove all of those clones
52trait PandocDisplay {
53 fn content_before(&self, _descriptions: &HashMap<Usr, Description>) -> Vec<Block> {
54 vec![]
55 }
56
57 fn content_after(&self, _descriptions: &HashMap<Usr, Description>) -> Vec<Block> {
58 vec![]
59 }
60
61 fn leftovers(&self) -> HashMap<Usr, Entity> {
62 HashMap::new()
63 }
64}
65
66impl Described<Entity> {
67 fn title(&self) -> Vec<Inline> {
68 match &self.entity {
69 Entity::Variable(variable) => vec![Inline::Code(
70 Attr(String::new(), vec![String::from("cpp")], vec![]),
71 variable.r#type.clone() + " " + &self.description.name,
72 )],
73 _ => vec![Inline::Code(Attr::null(), self.description.name.clone())],
74 }
75 }
76}
77 13
78impl PandocDisplay for Described<Entity> { 14 let title = vec![Inline::Code(Attr::null(), description.name.clone())];
79 fn content_before(&self, descriptions: &HashMap<Usr, Description>) -> Vec<Block> {
80 match &self.entity {
81 Entity::NameSpace(ns) => ns.content_before(descriptions),
82 Entity::Variable(var) => var.content_before(descriptions),
83 Entity::Function(func) => func.content_before(descriptions),
84 Entity::Class(class) => class.content_before(descriptions),
85 }
86 }
87 15
88 fn content_after(&self, descriptions: &HashMap<Usr, Description>) -> Vec<Block> { 16 meta.0.insert(
89 match &self.entity { 17 "title".to_string(),
90 Entity::NameSpace(ns) => ns.content_after(descriptions), 18 MetaValue::MetaString(description.name.clone()),
91 Entity::Variable(var) => var.content_after(descriptions), 19 );
92 Entity::Function(func) => func.content_after(descriptions),
93 Entity::Class(class) => class.content_after(descriptions),
94 }
95 }
96 20
97 fn leftovers(&self) -> HashMap<Usr, Entity> { 21 let mut content = Vec::new();
98 match &self.entity {
99 Entity::NameSpace(ns) => ns.leftovers(),
100 Entity::Variable(var) => var.leftovers(),
101 Entity::Function(func) => func.leftovers(),
102 Entity::Class(class) => class.leftovers(),
103 }
104 }
105}
106 22
107impl PandocDisplay for NameSpace { 23 content.push(Block::Header(1, Attr::null(), title));
108 fn content_after(&self, descriptions: &HashMap<Usr, Description>) -> Vec<Block> {
109 let mut content = Vec::new();
110 24
25 if !description.detailed.is_empty() {
111 content.push(Block::Header( 26 content.push(Block::Header(
112 2, 27 2,
113 Attr::null(), 28 Attr::null(),
114 vec![Inline::Str("Members".to_string())], 29 vec![Inline::Str(String::from("Description"))],
115 )); 30 ));
116 31
117 if let Some(member_list) = member_list(self.members.keys(), descriptions) { 32 content.push(Block::Div(
118 content.push(member_list); 33 Attr(String::new(), vec![String::from("doc")], vec![]),
119 } else { 34 vec![raw_markdown(description.detailed.clone())],
120 content.push(str_block(String::from("None"))); 35 ));
121 }
122
123 content
124 }
125
126 fn leftovers(&self) -> HashMap<Usr, Entity> {
127 self.members.clone()
128 } 36 }
129}
130 37
131impl PandocDisplay for Class { 38 let separate_children = entity.separate_children();
132 fn content_after(&self, descriptions: &HashMap<Usr, Description>) -> Vec<Block> { 39 let embeddable_children = entity.embeddable_children();
133 let mut content = Vec::new();
134 40
135 if let Some(member_types) = member_list(&self.member_types, descriptions) { 41 for section in &separate_children {
42 if let Some(members_list) = member_list(
43 section.children.iter().map(|&(usr, _child)| usr),
44 descriptions,
45 ) {
136 content.push(Block::Header( 46 content.push(Block::Header(
137 2, 47 2,
138 Attr::null(), 48 Attr::null(),
139 vec![Inline::Str("Member Types".to_string())], 49 vec![Inline::Str(String::from(section.name))],
140 )); 50 ));
141 51
142 content.push(member_types); 52 content.push(members_list);
143 } 53 }
54 }
55
56 let mut embedded_documentation = Vec::new();
144 57
145 if let Some(member_functions) = member_list(self.member_functions.keys(), descriptions) { 58 for section in &embeddable_children {
59 if let Some(members_list) = member_list(
60 section.children.iter().map(|&(usr, _child)| usr),
61 descriptions,
62 ) {
146 content.push(Block::Header( 63 content.push(Block::Header(
147 2, 64 2,
148 Attr::null(), 65 Attr::null(),
149 vec![Inline::Str("Member Functions".to_string())], 66 vec![Inline::Str(String::from(section.name))],
150 )); 67 ));
151 68
152 content.push(member_functions); 69 content.push(members_list);
153 }
154 70
155 if let Some(member_variables) = member_list(self.member_variables.keys(), descriptions) { 71 embedded_documentation.push(Block::Header(
156 content.push(Block::Header(
157 2, 72 2,
158 Attr::null(), 73 Attr::null(),
159 vec![Inline::Str("Member Variables".to_string())], 74 vec![Inline::Str(String::from(section.name) + " Documentation")],
160 )); 75 ));
161 76
162 content.push(member_variables); 77 for (usr, _child) in &section.children {
163 } 78 let child_doc = descriptions.get(usr).unwrap();
164 79
165 content 80 embedded_documentation.push(Block::Header(
166 } 81 3,
82 Attr::null(),
83 vec![Inline::Code(Attr::null(), String::from(&child_doc.name))],
84 ));
167 85
168 fn leftovers(&self) -> HashMap<Usr, Entity> { 86 embedded_documentation.push(Block::Div(
169 self.member_functions 87 Attr(String::new(), vec![String::from("doc")], vec![]),
170 .iter() 88 vec![raw_markdown(child_doc.detailed.clone())],
171 .map(|(usr, func)| (usr.clone(), Entity::from(func.clone()))) 89 ));
172 .chain( 90 }
173 self.member_variables 91 }
174 .iter()
175 .map(|(usr, var)| (usr.clone(), Entity::from(var.clone()))),
176 )
177 .collect()
178 } 92 }
179}
180 93
181impl PandocDisplay for Variable {} 94 content.append(&mut embedded_documentation);
182 95
183impl PandocDisplay for Function {} 96 let leftovers = separate_children
97 .iter()
98 .map(|section| section.children.clone())
99 .flatten()
100 .collect();
101
102 (Pandoc(meta, content), leftovers)
103}
184 104
185fn str_block(content: String) -> Block { 105fn str_block(content: String) -> Block {
186 Block::Plain(vec![Inline::Str(content)]) 106 Block::Plain(vec![Inline::Str(content)])
diff --git a/src/pandoc/types.rs b/src/pandoc/types.rs
deleted file mode 100644
index dc5be64..0000000
--- a/src/pandoc/types.rs
+++ /dev/null
@@ -1,39 +0,0 @@
1use crate::pandoc::{Block, Inline};
2
3#[derive(Debug, Clone)]
4pub(super) struct Class {
5 inners: Vec<Inner>,
6}
7
8#[derive(Debug, Clone)]
9struct Inner {
10 kind: InnerKind,
11 name: String,
12 //refid: String
13}
14
15#[derive(Debug, Clone)]
16enum InnerKind {
17 Class,
18 Enum,
19}
20
21impl std::fmt::Display for InnerKind {
22 fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
23 match self {
24 InnerKind::Class => write!(f, "class"),
25 InnerKind::Enum => write!(f, "enum"),
26 }
27 }
28}
29
30impl From<Inner> for (Vec<Inline>, Vec<Vec<Block>>) {
31 fn from(inner: Inner) -> (Vec<Inline>, Vec<Vec<Block>>) {
32 (
33 vec![Inline::Str(inner.name)],
34 vec![vec![Block::Plain(vec![Inline::Str(
35 inner.kind.to_string(),
36 )])]],
37 )
38 }
39}
diff --git a/src/parsing.rs b/src/parsing.rs
index 137b89d..d7aaa49 100644
--- a/src/parsing.rs
+++ b/src/parsing.rs
@@ -6,11 +6,13 @@ use codemap::CodeMap;
6use std::collections::HashMap; 6use std::collections::HashMap;
7use std::path::{Path, PathBuf}; 7use std::path::{Path, PathBuf};
8 8
9pub(crate) fn parse_file<T>(path: T, mut extra_args: Vec<&str>) -> EntitiesManager 9pub(crate) fn parse_file<T, S>(path: T, extra_args: &[S]) -> EntitiesManager
10where 10where
11 T: Into<PathBuf>, 11 T: Into<PathBuf>,
12 T: AsRef<Path>, 12 T: AsRef<Path>,
13 T: ToString, 13 T: ToString,
14 S: AsRef<str>,
15 S: std::fmt::Debug,
14{ 16{
15 let mut codemap = CodeMap::new(); 17 let mut codemap = CodeMap::new();
16 let file_map = codemap.add_file(path.to_string(), std::fs::read_to_string(&path).unwrap()); 18 let file_map = codemap.add_file(path.to_string(), std::fs::read_to_string(&path).unwrap());
@@ -21,7 +23,6 @@ where
21 let mut parser = index.parser(path); 23 let mut parser = index.parser(path);
22 parser.skip_function_bodies(true); 24 parser.skip_function_bodies(true);
23 25
24 extra_args.push("-Werror=documentation");
25 parser.arguments(&extra_args); 26 parser.arguments(&extra_args);
26 27
27 if log_enabled!(log::Level::Debug) { 28 if log_enabled!(log::Level::Debug) {
@@ -70,7 +71,7 @@ where
70 let mut emitter = Emitter::stderr(ColorConfig::Auto, Some(&codemap)); 71 let mut emitter = Emitter::stderr(ColorConfig::Auto, Some(&codemap));
71 72
72 for diagnostic in trans_unit.get_diagnostics().iter() { 73 for diagnostic in trans_unit.get_diagnostics().iter() {
73 let main_diag = match clang_diag_to_codemap_diag(&diagnostic, &file_span) { 74 let main_diag = match clang_diag_to_codemap_diag(&diagnostic, file_span) {
74 Some(diag) => diag, 75 Some(diag) => diag,
75 None => continue, 76 None => continue,
76 }; 77 };
@@ -78,12 +79,12 @@ where
78 let sub_diags = diagnostic 79 let sub_diags = diagnostic
79 .get_children() 80 .get_children()
80 .into_iter() 81 .into_iter()
81 .filter_map(|diagnostic| clang_diag_to_codemap_diag(&diagnostic, &file_span)); 82 .filter_map(|diagnostic| clang_diag_to_codemap_diag(&diagnostic, file_span));
82 83
83 let fix_it_diags = diagnostic 84 let fix_it_diags = diagnostic
84 .get_fix_its() 85 .get_fix_its()
85 .into_iter() 86 .into_iter()
86 .map(|fix_it| clang_fix_it_to_codemap_diag(&fix_it, &file_span)); 87 .map(|fix_it| clang_fix_it_to_codemap_diag(&fix_it, file_span));
87 88
88 emitter.emit( 89 emitter.emit(
89 &std::iter::once(main_diag) 90 &std::iter::once(main_diag)
@@ -98,7 +99,7 @@ where
98 99
99fn clang_diag_to_codemap_diag( 100fn clang_diag_to_codemap_diag(
100 diagnostic: &clang::diagnostic::Diagnostic, 101 diagnostic: &clang::diagnostic::Diagnostic,
101 file_span: &codemap::Span, 102 file_span: codemap::Span,
102) -> Option<codemap_diagnostic::Diagnostic> { 103) -> Option<codemap_diagnostic::Diagnostic> {
103 use codemap_diagnostic::{Diagnostic, Level, SpanLabel, SpanStyle}; 104 use codemap_diagnostic::{Diagnostic, Level, SpanLabel, SpanStyle};
104 105
@@ -146,7 +147,7 @@ fn clang_diag_to_codemap_diag(
146 147
147fn clang_fix_it_to_codemap_diag( 148fn clang_fix_it_to_codemap_diag(
148 fix_it: &clang::diagnostic::FixIt, 149 fix_it: &clang::diagnostic::FixIt,
149 file_span: &codemap::Span, 150 file_span: codemap::Span,
150) -> codemap_diagnostic::Diagnostic { 151) -> codemap_diagnostic::Diagnostic {
151 use clang::diagnostic::FixIt; 152 use clang::diagnostic::FixIt;
152 use codemap_diagnostic::{Diagnostic, Level, SpanLabel, SpanStyle}; 153 use codemap_diagnostic::{Diagnostic, Level, SpanLabel, SpanStyle};
@@ -195,6 +196,7 @@ fn clang_fix_it_to_codemap_diag(
195pub(crate) struct Comment(String); 196pub(crate) struct Comment(String);
196 197
197impl Comment { 198impl Comment {
199 // TODO: weirdness with emojis and line returns?
198 pub fn from_raw(raw: String) -> Self { 200 pub fn from_raw(raw: String) -> Self {
199 #[derive(Debug)] 201 #[derive(Debug)]
200 enum CommentStyle { 202 enum CommentStyle {
@@ -237,7 +239,7 @@ impl Comment {
237 break; 239 break;
238 } 240 }
239 Some(position) => { 241 Some(position) => {
240 result.push_str(&rest[..position + 1]); 242 result.push_str(&rest[..=position]);
241 chars.nth(position); 243 chars.nth(position);
242 } 244 }
243 } 245 }
@@ -318,20 +320,20 @@ fn get_description(entity: &clang::Entity) -> Description {
318 } 320 }
319} 321}
320 322
321impl FromClangEntity for Entity { 323impl FromClangEntity for Box<DynEntity> {
322 fn from_clang_entity(entity: clang::Entity, manager: &mut EntitiesManager) -> Self { 324 fn from_clang_entity(entity: clang::Entity, manager: &mut EntitiesManager) -> Self {
323 use clang::EntityKind; 325 use clang::EntityKind;
324 326
325 match entity.get_kind() { 327 match entity.get_kind() {
326 EntityKind::Namespace => Self::NameSpace(entity.into_poseidoc_entity(manager)), 328 EntityKind::Namespace => Box::new(NameSpace::from_clang_entity(entity, manager)),
327 EntityKind::FieldDecl | EntityKind::VarDecl => { 329 EntityKind::FieldDecl | EntityKind::VarDecl => {
328 Self::Variable(entity.into_poseidoc_entity(manager)) 330 Box::new(Variable::from_clang_entity(entity, manager))
329 } 331 }
330 EntityKind::FunctionDecl | EntityKind::Method | EntityKind::FunctionTemplate => { 332 EntityKind::FunctionDecl | EntityKind::Method | EntityKind::FunctionTemplate => {
331 Self::Function(entity.into_poseidoc_entity(manager)) 333 Box::new(Function::from_clang_entity(entity, manager))
332 } 334 }
333 EntityKind::ClassDecl | EntityKind::StructDecl | EntityKind::ClassTemplate => { 335 EntityKind::ClassDecl | EntityKind::StructDecl | EntityKind::ClassTemplate => {
334 Self::Class(entity.into_poseidoc_entity(manager)) 336 Box::new(Class::from_clang_entity(entity, manager))
335 } 337 }
336 _ => panic!("Unsupported entity: {:?}", entity), 338 _ => panic!("Unsupported entity: {:?}", entity),
337 } 339 }
@@ -362,6 +364,28 @@ impl FromClangEntity for NameSpace {
362 } 364 }
363} 365}
364 366
367impl FromClangEntity for NameSpaceChild {
368 fn from_clang_entity(entity: clang::Entity, manager: &mut EntitiesManager) -> Self {
369 use clang::EntityKind;
370
371 match entity.get_kind() {
372 EntityKind::Namespace => {
373 NameSpaceChild::NameSpace(NameSpace::from_clang_entity(entity, manager))
374 }
375 EntityKind::FieldDecl | EntityKind::VarDecl => {
376 NameSpaceChild::Variable(Variable::from_clang_entity(entity, manager))
377 }
378 EntityKind::FunctionDecl | EntityKind::Method | EntityKind::FunctionTemplate => {
379 NameSpaceChild::Function(Function::from_clang_entity(entity, manager))
380 }
381 EntityKind::ClassDecl | EntityKind::StructDecl | EntityKind::ClassTemplate => {
382 NameSpaceChild::Class(Class::from_clang_entity(entity, manager))
383 }
384 _ => panic!("Unsupported entity: {:?}", entity),
385 }
386 }
387}
388
365impl FromClangEntity for Variable { 389impl FromClangEntity for Variable {
366 fn from_clang_entity(entity: clang::Entity, manager: &mut EntitiesManager) -> Self { 390 fn from_clang_entity(entity: clang::Entity, manager: &mut EntitiesManager) -> Self {
367 match entity.get_kind() { 391 match entity.get_kind() {
@@ -383,6 +407,7 @@ impl FromClangEntity for Function {
383 fn from_clang_entity(entity: clang::Entity, manager: &mut EntitiesManager) -> Self { 407 fn from_clang_entity(entity: clang::Entity, manager: &mut EntitiesManager) -> Self {
384 match entity.get_kind() { 408 match entity.get_kind() {
385 clang::EntityKind::Method 409 clang::EntityKind::Method
410 | clang::EntityKind::Constructor
386 | clang::EntityKind::FunctionDecl 411 | clang::EntityKind::FunctionDecl
387 | clang::EntityKind::FunctionTemplate => {} 412 | clang::EntityKind::FunctionTemplate => {}
388 _ => panic!("Trying to parse a non-function into a function"), 413 _ => panic!("Trying to parse a non-function into a function"),
@@ -436,7 +461,7 @@ impl FromClangEntity for Class {
436 EntityKind::ClassDecl | EntityKind::StructDecl | EntityKind::TypeAliasDecl => { 461 EntityKind::ClassDecl | EntityKind::StructDecl | EntityKind::TypeAliasDecl => {
437 member_types.push(child_usr); 462 member_types.push(child_usr);
438 } 463 }
439 EntityKind::Method => { 464 EntityKind::Method | EntityKind::Constructor | EntityKind::FunctionDecl => {
440 member_functions.insert(child_usr, child.into_poseidoc_entity(manager)); 465 member_functions.insert(child_usr, child.into_poseidoc_entity(manager));
441 } 466 }
442 EntityKind::FieldDecl => { 467 EntityKind::FieldDecl => {
@@ -449,7 +474,7 @@ impl FromClangEntity for Class {
449 manager.insert(entity.get_usr().unwrap().into(), get_description(&entity)); 474 manager.insert(entity.get_usr().unwrap().into(), get_description(&entity));
450 475
451 Class { 476 Class {
452 member_types, 477 //member_types,
453 member_functions, 478 member_functions,
454 member_variables, 479 member_variables,
455 } 480 }
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-28 11:23:45 +0000