From: Ian Jackson Date: Mon, 7 Jun 2021 23:28:38 +0000 (+0100) Subject: deps: Add a newer tera for standalone use X-Git-Tag: otter-0.7.0~42 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0cab2abdcfa412969e9e8737d426ba625cc9ab9c;p=otter.git deps: Add a newer tera for standalone use The old tera that rocket_contrib wants is ... old. It has a strange API. Adding this newer version and using it for spec templating adds 16Mby to the debug binary and 1.2Mby to the release binary. Ah well. Signed-off-by: Ian Jackson --- diff --git a/Cargo.lock b/Cargo.lock index 59a06740..9e618a7d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -264,6 +264,15 @@ version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfa8873f51c92e232f9bac4065cddef41b714152812bfc5f7672ba16d6ef8cd9" +[[package]] +name = "bstr" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279" +dependencies = [ + "memchr", +] + [[package]] name = "buf_redux" version = "0.8.4" @@ -1415,6 +1424,30 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +[[package]] +name = "globset" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c152169ef1e421390738366d2f796655fec62621dabbd0fd476f905934061e4a" +dependencies = [ + "aho-corasick", + "bstr", + "fnv", + "log 0.4.14", + "regex", +] + +[[package]] +name = "globwalk" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc" +dependencies = [ + "bitflags", + "ignore", + "walkdir", +] + [[package]] name = "h2" version = "0.3.3" @@ -1643,6 +1676,24 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f7280c75fb2e2fc47080ec80ccc481376923acb04501957fc38f935c3de5088" +[[package]] +name = "ignore" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b287fb45c60bb826a0dc68ff08742b9d88a2fea13d6e0c286b3172065aaf878c" +dependencies = [ + "crossbeam-utils", + "globset", + "lazy_static", + "log 0.4.14", + "memchr", + "regex", + "same-file", + "thread_local", + "walkdir", + "winapi-util", +] + [[package]] name = "image" version = "0.23.14" @@ -2418,7 +2469,8 @@ dependencies = [ "strum", "subtle", "tempfile", - "tera", + "tera 0.11.20", + "tera 1.10.0", "toml 0.5.8", "typetag", "uds", @@ -3323,7 +3375,7 @@ dependencies = [ "rocket", "serde", "serde_json", - "tera", + "tera 0.11.20", "time", ] @@ -3942,10 +3994,32 @@ dependencies = [ "serde", "serde_json", "slug", - "unic-segment", + "unic-segment 0.7.0", "url 1.7.2", ] +[[package]] +name = "tera" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81060acb882480c8793782eb96bc86f5c83d2fc7175ad46c375c6956ef7afa62" +dependencies = [ + "chrono", + "chrono-tz", + "globwalk", + "humansize", + "lazy_static", + "percent-encoding 2.1.0", + "pest", + "pest_derive", + "rand 0.8.3", + "regex", + "serde", + "serde_json", + "slug", + "unic-segment 0.9.0", +] + [[package]] name = "term" version = "0.5.2" @@ -4057,6 +4131,15 @@ dependencies = [ "syn 1.0.72", ] +[[package]] +name = "thread_local" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd" +dependencies = [ + "once_cell", +] + [[package]] name = "threadpool" version = "1.8.1" @@ -4283,7 +4366,16 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce36d3f7ce754afdbccccf8ff0dd0134e50fb44aaae579f96218856e9e5dbd1e" dependencies = [ - "unic-char-range", + "unic-char-range 0.7.0", +] + +[[package]] +name = "unic-char-property" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" +dependencies = [ + "unic-char-range 0.9.0", ] [[package]] @@ -4292,19 +4384,40 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9ab85fab42ad1b26cafc03bf891f69cb4d6e15f491030e89a0122197baa8ae8" +[[package]] +name = "unic-char-range" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" + [[package]] name = "unic-common" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff8d4a7ade929ef7d971e16ced21a8cd56a63869aa6032dfb8cb083cf7d077bf" +[[package]] +name = "unic-common" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" + [[package]] name = "unic-segment" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9ca47cbb09fb5fcd066b5867d11dc528302fa465277882797d6a836e1ee6f9e" dependencies = [ - "unic-ucd-segment", + "unic-ucd-segment 0.7.0", +] + +[[package]] +name = "unic-segment" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ed5d26be57f84f176157270c112ef57b86debac9cd21daaabbe56db0f88f23" +dependencies = [ + "unic-ucd-segment 0.9.0", ] [[package]] @@ -4313,9 +4426,20 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48f1a08ce0409a9e391b88d1930118eec48af12742fc538bcec55f775865776e" dependencies = [ - "unic-char-property", - "unic-char-range", - "unic-ucd-version", + "unic-char-property 0.7.0", + "unic-char-range 0.7.0", + "unic-ucd-version 0.7.0", +] + +[[package]] +name = "unic-ucd-segment" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2079c122a62205b421f499da10f3ee0f7697f012f55b675e002483c73ea34700" +dependencies = [ + "unic-char-property 0.9.0", + "unic-char-range 0.9.0", + "unic-ucd-version 0.9.0", ] [[package]] @@ -4324,7 +4448,16 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf1f5e6c6c53c2d0ece4a5964bc55fcff8602153063cb4fab20958ff32998ff6" dependencies = [ - "unic-common", + "unic-common 0.7.0", +] + +[[package]] +name = "unic-ucd-version" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" +dependencies = [ + "unic-common 0.9.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index a1dfc022..5eaf78fb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -92,6 +92,8 @@ mio = { version="0.7", features=["os-ext", "os-poll" ] } serde = { version="1" , features=["derive", "rc"] } strum = { version="0.20" , features=["derive" ] } +tera_standalone = { version="1.10", package="tera" } + slotmap = { package="slotmap-fork-otter", version="1", git="https://github.com/ijackson/slotmap", branch="slotmap-fork-otter", features=["serde"] } #fin.