diff --git a/.gitignore b/.gitignore
index ea8c4bf..74ca8b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/target
+/site/build
diff --git a/.ignore b/.ignore
new file mode 100644
index 0000000..3a6df18
--- /dev/null
+++ b/.ignore
@@ -0,0 +1,2 @@
+/docs
+/site
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index aebe34d..254c5a2 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -3,13 +3,20 @@
"tasks": [
{
"type": "cargo",
- "command": "run",
+ "command": "watch",
+ "args": ["-x", "run -- serve"],
"problemMatcher": ["$rustc"],
- "label": "rust: cargo run",
+ "label": "dev serve site",
"group": {
"kind": "build",
"isDefault": true
}
+ },
+ {
+ "type": "cargo",
+ "command": "run",
+ "problemMatcher": ["$rustc"],
+ "label": "build site"
}
]
}
diff --git a/Cargo.lock b/Cargo.lock
index 4577a41..48f9d8d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -29,6 +29,18 @@ version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
+[[package]]
+name = "autocfg"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+
+[[package]]
+name = "base64"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
+
[[package]]
name = "bitflags"
version = "1.3.2"
@@ -44,7 +56,16 @@ dependencies = [
"block-padding",
"byte-tools",
"byteorder",
- "generic-array",
+ "generic-array 0.12.4",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
+dependencies = [
+ "generic-array 0.14.4",
]
[[package]]
@@ -56,6 +77,16 @@ dependencies = [
"byte-tools",
]
+[[package]]
+name = "buf_redux"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f"
+dependencies = [
+ "memchr",
+ "safemem",
+]
+
[[package]]
name = "byte-tools"
version = "0.3.1"
@@ -68,6 +99,12 @@ version = "1.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+[[package]]
+name = "bytes"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"
+
[[package]]
name = "cfg-if"
version = "0.1.10"
@@ -89,13 +126,22 @@ dependencies = [
"bitflags",
]
+[[package]]
+name = "cpufeatures"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef"
+dependencies = [
+ "libc",
+]
+
[[package]]
name = "cssparser"
version = "0.25.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fbe18ca4efb9ba3716c6da66cc3d7e673bf59fa576353011f48c4cfddbdd740e"
dependencies = [
- "autocfg",
+ "autocfg 0.1.7",
"cssparser-macros",
"dtoa-short",
"itoa",
@@ -127,7 +173,16 @@ version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
dependencies = [
- "generic-array",
+ "generic-array 0.12.4",
+]
+
+[[package]]
+name = "digest"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
+dependencies = [
+ "generic-array 0.14.4",
]
[[package]]
@@ -166,18 +221,175 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
+[[package]]
+name = "filetime"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
+ "redox_syscall",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
+dependencies = [
+ "matches",
+ "percent-encoding",
+]
+
[[package]]
name = "fs_extra"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394"
+[[package]]
+name = "fsevent"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6"
+dependencies = [
+ "bitflags",
+ "fsevent-sys",
+]
+
+[[package]]
+name = "fsevent-sys"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0"
+dependencies = [
+ "libc",
+]
+
[[package]]
name = "fuchsia-cprng"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+[[package]]
+name = "fuchsia-zircon"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
+dependencies = [
+ "bitflags",
+ "fuchsia-zircon-sys",
+]
+
+[[package]]
+name = "fuchsia-zircon-sys"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
+
+[[package]]
+name = "futures"
+version = "0.3.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1adc00f486adfc9ce99f77d717836f0c5aa84965eb0b4f051f4e83f7cab53f8b"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74ed2411805f6e4e3d9bc904c95d5d423b89b3b25dc0250aa74729de20629ff9"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d0d535a57b87e1ae31437b892713aee90cd2d7b0ee48727cd11fc72ef54761c"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b0e06c393068f3a6ef246c75cdca793d6a46347e75286933e5e75fd2fd11582"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57"
+dependencies = [
+ "autocfg 1.0.1",
+ "proc-macro-hack",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0f30aaa67363d119812743aa5f33c201a7a66329f97d1a887022971feea4b53"
+
+[[package]]
+name = "futures-task"
+version = "0.3.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbe54a98670017f3be909561f6ad13e810d9a51f3f061b902062ca3da80799f2"
+
+[[package]]
+name = "futures-util"
+version = "0.3.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78"
+dependencies = [
+ "autocfg 1.0.1",
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "proc-macro-hack",
+ "proc-macro-nested",
+ "slab",
+]
+
[[package]]
name = "fxhash"
version = "0.2.1"
@@ -196,6 +408,38 @@ dependencies = [
"typenum",
]
+[[package]]
+name = "generic-array"
+version = "0.14.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
+ "wasi 0.9.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
+ "wasi 0.10.2+wasi-snapshot-preview1",
+]
+
[[package]]
name = "gray_matter"
version = "0.1.0"
@@ -210,6 +454,25 @@ dependencies = [
"yaml-rust",
]
+[[package]]
+name = "h2"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "825343c4eef0b63f541f8903f395dc5beb362a979b5799a84062527ef1e37726"
+dependencies = [
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http",
+ "indexmap",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
[[package]]
name = "handlebars"
version = "4.1.2"
@@ -219,7 +482,7 @@ dependencies = [
"log",
"pest",
"pest_derive",
- "quick-error",
+ "quick-error 2.0.1",
"serde",
"serde_json",
]
@@ -233,6 +496,173 @@ dependencies = [
"ahash",
]
+[[package]]
+name = "hashbrown"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
+
+[[package]]
+name = "headers"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0b7591fb62902706ae8e7aaff416b1b0fa2c0fd0878b46dc13baa3712d8a855"
+dependencies = [
+ "base64",
+ "bitflags",
+ "bytes",
+ "headers-core",
+ "http",
+ "mime",
+ "sha-1 0.9.7",
+ "time",
+]
+
+[[package]]
+name = "headers-core"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429"
+dependencies = [
+ "http",
+]
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "hotwatch"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d61ee702e77f237b41761361a82e5c4bf6277dbb4bc8b6b7d745cb249cc82b31"
+dependencies = [
+ "log",
+ "notify",
+]
+
+[[package]]
+name = "http"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "399c583b2979440c60be0821a6199eca73bc3c8dcd9d070d75ac726e2c6186e5"
+dependencies = [
+ "bytes",
+ "http",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68"
+
+[[package]]
+name = "httpdate"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440"
+
+[[package]]
+name = "hyper"
+version = "0.14.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b61cf2d1aebcf6e6352c97b81dc2244ca29194be1b276f5d8ad5c6330fffb11"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower-service",
+ "tracing",
+ "want",
+]
+
+[[package]]
+name = "idna"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
+dependencies = [
+ "matches",
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "indexmap"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5"
+dependencies = [
+ "autocfg 1.0.1",
+ "hashbrown 0.11.2",
+]
+
+[[package]]
+name = "inotify"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f"
+dependencies = [
+ "bitflags",
+ "inotify-sys",
+ "libc",
+]
+
+[[package]]
+name = "inotify-sys"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "input_buffer"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f97967975f448f1a7ddb12b0bc41069d09ed6a1c161a92687e057325db35d413"
+dependencies = [
+ "bytes",
+]
+
+[[package]]
+name = "iovec"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
+dependencies = [
+ "libc",
+]
+
[[package]]
name = "itoa"
version = "0.4.7"
@@ -245,6 +675,16 @@ version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd"
+[[package]]
+name = "kernel32-sys"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
+dependencies = [
+ "winapi 0.2.8",
+ "winapi-build",
+]
+
[[package]]
name = "lazy_static"
version = "1.4.0"
@@ -288,7 +728,7 @@ dependencies = [
"cfg-if 0.1.10",
"cssparser",
"encoding_rs",
- "hashbrown",
+ "hashbrown 0.9.1",
"lazy_static",
"lazycell",
"memchr",
@@ -321,18 +761,177 @@ version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
+[[package]]
+name = "mime"
+version = "0.3.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
+
+[[package]]
+name = "mime_guess"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212"
+dependencies = [
+ "mime",
+ "unicase",
+]
+
+[[package]]
+name = "mio"
+version = "0.6.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4"
+dependencies = [
+ "cfg-if 0.1.10",
+ "fuchsia-zircon",
+ "fuchsia-zircon-sys",
+ "iovec",
+ "kernel32-sys",
+ "libc",
+ "log",
+ "miow 0.2.2",
+ "net2",
+ "slab",
+ "winapi 0.2.8",
+]
+
+[[package]]
+name = "mio"
+version = "0.7.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16"
+dependencies = [
+ "libc",
+ "log",
+ "miow 0.3.7",
+ "ntapi",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "mio-extras"
+version = "2.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19"
+dependencies = [
+ "lazycell",
+ "log",
+ "mio 0.6.23",
+ "slab",
+]
+
+[[package]]
+name = "miow"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d"
+dependencies = [
+ "kernel32-sys",
+ "net2",
+ "winapi 0.2.8",
+ "ws2_32-sys",
+]
+
+[[package]]
+name = "miow"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"
+dependencies = [
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "multipart"
+version = "0.17.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d050aeedc89243f5347c3e237e3e13dc76fbe4ae3742a57b94dc14f69acf76d4"
+dependencies = [
+ "buf_redux",
+ "httparse",
+ "log",
+ "mime",
+ "mime_guess",
+ "quick-error 1.2.3",
+ "rand 0.7.3",
+ "safemem",
+ "tempfile",
+ "twoway",
+]
+
+[[package]]
+name = "net2"
+version = "0.2.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
+dependencies = [
+ "cfg-if 0.1.10",
+ "libc",
+ "winapi 0.3.9",
+]
+
[[package]]
name = "nodrop"
version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
+[[package]]
+name = "notify"
+version = "4.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae03c8c853dba7bfd23e571ff0cff7bc9dceb40a4cd684cd1681824183f45257"
+dependencies = [
+ "bitflags",
+ "filetime",
+ "fsevent",
+ "fsevent-sys",
+ "inotify",
+ "libc",
+ "mio 0.6.23",
+ "mio-extras",
+ "walkdir",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "ntapi"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
+dependencies = [
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
[[package]]
name = "opaque-debug"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
+[[package]]
+name = "opaque-debug"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
+
+[[package]]
+name = "percent-encoding"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
+
[[package]]
name = "pest"
version = "2.1.3"
@@ -373,7 +972,7 @@ checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d"
dependencies = [
"maplit",
"pest",
- "sha-1",
+ "sha-1 0.8.2",
]
[[package]]
@@ -402,7 +1001,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
dependencies = [
"phf_shared",
- "rand",
+ "rand 0.6.5",
]
[[package]]
@@ -414,12 +1013,62 @@ dependencies = [
"siphasher",
]
+[[package]]
+name = "pin-project"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
+
[[package]]
name = "precomputed-hash"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
+[[package]]
+name = "proc-macro-hack"
+version = "0.5.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
+
+[[package]]
+name = "proc-macro-nested"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
+
[[package]]
name = "proc-macro2"
version = "1.0.28"
@@ -446,6 +1095,12 @@ dependencies = [
"unicase",
]
+[[package]]
+name = "quick-error"
+version = "1.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
+
[[package]]
name = "quick-error"
version = "2.0.1"
@@ -467,17 +1122,42 @@ version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
dependencies = [
- "autocfg",
+ "autocfg 0.1.7",
"libc",
- "rand_chacha",
+ "rand_chacha 0.1.1",
"rand_core 0.4.2",
- "rand_hc",
+ "rand_hc 0.1.0",
"rand_isaac",
"rand_jitter",
"rand_os",
"rand_pcg",
"rand_xorshift",
- "winapi",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "rand"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+dependencies = [
+ "getrandom 0.1.16",
+ "libc",
+ "rand_chacha 0.2.2",
+ "rand_core 0.5.1",
+ "rand_hc 0.2.0",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
+dependencies = [
+ "libc",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.3",
+ "rand_hc 0.3.1",
]
[[package]]
@@ -486,10 +1166,30 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
dependencies = [
- "autocfg",
+ "autocfg 0.1.7",
"rand_core 0.3.1",
]
+[[package]]
+name = "rand_chacha"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.5.1",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.6.3",
+]
+
[[package]]
name = "rand_core"
version = "0.3.1"
@@ -505,6 +1205,24 @@ version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
+[[package]]
+name = "rand_core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+dependencies = [
+ "getrandom 0.1.16",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
+dependencies = [
+ "getrandom 0.2.3",
+]
+
[[package]]
name = "rand_hc"
version = "0.1.0"
@@ -514,6 +1232,24 @@ dependencies = [
"rand_core 0.3.1",
]
+[[package]]
+name = "rand_hc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+dependencies = [
+ "rand_core 0.5.1",
+]
+
+[[package]]
+name = "rand_hc"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
+dependencies = [
+ "rand_core 0.6.3",
+]
+
[[package]]
name = "rand_isaac"
version = "0.1.1"
@@ -531,7 +1267,7 @@ checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
dependencies = [
"libc",
"rand_core 0.4.2",
- "winapi",
+ "winapi 0.3.9",
]
[[package]]
@@ -545,7 +1281,7 @@ dependencies = [
"libc",
"rand_core 0.4.2",
"rdrand",
- "winapi",
+ "winapi 0.3.9",
]
[[package]]
@@ -554,7 +1290,7 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
dependencies = [
- "autocfg",
+ "autocfg 0.1.7",
"rand_core 0.4.2",
]
@@ -576,6 +1312,15 @@ dependencies = [
"rand_core 0.3.1",
]
+[[package]]
+name = "redox_syscall"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
+dependencies = [
+ "bitflags",
+]
+
[[package]]
name = "regex"
version = "1.5.4"
@@ -593,6 +1338,15 @@ version = "0.6.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
+[[package]]
+name = "remove_dir_all"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
+dependencies = [
+ "winapi 0.3.9",
+]
+
[[package]]
name = "ryu"
version = "1.0.5"
@@ -614,6 +1368,12 @@ dependencies = [
"winapi-util",
]
+[[package]]
+name = "scoped-tls"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
+
[[package]]
name = "selectors"
version = "0.21.0"
@@ -664,6 +1424,18 @@ dependencies = [
"serde",
]
+[[package]]
+name = "serde_urlencoded"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9"
+dependencies = [
+ "form_urlencoded",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
[[package]]
name = "serde_yaml"
version = "0.8.17"
@@ -692,10 +1464,23 @@ version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df"
dependencies = [
- "block-buffer",
- "digest",
+ "block-buffer 0.7.3",
+ "digest 0.8.1",
"fake-simd",
- "opaque-debug",
+ "opaque-debug 0.2.3",
+]
+
+[[package]]
+name = "sha-1"
+version = "0.9.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a0c8611594e2ab4ebbf06ec7cbbf0a99450b8570e96cbf5188b5d5f6ef18d81"
+dependencies = [
+ "block-buffer 0.9.0",
+ "cfg-if 1.0.0",
+ "cpufeatures",
+ "digest 0.9.0",
+ "opaque-debug 0.3.0",
]
[[package]]
@@ -704,6 +1489,12 @@ version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
+[[package]]
+name = "slab"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590"
+
[[package]]
name = "smallvec"
version = "0.6.14"
@@ -713,6 +1504,16 @@ dependencies = [
"maybe-uninit",
]
+[[package]]
+name = "socket2"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad"
+dependencies = [
+ "libc",
+ "winapi 0.3.9",
+]
+
[[package]]
name = "stable_deref_trait"
version = "1.2.0"
@@ -730,6 +1531,20 @@ dependencies = [
"unicode-xid",
]
+[[package]]
+name = "tempfile"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
+ "rand 0.8.4",
+ "redox_syscall",
+ "remove_dir_all",
+ "winapi 0.3.9",
+]
+
[[package]]
name = "thin-slice"
version = "0.1.1"
@@ -756,6 +1571,97 @@ dependencies = [
"syn",
]
+[[package]]
+name = "time"
+version = "0.1.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
+dependencies = [
+ "libc",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
+
+[[package]]
+name = "tokio"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01cf844b23c6131f624accf65ce0e4e9956a8bb329400ea5bcc26ae3a5c20b0b"
+dependencies = [
+ "autocfg 1.0.1",
+ "bytes",
+ "libc",
+ "memchr",
+ "mio 0.7.13",
+ "num_cpus",
+ "pin-project-lite",
+ "tokio-macros",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tokio-stream"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b2f3f698253f03119ac0102beaa64f67a67e08074d03a22d18784104543727f"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-tungstenite"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1a5f475f1b9d077ea1017ecbc60890fda8e54942d680ca0b1d2b47cfa2d861b"
+dependencies = [
+ "futures-util",
+ "log",
+ "pin-project",
+ "tokio",
+ "tungstenite",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "log",
+ "pin-project-lite",
+ "tokio",
+]
+
[[package]]
name = "toml"
version = "0.5.8"
@@ -765,6 +1671,67 @@ dependencies = [
"serde",
]
+[[package]]
+name = "tower-service"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
+
+[[package]]
+name = "tracing"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d"
+dependencies = [
+ "cfg-if 1.0.0",
+ "log",
+ "pin-project-lite",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9ff14f98b1a4b289c6248a023c1c2fa1491062964e9fed67ab29c4e4da4a052"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "try-lock"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
+
+[[package]]
+name = "tungstenite"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ada8297e8d70872fa9a551d93250a9f407beb9f37ef86494eb20012a2ff7c24"
+dependencies = [
+ "base64",
+ "byteorder",
+ "bytes",
+ "http",
+ "httparse",
+ "input_buffer",
+ "log",
+ "rand 0.8.4",
+ "sha-1 0.9.7",
+ "url",
+ "utf-8",
+]
+
+[[package]]
+name = "twoway"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1"
+dependencies = [
+ "memchr",
+]
+
[[package]]
name = "typenum"
version = "1.13.0"
@@ -786,12 +1753,45 @@ dependencies = [
"version_check",
]
+[[package]]
+name = "unicode-bidi"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "246f4c42e67e7a4e3c6106ff716a5d067d4132a642840b242e357e468a2a0085"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"
+dependencies = [
+ "tinyvec",
+]
+
[[package]]
name = "unicode-xid"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
+[[package]]
+name = "url"
+version = "2.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "matches",
+ "percent-encoding",
+]
+
+[[package]]
+name = "utf-8"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
+
[[package]]
name = "version_check"
version = "0.9.3"
@@ -805,10 +1805,67 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
dependencies = [
"same-file",
- "winapi",
+ "winapi 0.3.9",
"winapi-util",
]
+[[package]]
+name = "want"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
+dependencies = [
+ "log",
+ "try-lock",
+]
+
+[[package]]
+name = "warp"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "332d47745e9a0c38636dbd454729b147d16bd1ed08ae67b3ab281c4506771054"
+dependencies = [
+ "bytes",
+ "futures",
+ "headers",
+ "http",
+ "hyper",
+ "log",
+ "mime",
+ "mime_guess",
+ "multipart",
+ "percent-encoding",
+ "pin-project",
+ "scoped-tls",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "tokio",
+ "tokio-stream",
+ "tokio-tungstenite",
+ "tokio-util",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "wasi"
+version = "0.9.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+
+[[package]]
+name = "wasi"
+version = "0.10.2+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
+
+[[package]]
+name = "winapi"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
+
[[package]]
name = "winapi"
version = "0.3.9"
@@ -819,6 +1876,12 @@ dependencies = [
"winapi-x86_64-pc-windows-gnu",
]
+[[package]]
+name = "winapi-build"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
+
[[package]]
name = "winapi-i686-pc-windows-gnu"
version = "0.4.0"
@@ -831,7 +1894,7 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
dependencies = [
- "winapi",
+ "winapi 0.3.9",
]
[[package]]
@@ -840,6 +1903,16 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+[[package]]
+name = "ws2_32-sys"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
+dependencies = [
+ "winapi 0.2.8",
+ "winapi-build",
+]
+
[[package]]
name = "yaml-rust"
version = "0.4.5"
@@ -856,11 +1929,15 @@ dependencies = [
"anyhow",
"extract-frontmatter",
"fs_extra",
+ "futures",
"gray_matter",
"handlebars",
+ "hotwatch",
"lol_html",
"pulldown-cmark",
"serde",
"serde_yaml",
+ "tokio",
"walkdir",
+ "warp",
]
diff --git a/Cargo.toml b/Cargo.toml
index f24079c..421e1f3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,10 +7,18 @@ edition = "2018"
anyhow = "1"
extract-frontmatter = "2.1"
fs_extra = "1.2"
+futures = { version = "0.3", optional = true }
gray_matter = "0.1"
handlebars = "4.1"
+hotwatch = { version = "0.4", optional = true }
lol_html = "0.3"
pulldown-cmark = { version = "0.8", default-features = false, features = ["simd"] }
serde = { version = "1", features = ["derive"] }
serde_yaml = "0.8"
+tokio = { version = "1.10", features = ["macros", "rt-multi-thread"], optional = true }
walkdir = "2"
+warp = { version = "0.3", optional = true }
+
+[features]
+default = ["serve"]
+serve = ["futures", "hotwatch", "tokio", "warp"]
diff --git a/docs/404.html b/docs/404.html
new file mode 100644
index 0000000..1858501
--- /dev/null
+++ b/docs/404.html
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+zoey.dev
+
+
+ 404 Not Found
+The page or resource requested does not exist. Back to home
+
+
+
+
diff --git a/site/pages/404.md b/site/pages/404.md
new file mode 100644
index 0000000..c40c1bb
--- /dev/null
+++ b/site/pages/404.md
@@ -0,0 +1,3 @@
+# 404 Not Found
+
+The page or resource requested does not exist. [Back to home](/)
diff --git a/src/lib.rs b/src/lib.rs
index 480f0ef..81a6a21 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,4 +1,8 @@
#![feature(path_try_exists)]
+#![feature(async_closure)]
+
+#[cfg(feature = "serve")]
+pub mod serving;
use std::{
collections::HashMap,
@@ -13,6 +17,10 @@ use pulldown_cmark::{Options, Parser};
use serde::{Deserialize, Serialize};
use walkdir::WalkDir;
+const PAGES_PATH: &str = "pages";
+const TEMPLATES_PATH: &str = "templates";
+const STATIC_PATH: &str = "static";
+
/// Struct for the site's configuration.
#[derive(Debug, Deserialize)]
pub struct SiteConfig {
@@ -69,7 +77,7 @@ impl Site {
.context("Failed to parse site config")?;
let mut template_index = HashMap::new();
- let templates_path = site_path.join("templates");
+ let templates_path = site_path.join(TEMPLATES_PATH);
for entry in WalkDir::new(&templates_path).into_iter() {
let entry = entry.context("Failed to read template entry")?;
let path = entry.path();
@@ -89,7 +97,7 @@ impl Site {
}
let mut page_index = HashMap::new();
- let pages_path = site_path.join("pages");
+ let pages_path = site_path.join(PAGES_PATH);
for entry in WalkDir::new(&pages_path).into_iter() {
let entry = entry.context("Failed to read page entry")?;
let path = entry.path();
@@ -117,9 +125,16 @@ impl Site {
}
/// Builds the site once.
- pub fn build_once(&self) -> anyhow::Result<()> {
- let builder = SiteBuilder::new(self, None).prepare()?;
+ pub fn build_once(self) -> anyhow::Result<()> {
+ let builder = SiteBuilder::new(self, false).prepare()?;
+ builder.site.build_all_pages(&builder)?;
+
+ Ok(())
+ }
+
+ /// Helper method to build all available pages.
+ fn build_all_pages(&self, builder: &SiteBuilder) -> anyhow::Result<()> {
for page_name in self.page_index.keys() {
builder.build_page(page_name)?;
}
@@ -135,27 +150,30 @@ struct SiteBuilder<'a> {
/// The Handlebars registry used to render templates.
reg: Handlebars<'a>,
/// The site info used to build the site.
- site: &'a Site,
+ site: Site,
/// The path to the build directory.
build_path: PathBuf,
- /// Whether the site should be build for viewing locally without a server.
- local_mode: Option,
+ /// Whether the site is going to be served locally with the dev server.
+ serving: bool,
}
impl<'a> SiteBuilder<'a> {
/// Creates a new site builder.
- pub fn new(site: &'a Site, local_mode: Option) -> Self {
- let build_path = match &site.config.build {
+ pub fn new(site: Site, serving: bool) -> Self {
+ let mut build_path = match &site.config.build {
Some(build) => site.site_path.join(build),
_ => site.site_path.join("build"),
};
+ if serving {
+ build_path = site.site_path.join("build");
+ }
Self {
matter: Matter::new(),
reg: Handlebars::new(),
site,
build_path,
- local_mode,
+ serving,
}
}
@@ -164,7 +182,7 @@ impl<'a> SiteBuilder<'a> {
if std::fs::try_exists(&self.build_path)
.context("Failed check if build directory exists")?
{
- std::fs::remove_dir_all(self.build_path.join("static"))
+ std::fs::remove_dir_all(self.build_path.join(STATIC_PATH))
.context("Failed to remove static directory")?;
for entry in WalkDir::new(&self.build_path) {
let entry = entry?;
@@ -188,12 +206,19 @@ impl<'a> SiteBuilder<'a> {
}
fs_extra::copy_items(
- &[self.site.site_path.join("static")],
+ &[self.site.site_path.join(STATIC_PATH)],
&self.build_path,
&fs_extra::dir::CopyOptions::default(),
)
.context("Failed to copy static directory")?;
+ if self.serving {
+ std::fs::write(
+ self.build_path.join(format!("{}/_dev.js", STATIC_PATH)),
+ include_str!("./refresh_websocket.js"),
+ )?;
+ }
+
Ok(self)
}
@@ -225,11 +250,17 @@ impl<'a> SiteBuilder<'a> {
element_content_handlers: vec![element!("head", |el| {
el.prepend(r#""#, ContentType::Html);
el.append(&format!("{}", title), ContentType::Html);
- let base = self
- .local_mode
- .as_ref()
- .unwrap_or(&self.site.config.base_url);
- el.append(&format!(r#""#, base), ContentType::Html);
+ if self.serving {
+ el.append(
+ &format!(r#""#, STATIC_PATH),
+ ContentType::Html,
+ );
+ } else {
+ el.append(
+ &format!(r#""#, &self.site.config.base_url),
+ ContentType::Html,
+ );
+ }
Ok(())
})],
diff --git a/src/main.rs b/src/main.rs
index 61ae114..9e2d3ef 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,9 +2,40 @@ use std::path::Path;
use zoey::Site;
-fn main() -> anyhow::Result<()> {
- let builder = Site::new(Path::new("site"))?;
- builder.build_once()?;
+#[cfg(feature = "serve")]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+enum Mode {
+ Build,
+ Serve,
+}
+
+#[cfg(feature = "serve")]
+#[tokio::main]
+async fn main() -> anyhow::Result<()> {
+ let site = Site::new(Path::new("site"))?;
+
+ let mut mode = Mode::Build;
+ for arg in std::env::args() {
+ if arg == "serve" {
+ mode = Mode::Serve;
+ break;
+ }
+ }
+
+ match mode {
+ Mode::Build => site.build_once()?,
+ Mode::Serve => site.serve().await?,
+ }
+
+ println!("Build complete!");
+
+ Ok(())
+}
+
+#[cfg(not(feature = "serve"))]
+fn main() -> anyhow::Result<()> {
+ let site = Site::new(Path::new("site"))?;
+ site.build_once()?;
println!("Build complete!");
diff --git a/src/refresh_websocket.js b/src/refresh_websocket.js
new file mode 100644
index 0000000..9df57ab
--- /dev/null
+++ b/src/refresh_websocket.js
@@ -0,0 +1,36 @@
+(function () {
+ "use strict";
+
+ console.log("Connecting...");
+
+ let socket;
+
+ function start(reload) {
+ socket = new WebSocket("ws://127.0.0.1:8080");
+ let reloading = false;
+ socket.onmessage = function (ev) {
+ if (ev.data === "reload") {
+ reloading = true;
+ console.log("Reloading...");
+ location.reload();
+ }
+ };
+ socket.onclose = function () {
+ if (!reloading) {
+ console.error("Connection closed.");
+ setTimeout(() => {
+ console.log("Retrying connection...");
+ start(true);
+ }, 2000);
+ }
+ };
+ socket.onopen = function () {
+ console.log("Connected!");
+ if (reload) {
+ location.reload();
+ }
+ };
+ }
+
+ start(false);
+})();
diff --git a/src/serving.rs b/src/serving.rs
new file mode 100644
index 0000000..bbffa68
--- /dev/null
+++ b/src/serving.rs
@@ -0,0 +1,244 @@
+//! Module containing code to serve the dev site.
+
+use std::{
+ collections::HashMap,
+ net::SocketAddr,
+ path::{Path, PathBuf},
+ sync::{Arc, Mutex},
+};
+
+use futures::SinkExt;
+use hotwatch::{Event, Hotwatch};
+use warp::{
+ path::FullPath,
+ reply::Response,
+ ws::{Message, WebSocket},
+ Filter,
+};
+
+use crate::{Site, SiteBuilder, PAGES_PATH, TEMPLATES_PATH};
+
+fn with_build_path(
+ build_path: PathBuf,
+) -> impl Filter + Clone {
+ warp::any().map(move || build_path.clone())
+}
+
+/// Helper to get the "name" of a path.
+fn get_name(path: &Path) -> (PathBuf, String) {
+ let name = path.with_extension("");
+ let name_str = name.display().to_string();
+ (name, name_str)
+}
+
+/// Helper to make a path relative.
+fn rel(path: &Path, prefix: &Path) -> Result {
+ Ok(path.strip_prefix(prefix)?.to_owned())
+}
+
+/// Creates or updates a resource.
+fn create(
+ builder: &mut SiteBuilder,
+ path: &Path,
+ relative_path: &Path,
+ build: bool,
+) -> anyhow::Result<()> {
+ if let Ok(page_path) = relative_path.strip_prefix(PAGES_PATH) {
+ let (_page_name, page_name_str) = get_name(page_path);
+
+ builder
+ .site
+ .page_index
+ .insert(page_name_str.clone(), path.to_owned());
+ if build {
+ builder.build_page(&page_name_str)?;
+ }
+ } else if let Ok(template_path) = relative_path.strip_prefix(TEMPLATES_PATH) {
+ let (_template_name, template_name_str) = get_name(template_path);
+ builder.refresh_template(&template_name_str, path)?;
+ if build {
+ builder.site.build_all_pages(builder)?;
+ }
+ } else {
+ anyhow::anyhow!("ahh");
+ }
+
+ Ok(())
+}
+
+/// Removes an existing resource.
+fn remove(builder: &mut SiteBuilder, _path: &Path, relative_path: &Path) -> anyhow::Result<()> {
+ if let Ok(page_path) = relative_path.strip_prefix(PAGES_PATH) {
+ let (page_name, page_name_str) = get_name(page_path);
+
+ builder.site.page_index.remove(&page_name_str);
+ std::fs::remove_file(builder.build_path.join(page_name.with_extension("html")))?;
+ } else if let Ok(template_path) = relative_path.strip_prefix(TEMPLATES_PATH) {
+ let (_template_name, template_name_str) = get_name(template_path);
+ builder.site.template_index.remove(&template_name_str);
+ builder.reg.unregister_template(&template_name_str);
+ builder.site.build_all_pages(builder)?;
+ } else {
+ anyhow::anyhow!("ahh");
+ }
+ Ok(())
+}
+
+impl Site {
+ /// Serves the site for development. Don't use this in production.
+ pub async fn serve(self) -> anyhow::Result<()> {
+ let addr = SocketAddr::from(([127, 0, 0, 1], 8080));
+
+ let mut builder = SiteBuilder::new(self, true).prepare()?;
+ let site = &builder.site;
+ let build_path = builder.build_path.clone();
+
+ // Perform initial build
+ for page_name in site.page_index.keys() {
+ if let Err(e) = builder.build_page(page_name) {
+ eprintln!("Failed to build page {}: {}", page_name, e);
+ }
+ }
+
+ // Map of websocket connections
+ let peers: Arc>> =
+ Arc::new(Mutex::new(HashMap::new()));
+
+ // Watch for changes to the site
+ let mut hotwatch = Hotwatch::new().expect("Hotwatch failed to initialize");
+ let hw_peers = peers.clone();
+ hotwatch
+ .watch(site.site_path.clone(), move |event| {
+ let site_path = builder.site.site_path.canonicalize().unwrap();
+ let peers = hw_peers.clone();
+
+ match (|| match event {
+ Event::Write(path) => {
+ let rel = rel(&path, &site_path)?;
+ println!("CHANGED - {:?}", rel);
+ create(&mut builder, &path, &rel, true)?;
+ Ok::<_, anyhow::Error>(true)
+ }
+ Event::Create(path) => {
+ let rel = rel(&path, &site_path)?;
+ println!("CREATED - {:?}", rel);
+ create(&mut builder, &path, &rel, true)?;
+ Ok(true)
+ }
+ Event::Remove(path) => {
+ let rel = rel(&path, &site_path)?;
+ println!("REMOVED - {:?}", rel);
+ remove(&mut builder, &path, &rel)?;
+ Ok(true)
+ }
+ Event::Rename(old, new) => {
+ let old_rel = rel(&old, &site_path)?;
+ let new_rel = rel(&new, &site_path)?;
+ println!("RENAMED - {:?} -> {:?}", old_rel, new_rel);
+ create(&mut builder, &new, &new_rel, false)?;
+ remove(&mut builder, &old, &old_rel)?;
+ Ok(true)
+ }
+ _ => Ok(false),
+ })() {
+ Ok(reload) => {
+ if reload {
+ // Send reload event to connected websockets
+ let mut peers = peers.lock().unwrap();
+ let mut to_remove = Vec::new();
+ for (addr, peer) in peers.iter_mut() {
+ let task = async {
+ peer.send(Message::text("reload".to_string())).await?;
+ Ok::<_, anyhow::Error>(())
+ };
+ to_remove.push(*addr);
+ if let Err(e) = futures::executor::block_on(task) {
+ eprintln!("{}", e);
+ }
+ }
+ for addr in &to_remove {
+ peers.remove(addr);
+ }
+ }
+ }
+ Err(e) => eprintln!("Failed to update: {}", e),
+ }
+ })
+ .expect("Failed to watch file");
+
+ let routes = warp::any()
+ .and(warp::ws())
+ .and(warp::filters::addr::remote())
+ .and_then(move |ws: warp::ws::Ws, addr| {
+ let peers = peers.clone();
+ async move {
+ // Add websocket connection to peers list
+ if let Some(addr) = addr {
+ let peers = peers.clone();
+ return Ok(ws.on_upgrade(move |websocket| async move {
+ peers.lock().unwrap().insert(addr, websocket);
+ }));
+ }
+ Err(warp::reject())
+ }
+ })
+ .or(warp::any().and(warp::get()).and(
+ warp::path::full()
+ .and(with_build_path(build_path.clone()))
+ .and_then(
+ async move |path: FullPath,
+ build_path: PathBuf|
+ -> Result {
+ // Serve static files
+ let p = &path.as_str()[1..];
+ let mut p = build_path.join(p);
+
+ if !p.exists() {
+ p = p.with_extension("html");
+ }
+ if p.is_dir() {
+ p = p.join("index.html");
+ }
+
+ if p.exists() {
+ let body = std::fs::read_to_string(&p).unwrap();
+ let res = Response::new(body.into());
+ return Ok(res);
+ }
+ Err(warp::reject())
+ },
+ ),
+ ))
+ .or(warp::any()
+ .and(warp::path::full())
+ .and_then(move |path: FullPath| {
+ let build_path = build_path.clone();
+ async move {
+ // Handle missing files
+ println!("404 - {}", path.as_str());
+ Ok::<_, std::convert::Infallible>(warp::reply::html(
+ std::fs::read_to_string(build_path.join("404.html")).unwrap(),
+ ))
+ }
+ }));
+
+ println!("Starting server at http://{}", addr);
+ warp::serve(routes).run(addr).await;
+
+ Ok(())
+ }
+}
+
+impl<'a> SiteBuilder<'a> {
+ /// Refreshes a template to ensure it's up to date.
+ pub fn refresh_template(
+ &mut self,
+ template_name: &str,
+ template_path: &Path,
+ ) -> anyhow::Result<()> {
+ self.reg
+ .register_template_file(template_name, template_path)?;
+
+ Ok(())
+ }
+}