itsscb/askama
1
0
Fork 0
mirror of https://github.com/askama-rs/askama.git synced 2025-10-03 07:45:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to rocket 0.5-rc.3

Browse Source
This commit is contained in:
Vypo Mouse 2023-03-25 14:40:37 -04:00 committed by Dirkjan Ochtman
parent 4c98685b81
commit 1856c4b57c
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
askama_derive/src/generator.rs
View File

@ -532,18 +532,27 @@ impl<'a> Generator<'a> {
// Implement Rocket's `Responder`. // Implement Rocket's `Responder`.
#[cfg(feature = "with-rocket")] #[cfg(feature = "with-rocket")]
fn impl_rocket_responder(&mut self, buf: &mut Buffer) -> Result<(), CompileError> { fn impl_rocket_responder(&mut self, buf: &mut Buffer) -> Result<(), CompileError> {
let lifetime = syn::Lifetime::new("'askama", proc_macro2::Span::call_site()); let lifetime1 = syn::Lifetime::new("'askama1", proc_macro2::Span::call_site());
let param = syn::GenericParam::Lifetime(syn::LifetimeParam::new(lifetime)); let lifetime2 = syn::Lifetime::new("'askama2", proc_macro2::Span::call_site());
let mut param2 = syn::LifetimeParam::new(lifetime2);
param2.colon_token = Some(syn::Token![:](proc_macro2::Span::call_site()));
param2.bounds = syn::punctuated::Punctuated::new();
param2.bounds.push_value(lifetime1.clone());
let param1 = syn::GenericParam::Lifetime(syn::LifetimeParam::new(lifetime1));
let param2 = syn::GenericParam::Lifetime(param2);
self.write_header( self.write_header(
buf, buf,
"::askama_rocket::Responder<'askama, 'askama>", "::askama_rocket::Responder<'askama1, 'askama2>",
Some(vec![param]), Some(vec![param1, param2]),
)?; )?;
buf.writeln("#[inline]")?; buf.writeln("#[inline]")?;
buf.writeln( buf.writeln(
"fn respond_to(self, _: &::askama_rocket::Request) \ "fn respond_to(self, _: &'askama1 ::askama_rocket::Request) \
-> ::askama_rocket::Result<'askama> {", -> ::askama_rocket::Result<'askama2> {",
)?; )?;
buf.writeln("::askama_rocket::respond(&self)")?; buf.writeln("::askama_rocket::respond(&self)")?;

2
askama_rocket/Cargo.toml
View File

@ -15,7 +15,7 @@ rust-version = "1.58"
[dependencies] [dependencies]
askama = { version = "0.12", path = "../askama", default-features = false, features = ["with-rocket", "mime", "mime_guess"] } askama = { version = "0.12", path = "../askama", default-features = false, features = ["with-rocket", "mime", "mime_guess"] }
rocket = { version = "0.5.0-rc.2", default-features = false } rocket = { version = "0.5.0-rc.3", default-features = false }
[dev-dependencies] [dev-dependencies]
futures-lite = "1.12.0" futures-lite = "1.12.0"

6
askama_rocket/tests/basic.rs
View File

@ -3,6 +3,7 @@ use askama::Template;
use futures_lite::future::block_on; use futures_lite::future::block_on;
use rocket::http::{ContentType, Status}; use rocket::http::{ContentType, Status};
use rocket::local::asynchronous::Client; use rocket::local::asynchronous::Client;
use rocket::Responder;
#[derive(Template)] #[derive(Template)]
#[template(path = "hello.html")] #[template(path = "hello.html")]
@ -10,6 +11,11 @@ struct HelloTemplate<'a> {
name: &'a str, name: &'a str,
} }
#[derive(Responder)]
struct HelloResponder<'a> {
template: HelloTemplate<'a>,
}
#[rocket::get("/")] #[rocket::get("/")]
fn hello() -> HelloTemplate<'static> { fn hello() -> HelloTemplate<'static> {
HelloTemplate { name: "world" } HelloTemplate { name: "world" }