Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to support axum 0.2 #303

Merged
merged 2 commits into from
Oct 16, 2021
Merged

Update to support axum 0.2 #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
baad3b6
Update to support axum 0.2
davidpdrsn Oct 12, 2021
579f06c
Update changelog
davidpdrsn Oct 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## [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`.
Expand Down
10 changes: 5 additions & 5 deletions docs/content/web-frameworks.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,23 +194,23 @@ 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())
.serve(app.into_make_service())
.await
.unwrap();
}
```
```
2 changes: 1 addition & 1 deletion doctest/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,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"
Expand Down
2 changes: 1 addition & 1 deletion maud/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ 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"] }
Expand Down
3 changes: 3 additions & 0 deletions maud/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,9 @@ mod axum_support {
};

impl IntoResponse for PreEscaped<String> {
type Body = Body;
type BodyError = <Self::Body as axum::body::HttpBody>::Error;

fn into_response(self) -> Response<Body> {
let mut res = Response::new(Body::from(self.0));
*res.status_mut() = StatusCode::OK;
Expand Down