Skip to content

Commit b11d99c

Browse files
Merge pull request #1 from GuillaumeGomez/better-errors
Better (post-parser) errors
2 parents ef898e7 + e7a8acf commit b11d99c

File tree

22 files changed

+1441
-787
lines changed

22 files changed

+1441
-787
lines changed

rinja/benches/to-json.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
use criterion::{criterion_group, criterion_main, Criterion};
12
use rinja::filters::json;
23
use rinja_escape::{Html, MarkupDisplay};
3-
use criterion::{criterion_group, criterion_main, Criterion};
44

55
criterion_main!(benches);
66
criterion_group!(benches, functions);

rinja/src/filters/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ mod json;
1414
#[cfg(feature = "serde-json")]
1515
pub use self::json::json;
1616

17-
use rinja_escape::{Escaper, MarkupDisplay};
1817
#[cfg(feature = "humansize")]
1918
use dep_humansize::{ISizeFormatter, ToF64, DECIMAL};
2019
#[cfg(feature = "num-traits")]
2120
use dep_num_traits::{cast::NumCast, Signed};
2221
#[cfg(feature = "percent-encoding")]
2322
use percent_encoding::{utf8_percent_encode, AsciiSet, NON_ALPHANUMERIC};
23+
use rinja_escape::{Escaper, MarkupDisplay};
2424

2525
use super::Result;
2626
#[allow(unused_imports)]

rinja_actix/tests/basic.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use actix_web::http::header::CONTENT_TYPE;
22
use actix_web::web;
3-
use rinja_actix::Template;
43
use bytes::Bytes;
4+
use rinja_actix::Template;
55

66
#[derive(Template)]
77
#[template(path = "hello.html")]

rinja_axum/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
#![deny(elided_lifetimes_in_paths)]
33
#![deny(unreachable_pub)]
44

5-
#[doc(no_inline)]
6-
pub use rinja::*;
75
#[doc(no_inline)]
86
pub use axum_core;
97
use axum_core::response::{IntoResponse, Response};
8+
#[doc(no_inline)]
9+
pub use rinja::*;
1010

1111
/// Render a [`Template`] into a [`Response`], or render an error page.
1212
pub fn into_response<T: ?Sized + rinja::Template>(tmpl: &T) -> Response {

rinja_axum/tests/basic.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
use rinja_axum::Template;
21
use axum::{
32
body::Body,
43
http::{Request, StatusCode},
54
routing::get,
65
Router,
76
};
87
use http_body_util::BodyExt;
8+
use rinja_axum::Template;
99
use tower::util::ServiceExt;
1010

1111
#[derive(Template)]

0 commit comments

Comments
 (0)