diff --git a/Cargo.lock b/Cargo.lock index f9d859f..aa69676 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "aho-corasick" -version = "0.7.15" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" dependencies = [ "memchr", ] @@ -104,9 +104,9 @@ checksum = "383d29d513d8764dcdc42ea295d979eb99c3c9f00607b3692cf68a431f7dca72" [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "block-buffer" @@ -131,9 +131,9 @@ dependencies = [ [[package]] name = "bstr" -version = "0.2.14" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "473fc6b38233f9af7baa94fb5852dca389e3d95b8e21c8e3719301462c5d9faf" +checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" dependencies = [ "memchr", ] @@ -152,9 +152,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "byteorder" -version = "1.4.2" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" @@ -234,11 +234,10 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.1" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d" +checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" dependencies = [ - "autocfg", "cfg-if 1.0.0", "lazy_static", ] @@ -353,9 +352,9 @@ dependencies = [ [[package]] name = "diligent-date-parser" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e37ea528f01b8bfca1f71bcd06a8e6c898bf8fdfbf24dd9dbc7fb49338ed6d84" +checksum = "c2d0fd95c7c02e2d6c588c6c5628466fff9bdde4b8c6196465e087b08e792720" dependencies = [ "chrono", ] @@ -374,9 +373,9 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "encoding_rs" -version = "0.8.26" +version = "0.8.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "801bbab217d7f79c0062f4f7205b5d4427c6d1a7bd7aafdd1475f7c59d62b283" +checksum = "a74ea89a0a1b98f6332de42c95baff457ada66d1cb4030f9ff151b2041a1c746" dependencies = [ "cfg-if 1.0.0", ] @@ -403,13 +402,13 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.13" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c122a393ea57648015bf06fbd3d372378992e86b9ff5a7a497b076a28c79efe" +checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.1.57", + "redox_syscall", "winapi 0.3.9", ] @@ -563,18 +562,18 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" +checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" dependencies = [ "typenum", ] [[package]] name = "getrandom" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4060f4657be78b8e766215b02b18a2e862d83745545de804638e2b545e81aee6" +checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" dependencies = [ "cfg-if 1.0.0", "libc", @@ -589,9 +588,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "globset" -version = "0.4.6" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c152169ef1e421390738366d2f796655fec62621dabbd0fd476f905934061e4a" +checksum = "10463d9ff00a2a068db14231982f5132edebad0d7660cd956a1c30292dbcbfbd" dependencies = [ "aho-corasick", "bstr", @@ -632,15 +631,15 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.9.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" +checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" [[package]] name = "hermit-abi" -version = "0.1.17" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" dependencies = [ "libc", ] @@ -681,9 +680,9 @@ checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440" [[package]] name = "humansize" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6cab2627acfc432780848602f3f558f7e9dd427352224b0d9324025796d2a5e" +checksum = "02296996cb8796d7c6e3bc2d9211b7802812d36999a51bb754123ead7d37d026" [[package]] name = "hyper" @@ -717,9 +716,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "ignore" -version = "0.4.17" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b287fb45c60bb826a0dc68ff08742b9d88a2fea13d6e0c286b3172065aaf878c" +checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d" dependencies = [ "crossbeam-utils", "globset", @@ -735,9 +734,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b" +checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" dependencies = [ "autocfg", "hashbrown", @@ -763,9 +762,9 @@ dependencies = [ [[package]] name = "inotify-sys" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4563555856585ab3180a5bf0b2f9f8d301a728462afffc8195b3f5394229c55" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" dependencies = [ "libc", ] @@ -790,9 +789,9 @@ dependencies = [ [[package]] name = "itoa" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "kernel32-sys" @@ -833,11 +832,11 @@ dependencies = [ [[package]] name = "log" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf3805d4480bb5b86070dcfeb9e2cb2ebc148adb753c5cca5f884d1d65a42b2" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", ] [[package]] @@ -872,9 +871,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.3.4" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" [[package]] name = "mime" @@ -882,6 +881,28 @@ version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +[[package]] +name = "mini-internal" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac2f0e3cdd28b81bf077f464771717698e7ae3f0321c0086dd7ad241d6085ce7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "miniserde" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a116a35523bbd5b1712cefda270a03d1481263a114b6705cb1f02692651f76f" +dependencies = [ + "itoa", + "mini-internal", + "ryu", +] + [[package]] name = "mio" version = "0.6.23" @@ -972,13 +993,11 @@ name = "mycelial_technology" version = "0.1.0" dependencies = [ "log", + "miniserde", "regex", "rocket", "rocket_dyn_templates", "rss", - "serde", - "serde_derive", - "serde_json", "tera", ] @@ -1004,9 +1023,9 @@ dependencies = [ [[package]] name = "notify" -version = "4.0.15" +version = "4.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80ae4a7688d1fab81c5bf19c64fc8db920be8d519ce6336ed4e7efe024724dbd" +checksum = "ae03c8c853dba7bfd23e571ff0cff7bc9dceb40a4cd684cd1681824183f45257" dependencies = [ "bitflags", "filetime", @@ -1090,7 +1109,7 @@ dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall 0.2.10", + "redox_syscall", "smallvec", "winapi 0.3.9", ] @@ -1229,9 +1248,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "ppv-lite86" -version = "0.2.10" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" +checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba" [[package]] name = "proc-macro-hack" @@ -1279,18 +1298,18 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df" +checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" dependencies = [ "proc-macro2", ] [[package]] name = "rand" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18519b42a40024d661e1714153e9ad0c3de27cd495760ceb09710920f1098b1e" +checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" dependencies = [ "libc", "rand_chacha", @@ -1300,9 +1319,9 @@ dependencies = [ [[package]] name = "rand_chacha" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", "rand_core", @@ -1310,28 +1329,22 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c026d7df8b298d90ccbbc5190bd04d85e159eaf5576caeacf8741da93ccbd2e5" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ "getrandom", ] [[package]] name = "rand_hc" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" +checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" dependencies = [ "rand_core", ] -[[package]] -name = "redox_syscall" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - [[package]] name = "redox_syscall" version = "0.2.10" @@ -1363,14 +1376,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.4.3" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a" +checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" dependencies = [ "aho-corasick", "memchr", "regex-syntax", - "thread_local", ] [[package]] @@ -1384,9 +1396,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.22" +version = "0.6.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581" +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" [[package]] name = "remove_dir_all" @@ -1424,7 +1436,6 @@ dependencies = [ "rocket_codegen", "rocket_http", "serde", - "serde_json", "state", "tempfile", "time 0.2.27", @@ -1565,18 +1576,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.119" +version = "1.0.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bdd36f49e35b61d49efd8aa7fc068fd295961fd2286d0b2ee9a4c7a14e99cc3" +checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.119" +version = "1.0.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552954ce79a059ddd5fd68c271592374bd15cab2274970380c000118aeffe1cd" +checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" dependencies = [ "proc-macro2", "quote", @@ -1585,9 +1596,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.61" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fceb2595057b6891a4ee808f70054bd2d12f0e97f1cbb78689b59f676df325a" +checksum = "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8" dependencies = [ "itoa", "ryu", @@ -1638,9 +1649,9 @@ checksum = "533494a8f9b724d33625ab53c6c4800f7cc445895924a8ef649222dcb76e938b" [[package]] name = "slab" -version = "0.4.2" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" +checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" [[package]] name = "slug" @@ -1653,9 +1664,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" +checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" [[package]] name = "socket2" @@ -1775,7 +1786,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "rand", - "redox_syscall 0.2.10", + "redox_syscall", "remove_dir_all", "winapi 0.3.9", ] @@ -1804,11 +1815,11 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb9bc092d0d51e76b2b19d9d85534ffc9ec2db959a2523cdae0697e2972cd447" +checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd" dependencies = [ - "lazy_static", + "once_cell", ] [[package]] @@ -2022,9 +2033,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.12.0" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" +checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec" [[package]] name = "ubyte" @@ -2109,21 +2120,21 @@ dependencies = [ [[package]] name = "unicode-xid" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" [[package]] name = "version_check" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" +checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" [[package]] name = "walkdir" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" dependencies = [ "same-file", "winapi 0.3.9", @@ -2142,9 +2153,9 @@ dependencies = [ [[package]] name = "wasi" -version = "0.10.1+wasi-snapshot-preview1" +version = "0.10.2+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93c6c3420963c5c64bca373b25e77acb562081b9bb4dd5bb864187742186cea9" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" [[package]] name = "wasm-bindgen" diff --git a/Cargo.toml b/Cargo.toml index e51a5b9..8048caa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,15 +4,11 @@ version = "0.1.0" authors = ["glyph "] edition = "2018" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] log = "0.4" regex = "1" -rocket = { version = "0.5.0-rc.1", features = ["json"] } +rocket = "0.5.0-rc.1" rocket_dyn_templates = { version = "0.1.0-rc.1", features = ["tera"] } rss = "1" -serde = "1" -serde_derive = "1" -serde_json = "1" +miniserde = "0.1" tera = "1" diff --git a/src/main.rs b/src/main.rs index 118a1a1..2918ae2 100644 --- a/src/main.rs +++ b/src/main.rs @@ -3,10 +3,9 @@ extern crate log; #[macro_use] extern crate rocket; -#[macro_use] -extern crate serde_derive; extern crate tera; +use miniserde::{json, Serialize}; use rocket::{ fs::{relative, FileServer}, get, routes, @@ -19,20 +18,13 @@ struct FlashContext { flash_msg: Option, } -/* -#[get("/")] -fn files(file: PathBuf) -> Option { - NamedFile::open(Path::new("static/").join(file)).ok() -} -*/ - #[get("/art")] fn art() -> Template { let context = FlashContext { flash_name: None, flash_msg: None, }; - Template::render("art", &context) + Template::render("art", json::to_string(&context)) } #[get("/background")] @@ -41,7 +33,7 @@ fn background() -> Template { flash_name: None, flash_msg: None, }; - Template::render("background", &context) + Template::render("background", json::to_string(&context)) } #[get("/bacteria")] @@ -50,7 +42,7 @@ fn bacteria() -> Template { flash_name: None, flash_msg: None, }; - Template::render("bacteria", &context) + Template::render("bacteria", json::to_string(&context)) } #[get("/bacteria/sauerkraut-beginnings")] @@ -59,7 +51,7 @@ fn bacteria_sauerkraut_beginnings() -> Template { flash_name: None, flash_msg: None, }; - Template::render("bacteria/sauerkraut_beginnings", &context) + Template::render("bacteria/sauerkraut_beginnings", json::to_string(&context)) } #[get("/bacteria/sauerkraut-bottled")] @@ -68,7 +60,7 @@ fn bacteria_sauerkraut_bottled() -> Template { flash_name: None, flash_msg: None, }; - Template::render("bacteria/sauerkraut_bottled", &context) + Template::render("bacteria/sauerkraut_bottled", json::to_string(&context)) } #[get("/computers")] @@ -77,7 +69,7 @@ fn computers() -> Template { flash_name: None, flash_msg: None, }; - Template::render("computers", &context) + Template::render("computers", json::to_string(&context)) } #[get("/computers/esp8266-dht11")] @@ -86,7 +78,7 @@ fn computers_esp8266_dht11() -> Template { flash_name: None, flash_msg: None, }; - Template::render("computers/esp8266_dht11", &context) + Template::render("computers/esp8266_dht11", json::to_string(&context)) } #[get("/computers/i2c-adventures")] @@ -95,7 +87,7 @@ fn computers_i2c_adventures() -> Template { flash_name: None, flash_msg: None, }; - Template::render("computers/i2c_adventures", &context) + Template::render("computers/i2c_adventures", json::to_string(&context)) } #[get("/computers/rust-compilation")] @@ -104,7 +96,7 @@ fn computers_rust_compilation() -> Template { flash_name: None, flash_msg: None, }; - Template::render("computers/rust_compilation", &context) + Template::render("computers/rust_compilation", json::to_string(&context)) } #[get("/fungi")] @@ -113,7 +105,7 @@ fn fungi() -> Template { flash_name: None, flash_msg: None, }; - Template::render("fungi", &context) + Template::render("fungi", json::to_string(&context)) } #[get("/fungi/design-patterns")] @@ -122,7 +114,7 @@ fn fungi_design_patterns() -> Template { flash_name: None, flash_msg: None, }; - Template::render("fungi/design_patterns", &context) + Template::render("fungi/design_patterns", json::to_string(&context)) } #[get("/fungi/glossary")] @@ -131,7 +123,7 @@ fn fungi_glossary() -> Template { flash_name: None, flash_msg: None, }; - Template::render("fungi/glossary", &context) + Template::render("fungi/glossary", json::to_string(&context)) } #[get("/fungi/grow-forests")] @@ -140,7 +132,7 @@ fn fungi_grow_forests() -> Template { flash_name: None, flash_msg: None, }; - Template::render("fungi/grow_forests", &context) + Template::render("fungi/grow_forests", json::to_string(&context)) } #[get("/fungi/grow-together")] @@ -149,7 +141,7 @@ fn fungi_grow_together() -> Template { flash_name: None, flash_msg: None, }; - Template::render("fungi/grow_together", &context) + Template::render("fungi/grow_together", json::to_string(&context)) } #[get("/fungi/lichen-space")] @@ -158,7 +150,7 @@ fn fungi_lichen_space() -> Template { flash_name: None, flash_msg: None, }; - Template::render("fungi/lichen_space", &context) + Template::render("fungi/lichen_space", json::to_string(&context)) } #[get("/fungi/network-resilience")] @@ -167,7 +159,7 @@ fn fungi_network_resilience() -> Template { flash_name: None, flash_msg: None, }; - Template::render("fungi/network_resilience", &context) + Template::render("fungi/network_resilience", json::to_string(&context)) } #[get("/fungi/photo-guide")] @@ -176,7 +168,7 @@ fn fungi_photo_guide() -> Template { flash_name: None, flash_msg: None, }; - Template::render("fungi/photo_guide", &context) + Template::render("fungi/photo_guide", json::to_string(&context)) } #[get("/fungi/reading-list")] @@ -185,7 +177,7 @@ fn fungi_reading_list() -> Template { flash_name: None, flash_msg: None, }; - Template::render("fungi/reading_list", &context) + Template::render("fungi/reading_list", json::to_string(&context)) } #[get("/")] @@ -194,7 +186,7 @@ fn home() -> Template { flash_name: None, flash_msg: None, }; - Template::render("home", &context) + Template::render("home", json::to_string(&context)) } #[get("/lists")] @@ -203,7 +195,7 @@ fn lists() -> Template { flash_name: None, flash_msg: None, }; - Template::render("lists", &context) + Template::render("lists", json::to_string(&context)) } #[get("/meditation")] @@ -212,7 +204,7 @@ fn meditation() -> Template { flash_name: None, flash_msg: None, }; - Template::render("meditation", &context) + Template::render("meditation", json::to_string(&context)) } #[get("/plants")] @@ -221,7 +213,7 @@ fn plants() -> Template { flash_name: None, flash_msg: None, }; - Template::render("plants", &context) + Template::render("plants", json::to_string(&context)) } #[get("/plants/aloe-there")] @@ -230,7 +222,7 @@ fn plants_aloe_there() -> Template { flash_name: None, flash_msg: None, }; - Template::render("plants/aloe_there", &context) + Template::render("plants/aloe_there", json::to_string(&context)) } #[get("/plants/blueberry-dance")] @@ -239,7 +231,7 @@ fn plants_blueberry_dance() -> Template { flash_name: None, flash_msg: None, }; - Template::render("plants/blueberry_dance", &context) + Template::render("plants/blueberry_dance", json::to_string(&context)) } #[get("/plants/botanical-deceptions")] @@ -248,7 +240,7 @@ fn plants_botanical_deceptions() -> Template { flash_name: None, flash_msg: None, }; - Template::render("plants/botanical_deceptions", &context) + Template::render("plants/botanical_deceptions", json::to_string(&context)) } #[get("/plants/potato-tech")] @@ -257,7 +249,7 @@ fn plants_potato_tech() -> Template { flash_name: None, flash_msg: None, }; - Template::render("plants/potato_tech", &context) + Template::render("plants/potato_tech", json::to_string(&context)) } #[get("/projects")] @@ -266,7 +258,7 @@ fn projects() -> Template { flash_name: None, flash_msg: None, }; - Template::render("projects", &context) + Template::render("projects", json::to_string(&context)) } #[get("/support")] @@ -275,7 +267,7 @@ fn support() -> Template { flash_name: None, flash_msg: None, }; - Template::render("support", &context) + Template::render("support", json::to_string(&context)) } #[catch(404)] @@ -285,7 +277,7 @@ fn not_found() -> Template { flash_name: Some("error".to_string()), flash_msg: Some("No resource found for given URL".to_string()), }; - Template::render("not_found", context) + Template::render("not_found", json::to_string(&context)) } #[launch]