Skip to content

Commit

Permalink
Rename askama_actix trait method as suggested by clippy
Browse files Browse the repository at this point in the history
By bumping the dependency versions for askama and askama_shared, this should
be safe.
  • Loading branch information
djc committed Feb 15, 2021
1 parent eed0d33 commit 4c602b1
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions askama/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "askama"
version = "0.10.5"
version = "0.10.6"
authors = ["Dirkjan Ochtman <dirkjan@ochtman.nl>"]
description = "Type-safe, compiled Jinja-like templates for Rust"
documentation = "https://docs.rs/askama"
Expand Down Expand Up @@ -35,7 +35,7 @@ with-warp = ["askama_derive/warp"]
[dependencies]
askama_derive = { version = "0.10.5", path = "../askama_derive" }
askama_escape = { version = "0.10", path = "../askama_escape" }
askama_shared = { version = "0.11", path = "../askama_shared", default-features = false }
askama_shared = { version = "0.11.2", path = "../askama_shared", default-features = false }
mime = { version = "0.3", optional = true }
mime_guess = { version = "2.0.0-alpha", optional = true }

Expand Down
2 changes: 1 addition & 1 deletion askama_actix/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ edition = "2018"

[dependencies]
actix-web = { version = "3", default-features = false }
askama = { version = "0.10", path = "../askama", default-features = false, features = ["with-actix-web", "mime", "mime_guess"] }
askama = { version = "0.10.6", path = "../askama", default-features = false, features = ["with-actix-web", "mime", "mime_guess"] }
bytes = { version = "0.5" }
futures-util = { version = "0.3" }

Expand Down
4 changes: 2 additions & 2 deletions askama_actix/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ use bytes::BytesMut;
use actix_web::{error::ErrorInternalServerError, Error, HttpResponse};

pub trait TemplateIntoResponse {
fn into_response(&self) -> ::std::result::Result<HttpResponse, Error>;
fn to_response(&self) -> ::std::result::Result<HttpResponse, Error>;
}

impl<T: askama::Template> TemplateIntoResponse for T {
fn into_response(&self) -> ::std::result::Result<HttpResponse, Error> {
fn to_response(&self) -> ::std::result::Result<HttpResponse, Error> {
let mut buffer = BytesMut::with_capacity(self.size_hint());
self.render_into(&mut buffer)
.map_err(|_| ErrorInternalServerError("Template parsing error"))?;
Expand Down
2 changes: 1 addition & 1 deletion askama_shared/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "askama_shared"
version = "0.11.1"
version = "0.11.2"
authors = ["Dirkjan Ochtman <dirkjan@ochtman.nl>"]
description = "Shared code for Askama"
homepage = "https://github.com/djc/askama"
Expand Down
2 changes: 1 addition & 1 deletion askama_shared/src/generator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ impl<'a, S: std::hash::BuildHasher> Generator<'a, S> {
)?;

buf.writeln("use ::askama_actix::TemplateIntoResponse;")?;
buf.writeln("::askama_actix::futures::ready(self.into_response())")?;
buf.writeln("::askama_actix::futures::ready(self.to_response())")?;

buf.writeln("}")?;
buf.writeln("}")
Expand Down

0 comments on commit 4c602b1

Please sign in to comment.