itsscb/askama
1
0
Fork 0
mirror of https://github.com/askama-rs/askama.git synced 2025-09-28 13:30:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

derive: update expected output for newer trybuild versions

Browse Source
This commit is contained in:
René Kijewski 2024-12-16 11:46:16 +01:00
parent 2cf65d18cc
commit 74bf996ff3
5 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rinja_derive/src/config.rs
View File

@ -407,7 +407,14 @@ mod tests {
}
fn assert_eq_rooted(actual: &Path, expected: &str) {
let mut root = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap());
let mut root = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap())
.canonicalize()
.unwrap();
if root.ends_with("rinja_derive_standalone") {
root.pop();
root.push("rinja_derive");
}
root.push("templates");
let mut inner = PathBuf::new();
inner.push(expected);

2
testing/Cargo.toml
View File

@ -25,7 +25,7 @@ rinja = { path = "../rinja", version = "0.3.5", features = ["code-in-doc", "serd
criterion = "0.5"
phf = { version = "0.11", features = ["macros" ] }
trybuild = "1.0.76"
trybuild = "1.0.100"
[[bench]]
name = "all"

4
testing/tests/ui/cycle.stderr
View File

@ -1,6 +1,6 @@
error: cyclic dependency in graph [
"\"$WORKSPACE/target/tests/trybuild/rinja_testing/templates/cycle2.html/" --> \"$WORKSPACE/target/tests/trybuild/rinja_testing/templates/cycle1.html/"",
"\"$WORKSPACE/target/tests/trybuild/rinja_testing/templates/cycle1.html/" --> \"$WORKSPACE/target/tests/trybuild/rinja_testing/templates/cycle1.html/"",
"\"$DIR/templates/cycle2.html/" --> \"$DIR/templates/cycle1.html/"",
"\"$DIR/templates/cycle1.html/" --> \"$DIR/templates/cycle1.html/"",
]
--> tests/ui/cycle.rs:4:19
|

2
testing/tests/ui/cycle2.stderr
View File

@ -1,5 +1,5 @@
error: cyclic dependency in graph [
"\"$WORKSPACE/target/tests/trybuild/rinja_testing/templates/cycle1.html/" --> \"$WORKSPACE/target/tests/trybuild/rinja_testing/templates/cycle1.html/"",
"\"$DIR/templates/cycle1.html/" --> \"$DIR/templates/cycle1.html/"",
]
--> tests/ui/cycle2.rs:4:19
|

2
testing/tests/ui/include-a-folder.stderr
View File

@ -1,4 +1,4 @@
error: unable to open template file '$WORKSPACE/target/tests/trybuild/rinja_testing/templates/a_file_that_is_actually_a_folder.html': Is a directory (os error 21)
error: unable to open template file '$DIR/templates/a_file_that_is_actually_a_folder.html': Is a directory (os error 21)
--> YouCannotIncludeFolders.txt:1:2
" include \"a_file_that_is_actually_a_folder.html\" %}"
--> tests/ui/include-a-folder.rs:4:34