Rename askama_actix trait method as suggested by clippy

By bumping the dependency versions for askama and askama_shared, this should
be safe.
This commit is contained in:
Dirkjan Ochtman 2021-02-15 10:11:51 +01:00 committed by Christian Vallentin
parent f5f35dad56
commit 2dbdcdfb64
6 changed files with 12 additions and 12 deletions

View File

@ -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"
@ -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 }

View File

@ -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" }

View File

@ -3,12 +3,12 @@ use bytes::BytesMut;
use actix_web::{error::ErrorInternalServerError, Error, HttpResponse};
pub trait TemplateIntoResponse {
fn into_response(&self) -> ::std::result::Result<HttpResponse, Error>;
pub trait TemplateToResponse {
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> {
impl<T: askama::Template> TemplateToResponse for T {
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"))?;

View File

@ -1,7 +1,7 @@
use actix_web::http::header::CONTENT_TYPE;
use actix_web::test;
use actix_web::web;
use askama_actix::{Template, TemplateIntoResponse};
use askama_actix::{Template, TemplateToResponse};
use bytes::Bytes;
#[derive(Template)]
@ -34,7 +34,7 @@ async fn test_actix_web_responder() {
let srv = test::start(|| {
actix_web::App::new().service(web::resource("/").to(|| async {
let name = "world".to_owned();
HelloTemplate { name: &name }.into_response()
HelloTemplate { name: &name }.to_response()
}))
});

View File

@ -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"

View File

@ -221,8 +221,8 @@ impl<'a, S: std::hash::BuildHasher> Generator<'a, S> {
-> Self::Future {",
)?;
buf.writeln("use ::askama_actix::TemplateIntoResponse;")?;
buf.writeln("::askama_actix::futures::ready(self.into_response())")?;
buf.writeln("use ::askama_actix::TemplateToResponse;")?;
buf.writeln("::askama_actix::futures::ready(self.to_response())")?;
buf.writeln("}")?;
buf.writeln("}")