Remove ext argument in integrations

djc · Feb 7, 2022 · 2e03c9b · 2e03c9b
1 parent fd8bfa4
commit 2e03c9b
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 29 deletions.
diff --git a/askama_axum/src/lib.rs b/askama_axum/src/lib.rs
@@ -10,7 +10,7 @@ pub use http::Response;
 use http::StatusCode;
 use http_body::{Empty, Full};
 
-pub fn into_response<T: Template>(t: &T, _ext: &str) -> Response<BoxBody> {
+pub fn into_response<T: Template>(t: &T) -> Response<BoxBody> {
     match t.render() {
         Ok(body) => Response::builder()
             .status(StatusCode::OK)

diff --git a/askama_gotham/src/lib.rs b/askama_gotham/src/lib.rs
@@ -9,7 +9,7 @@ use gotham::hyper::header;
 pub use gotham::hyper::{Body, Response, StatusCode};
 pub use gotham::state::State;
 
-pub fn respond<T: Template>(t: &T, _ext: &str) -> Response<Body> {
+pub fn respond<T: Template>(t: &T) -> Response<Body> {
     match t.render() {
         Ok(body) => Response::builder()
             .status(StatusCode::OK)

diff --git a/askama_mendes/src/lib.rs b/askama_mendes/src/lib.rs
@@ -9,12 +9,7 @@ use mendes::http::Response;
 
 pub use askama::*;
 
-pub fn into_response<A, T>(
-    app: &A,
-    req: &Parts,
-    t: &T,
-    _ext: Option<&str>,
-) -> Response<A::ResponseBody>
+pub fn into_response<A, T>(app: &A, req: &Parts, t: &T) -> Response<A::ResponseBody>
 where
     A: Application,
     T: Template,

diff --git a/askama_rocket/src/lib.rs b/askama_rocket/src/lib.rs
@@ -10,7 +10,7 @@ pub use rocket::request::Request;
 use rocket::response::Response;
 pub use rocket::response::{Responder, Result};
 
-pub fn respond<T: Template>(t: &T, _ext: &str) -> Result<'static> {
+pub fn respond<T: Template>(t: &T) -> Result<'static> {
     let rsp = t.render().map_err(|_| Status::InternalServerError)?;
     Response::build()
         .header(Header::new("content-type", T::MIME_TYPE))

diff --git a/askama_shared/src/generator.rs b/askama_shared/src/generator.rs
@@ -223,8 +223,7 @@ impl<'a, S: std::hash::BuildHasher> Generator<'a, S> {
             "fn into_response(self)\
              -> ::askama_axum::Response<::askama_axum::BoxBody> {",
         )?;
-        let ext = self.input.extension().unwrap_or("txt");
-        buf.writeln(&format!("::askama_axum::into_response(&self, {:?})", ext))?;
+        buf.writeln("::askama_axum::into_response(&self)")?;
         buf.writeln("}")?;
         buf.writeln("}")
     }
@@ -237,8 +236,7 @@ impl<'a, S: std::hash::BuildHasher> Generator<'a, S> {
             "fn into_response(self, _state: &::askama_gotham::State)\
              -> ::askama_gotham::Response<::askama_gotham::Body> {",
         )?;
-        let ext = self.input.extension().unwrap_or("txt");
-        buf.writeln(&format!("::askama_gotham::respond(&self, {:?})", ext))?;
+        buf.writeln("::askama_gotham::respond(&self)")?;
         buf.writeln("}")?;
         buf.writeln("}")
     }
@@ -283,10 +281,7 @@ impl<'a, S: std::hash::BuildHasher> Generator<'a, S> {
              -> ::mendes::http::Response<A::ResponseBody> {",
         )?;
 
-        buf.writeln(&format!(
-            "::askama_mendes::into_response(app, req, &self, {:?})",
-            self.input.extension()
-        ))?;
+        buf.writeln("::askama_mendes::into_response(app, req, &self)")?;
         buf.writeln("}")?;
         buf.writeln("}")?;
         Ok(())
@@ -307,17 +302,14 @@ impl<'a, S: std::hash::BuildHasher> Generator<'a, S> {
             "fn respond_to(self, _: &::askama_rocket::Request) \
              -> ::askama_rocket::Result<'askama> {",
         )?;
-        let ext = self.input.extension().unwrap_or("txt");
-        buf.writeln(&format!("::askama_rocket::respond(&self, {:?})", ext))?;
+        buf.writeln("::askama_rocket::respond(&self)")?;
 
         buf.writeln("}")?;
         buf.writeln("}")?;
         Ok(())
     }
 
     fn impl_tide_integrations(&mut self, buf: &mut Buffer) -> Result<(), CompileError> {
-        let ext = self.input.extension().unwrap_or("txt");
-
         self.write_header(
             buf,
             "::std::convert::TryInto<::askama_tide::tide::Body>",
@@ -328,24 +320,23 @@ impl<'a, S: std::hash::BuildHasher> Generator<'a, S> {
             #[inline]\n\
             fn try_into(self) -> ::askama_tide::askama::Result<::askama_tide::tide::Body> {",
         )?;
-        buf.writeln(&format!("::askama_tide::try_into_body(&self, {:?})", &ext))?;
+        buf.writeln("::askama_tide::try_into_body(&self)")?;
         buf.writeln("}")?;
         buf.writeln("}")?;
 
         buf.writeln("#[allow(clippy::from_over_into)]")?;
         self.write_header(buf, "Into<::askama_tide::tide::Response>", None)?;
         buf.writeln("#[inline]")?;
         buf.writeln("fn into(self) -> ::askama_tide::tide::Response {")?;
-        buf.writeln(&format!("::askama_tide::into_response(&self, {:?})", ext))?;
+        buf.writeln("::askama_tide::into_response(&self)")?;
         buf.writeln("}\n}")
     }
 
     fn impl_warp_reply(&mut self, buf: &mut Buffer) -> Result<(), CompileError> {
         self.write_header(buf, "::askama_warp::warp::reply::Reply", None)?;
         buf.writeln("#[inline]")?;
         buf.writeln("fn into_response(self) -> ::askama_warp::warp::reply::Response {")?;
-        let ext = self.input.extension().unwrap_or("txt");
-        buf.writeln(&format!("::askama_warp::reply(&self, {:?})", ext))?;
+        buf.writeln("::askama_warp::reply(&self)")?;
         buf.writeln("}")?;
         buf.writeln("}")
     }

diff --git a/askama_tide/src/lib.rs b/askama_tide/src/lib.rs
@@ -8,15 +8,15 @@ pub use tide;
 use askama::*;
 use tide::{Body, Response};
 
-pub fn try_into_body<T: Template>(t: &T, _ext: &str) -> Result<Body> {
+pub fn try_into_body<T: Template>(t: &T) -> Result<Body> {
     let string = t.render()?;
     let mut body = Body::from_string(string);
     body.set_mime(T::MIME_TYPE);
     Ok(body)
 }
 
-pub fn into_response<T: Template>(t: &T, ext: &str) -> Response {
-    match try_into_body(t, ext) {
+pub fn into_response<T: Template>(t: &T) -> Response {
+    match try_into_body(t) {
         Ok(body) => {
             let mut response = Response::new(200);
             response.set_body(body);

diff --git a/askama_warp/src/lib.rs b/askama_warp/src/lib.rs
@@ -9,7 +9,7 @@ use warp::http::{self, header, StatusCode};
 use warp::hyper::Body;
 use warp::reply::Response;
 
-pub fn reply<T: askama::Template>(t: &T, _ext: &str) -> Response {
+pub fn reply<T: askama::Template>(t: &T) -> Response {
     match t.render() {
         Ok(body) => http::Response::builder()
             .status(StatusCode::OK)