diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e3316c55..96dad894 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,10 +55,7 @@ jobs: override: true - name: Build documentation - run: | - # https://github.com/rust-lang/cargo/issues/9919 - export CARGO_HTTP_MULTIPLEXING=false - cd docs && make -j$(nproc) + run: cd docs && make -j$(nproc) examples: name: Examples @@ -77,10 +74,7 @@ jobs: override: true - name: Doctest - run: | - # https://github.com/rust-lang/cargo/issues/9919 - export CARGO_HTTP_MULTIPLEXING=false - cd doctest && cargo check + run: cd doctest && cargo check rustfmt: name: Rustfmt diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml index 8ff61674..6da913d6 100644 --- a/.github/workflows/publish-docs.yml +++ b/.github/workflows/publish-docs.yml @@ -33,10 +33,7 @@ jobs: override: true - name: Build documentation - run: | - # https://github.com/rust-lang/cargo/issues/9919 - export CARGO_HTTP_MULTIPLEXING=false - cd docs && make -j$(nproc) + run: cd docs && make -j$(nproc) - name: Deploy uses: peaceiris/actions-gh-pages@v3 diff --git a/CHANGELOG.md b/CHANGELOG.md index d41ae026..073ba41c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## [Unreleased] +- Update to support axum 0.2 + [#303](https://github.com/lambda-fairy/maud/pull/303) + +## [0.22.3] - 2021-09-27 + - Support `no_std` + `alloc`. [#278](https://github.com/lambda-fairy/maud/issues/278) - Provide Tide support. @@ -253,7 +258,8 @@ - Update to latest syntax extension API -[Unreleased]: https://github.com/lambda-fairy/maud/compare/v0.22.2...HEAD +[Unreleased]: https://github.com/lambda-fairy/maud/compare/v0.22.3...HEAD +[0.22.3]: https://github.com/lambda-fairy/maud/compare/v0.22.2...v0.22.3 [0.22.2]: https://github.com/lambda-fairy/maud/compare/v0.22.1...v0.22.2 [0.22.1]: https://github.com/lambda-fairy/maud/compare/v0.22.0...v0.22.1 [0.22.0]: https://github.com/lambda-fairy/maud/compare/v0.21.0...v0.22.0 diff --git a/docs/Cargo.lock b/docs/Cargo.lock index 99239580..0eb110f4 100644 --- a/docs/Cargo.lock +++ b/docs/Cargo.lock @@ -1,16 +1,18 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "adler" -version = "0.2.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[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", ] @@ -49,19 +51,18 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "bincode" -version = "1.3.1" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30d3a39baa26f9651f17b375061f3233dde33424a8b72b0dbe93a68a0bc896d" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" dependencies = [ - "byteorder", "serde", ] [[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" @@ -92,15 +93,15 @@ 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 = "cc" -version = "1.0.66" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48" +checksum = "d26a6ce4b6a484fa3edb70f7efa6fc430fd2b87285fe8b84304fd0936faa0dc0" [[package]] name = "cfg-if" @@ -135,9 +136,9 @@ dependencies = [ [[package]] name = "comrak" -version = "0.9.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcfb8008d04126b176c76cbfdecf9a2ccb4bacc70af87c8da6136d63d7b7292a" +checksum = "ff3c476e1a33eb4df1212a02db79d0f788bbd760901f34f5897644623e0e4e74" dependencies = [ "clap", "entities", @@ -146,6 +147,7 @@ dependencies = [ "pest_derive", "regex", "shell-words", + "syntect", "twoway", "typed-arena", "unicode_categories", @@ -194,9 +196,9 @@ checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" [[package]] name = "flate2" -version = "1.0.19" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7411863d55df97a419aa64cb4d2f167103ea9d767e2c54a1868b7ac3f6b47129" +checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" dependencies = [ "cfg-if", "crc32fast", @@ -212,36 +214,33 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[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 = "hashbrown" -version = "0.8.2" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25" -dependencies = [ - "autocfg", -] +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", ] [[package]] name = "indexmap" -version = "1.5.2" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e47a3566dd4fd4eec714ae6ceabdee0caec795be835c223d92c2d40f1e8cf1c" +checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" dependencies = [ "autocfg", "hashbrown", @@ -249,9 +248,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 = "lazy_static" @@ -267,9 +266,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.82" +version = "0.2.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929" +checksum = "a2a5ac8f984bfcf3a823267e5fde638acc3325f6496633a5da6bb6eb2171e103" [[package]] name = "line-wrap" @@ -294,7 +293,7 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" [[package]] name = "maud" -version = "0.22.2" +version = "0.22.3" dependencies = [ "maud_htmlescape", "maud_macros", @@ -302,11 +301,11 @@ dependencies = [ [[package]] name = "maud_htmlescape" -version = "0.17.0" +version = "0.17.1" [[package]] name = "maud_macros" -version = "0.22.2" +version = "0.22.3" dependencies = [ "maud_htmlescape", "proc-macro-error", @@ -317,15 +316,15 @@ 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 = "miniz_oxide" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d" +checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" dependencies = [ "adler", "autocfg", @@ -352,9 +351,9 @@ dependencies = [ [[package]] name = "onig" -version = "6.1.1" +version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b46fd9edbc018f0be4e366c24c46db44fac49cd01c039ae85308088b089dd5" +checksum = "b16fd3c0e73b516af509c13c4ba76ec0c987ce20d78b38cff356b8d01fc6a6c0" dependencies = [ "bitflags", "lazy_static", @@ -364,9 +363,9 @@ dependencies = [ [[package]] name = "onig_sys" -version = "69.6.0" +version = "69.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed063c96cf4c0f2e5d09324409d158b38a0a85a7b90fbd68c8cad75c495d5775" +checksum = "9fd9442a09e4fbd08d196ddf419b2c79a43c3a46c800320cc841d45c2449a240" dependencies = [ "cc", "pkg-config", @@ -423,15 +422,15 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.19" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" +checksum = "7c9b1041b4387893b91ee6746cddfc28516aff326a3519fb2adf820932c5e6cb" [[package]] name = "plist" -version = "1.0.1" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dc57ccf442c7414b790e8e7b72fb4d776a66c7680129360946d9aaa6f5311e9" +checksum = "a38d026d73eeaf2ade76309d0c65db5a35ecf649e3cec428db316243ea9d6711" dependencies = [ "base64", "chrono", @@ -467,39 +466,38 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.24" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" +checksum = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d" dependencies = [ "unicode-xid", ] [[package]] name = "quote" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df" +checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" dependencies = [ "proc-macro2", ] [[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]] 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 = "ryu" @@ -524,15 +522,15 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.118" +version = "1.0.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800" +checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" [[package]] name = "serde_derive" -version = "1.0.118" +version = "1.0.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df" +checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" dependencies = [ "proc-macro2", "quote", @@ -541,9 +539,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", @@ -576,9 +574,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "syn" -version = "1.0.58" +version = "1.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc60a3d73ea6594cd712d830cc1f0390fd71542d8c8cd24e70cc54cdfd5e05d5" +checksum = "5239bc68e0fef57495900cfea4e8dc75596d9a319d7e16b1e0a440d24e6fe0a0" dependencies = [ "proc-macro2", "quote", @@ -587,9 +585,9 @@ dependencies = [ [[package]] name = "syntect" -version = "4.5.0" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bfac2b23b4d049dc9a89353b4e06bbc85a8f42020cccbe5409a115cf19031e5" +checksum = "8b20815bbe80ee0be06e6957450a841185fcf690fe0178f14d77a05ce2caa031" dependencies = [ "bincode", "bitflags", @@ -616,20 +614,11 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "thread_local" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb9bc092d0d51e76b2b19d9d85534ffc9ec2db959a2523cdae0697e2972cd447" -dependencies = [ - "lazy_static", -] - [[package]] name = "twoway" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b40075910de3a912adbd80b5d8bad6ad10a23eeb1f5bf9d4006839e899ba5bc" +checksum = "c57ffb460d7c24cd6eda43694110189030a3d1dfe418416d9468fd1c1d290b47" dependencies = [ "memchr", "unchecked-index", @@ -643,9 +632,9 @@ checksum = "a9b2228007eba4120145f785df0f6c92ea538f5a3635a612ecf4e334c8c1446d" [[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 = "ucd-trie" @@ -661,15 +650,15 @@ checksum = "eeba86d422ce181a719445e51872fa30f1f7413b62becb52e95ec91aa262d85c" [[package]] name = "unicode-width" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" +checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" [[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 = "unicode_categories" @@ -685,15 +674,15 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[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", @@ -739,9 +728,9 @@ checksum = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57" [[package]] name = "xml-rs" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b07db065a5cf61a7e4ba64f29e67db906fb1787316516c4e6e5ff0fea1efcd8a" +checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" [[package]] name = "yaml-rust" diff --git a/docs/Makefile b/docs/Makefile index 267c1d5b..5c108fbc 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -8,7 +8,7 @@ build_page := target/debug/build_page nav_json := site/nav.json -version := $(shell git describe) +version := $(shell git describe --tags) hash := $(shell git rev-parse HEAD) md_files := $(foreach slug,$(slugs),$(call slug_to_md,$(slug))) diff --git a/docs/content/index.md b/docs/content/index.md index a052205e..606f3eb5 100644 --- a/docs/content/index.md +++ b/docs/content/index.md @@ -19,7 +19,7 @@ Maud is an HTML [template engine] for Rust. It's implemented as a macro, `html!`, which compiles your markup to specialized Rust code. This unique approach makes Maud templates -blazing fast, super type-safe, and easy to deploy. +fast, type-safe, and easy to deploy. [template engine]: https://www.simple-is-better.org/template/ diff --git a/docs/content/web-frameworks.md b/docs/content/web-frameworks.md index 23d01bb3..fb05fd4f 100644 --- a/docs/content/web-frameworks.md +++ b/docs/content/web-frameworks.md @@ -157,18 +157,18 @@ This then allows you to use it directly as a response! ```rust,no_run use maud::{html, Markup}; -use axum::prelude::*; +use axum::{Router, handler::get}; async fn hello_world() -> Markup { - html! { - h1 { "Hello, World!" } + html! { + h1 { "Hello, World!" } } } #[tokio::main] async fn main() { // build our application with a single route - let app = route("/", get(hello_world)); + let app = Router::new().route("/", get(hello_world)); // run it with hyper on localhost:3000 axum::Server::bind(&"0.0.0.0:3000".parse().unwrap()) @@ -176,4 +176,4 @@ async fn main() { .await .unwrap(); } -``` \ No newline at end of file +``` diff --git a/doctest/Cargo.toml b/doctest/Cargo.toml index 441c1d54..82a990eb 100644 --- a/doctest/Cargo.toml +++ b/doctest/Cargo.toml @@ -13,7 +13,7 @@ rocket = "0.4" rouille = "3" tide = "0.16" tokio = { version = "1.9.0", features = ["rt", "macros", "rt-multi-thread"] } -axum = "0.1.3" +axum = "0.2" [dependencies.async-std] version = "1.9.0" diff --git a/maud/Cargo.toml b/maud/Cargo.toml index 536e7a12..93530bad 100644 --- a/maud/Cargo.toml +++ b/maud/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "maud" # When releasing a new version, please update html_root_url in src/lib.rs -version = "0.22.2" +version = "0.22.3" authors = ["Chris Wong "] license = "MIT/Apache-2.0" documentation = "https://docs.rs/maud/" @@ -18,13 +18,13 @@ default = [] actix-web = ["actix-web-dep", "futures-util"] [dependencies] -maud_htmlescape = { version = "0.17.0", path = "../maud_htmlescape" } -maud_macros = { version = "0.22.2", path = "../maud_macros" } +maud_htmlescape = { version = "0.17.1", path = "../maud_htmlescape" } +maud_macros = { version = "0.22.3", path = "../maud_macros" } rocket = { version = ">= 0.3, < 0.5", optional = true } futures-util = { version = "0.3.0", optional = true, default-features = false } actix-web-dep = { package = "actix-web", version = ">= 2, < 4", optional = true, default-features = false } tide = { version = "0.16.0", optional = true, default-features = false } -axum = { version = "0.1.3", optional = true } +axum = { version = "0.2", optional = true } [dev-dependencies] trybuild = { version = "1.0.33", features = ["diff"] } diff --git a/maud/src/lib.rs b/maud/src/lib.rs index be8e3da7..6123e35b 100644 --- a/maud/src/lib.rs +++ b/maud/src/lib.rs @@ -7,7 +7,7 @@ //! //! [book]: https://maud.lambda.xyz/ -#![doc(html_root_url = "https://docs.rs/maud/0.22.2")] +#![doc(html_root_url = "https://docs.rs/maud/0.22.3")] extern crate alloc; @@ -239,6 +239,9 @@ mod axum_support { }; impl IntoResponse for PreEscaped { + type Body = Body; + type BodyError = ::Error; + fn into_response(self) -> Response { let mut res = Response::new(Body::from(self.0)); *res.status_mut() = StatusCode::OK; diff --git a/maud/tests/warnings/attribute-missing-value.stderr b/maud/tests/warnings/attribute-missing-value.stderr index c5715000..b2d11bd4 100644 --- a/maud/tests/warnings/attribute-missing-value.stderr +++ b/maud/tests/warnings/attribute-missing-value.stderr @@ -4,6 +4,6 @@ error: unexpected end of input 4 | / html! { 5 | | a href= 6 | | }; - | |______^ + | |_____^ | = note: this error originates in the macro `html` (in Nightly builds, run with -Z macro-backtrace for more info) diff --git a/maud/tests/warnings/class-shorthand-missing-value.stderr b/maud/tests/warnings/class-shorthand-missing-value.stderr index 411b3028..0e16827b 100644 --- a/maud/tests/warnings/class-shorthand-missing-value.stderr +++ b/maud/tests/warnings/class-shorthand-missing-value.stderr @@ -4,6 +4,6 @@ error: unexpected end of input 4 | / html! { 5 | | p. 6 | | }; - | |______^ + | |_____^ | = note: this error originates in the macro `html` (in Nightly builds, run with -Z macro-backtrace for more info) diff --git a/maud/tests/warnings/non-closed-element.stderr b/maud/tests/warnings/non-closed-element.stderr index 5f45772e..0a07197f 100644 --- a/maud/tests/warnings/non-closed-element.stderr +++ b/maud/tests/warnings/non-closed-element.stderr @@ -4,6 +4,6 @@ error: expected `;`, found end of macro 4 | / html! { 5 | | p 6 | | }; - | |______^ + | |_____^ | = note: this error originates in the macro `html` (in Nightly builds, run with -Z macro-backtrace for more info) diff --git a/maud_htmlescape/Cargo.toml b/maud_htmlescape/Cargo.toml index 1440e600..e4e2ff94 100644 --- a/maud_htmlescape/Cargo.toml +++ b/maud_htmlescape/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "maud_htmlescape" # When releasing a new version, please update html_root_url in lib.rs -version = "0.17.0" +version = "0.17.1" authors = ["Chris Wong "] license = "MIT/Apache-2.0" documentation = "https://docs.rs/maud_htmlescape/" diff --git a/maud_htmlescape/lib.rs b/maud_htmlescape/lib.rs index 6f7a20ca..f8adb77d 100644 --- a/maud_htmlescape/lib.rs +++ b/maud_htmlescape/lib.rs @@ -6,7 +6,7 @@ //! //! [Maud]: https://maud.lambda.xyz -#![doc(html_root_url = "https://docs.rs/maud_htmlescape/0.17.0")] +#![doc(html_root_url = "https://docs.rs/maud_htmlescape/0.17.1")] extern crate alloc; diff --git a/maud_macros/Cargo.toml b/maud_macros/Cargo.toml index d4f2b702..834a34ef 100644 --- a/maud_macros/Cargo.toml +++ b/maud_macros/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "maud_macros" # When releasing a new version, please update html_root_url in src/lib.rs -version = "0.22.2" +version = "0.22.3" authors = ["Chris Wong "] license = "MIT/Apache-2.0" documentation = "https://docs.rs/maud_macros/" @@ -14,7 +14,7 @@ edition = "2018" syn = "1.0.8" maud_htmlescape = { version = "0.17.0", path = "../maud_htmlescape" } quote = "1.0.7" -proc-macro2 = "1.0.19" +proc-macro2 = "1.0.23" proc-macro-error = "1.0.0" [lib] diff --git a/maud_macros/src/lib.rs b/maud_macros/src/lib.rs index 9c4148d1..4be664e0 100644 --- a/maud_macros/src/lib.rs +++ b/maud_macros/src/lib.rs @@ -1,4 +1,4 @@ -#![doc(html_root_url = "https://docs.rs/maud_macros/0.22.2")] +#![doc(html_root_url = "https://docs.rs/maud_macros/0.22.3")] // TokenStream values are reference counted, and the mental overhead of tracking // lifetimes outweighs the marginal gains from explicit borrowing #![allow(clippy::needless_pass_by_value)]