Fix tests for new error messages in Rust nightly

16 files changed, 41 insertions, 5 deletions

diff --git a/testing/tests/ui.rs b/testing/tests/ui.rs
index 39a0b78..33848b2 100644
--- a/testing/tests/ui.rs
+++ b/testing/tests/ui.rs
@@ -6,9 +6,19 @@ fn ui() {
     let t = TestCases::new();
     t.compile_fail("tests/ui/*.rs");
 
-    if rustc::is_min_version("1.54").unwrap() {
-        t.compile_fail("tests/ui/since_1_54/*.rs");
-    } else {
-        t.compile_fail("tests/ui/before_1_54/*.rs");
+    if rustc::is_min_version("1.58").unwrap() {
+        t.compile_fail("tests/ui/since_1.58/*.rs");
+    }
+
+    if rustc::is_max_version("1.57").unwrap() {
+        t.compile_fail("tests/ui/before_1.58/*.rs");
+    }
+
+    if rustc::is_min_version("1.54").unwrap() && rustc::is_max_version("1.57").unwrap() {
+        t.compile_fail("tests/ui/1.54_to_1.57/*.rs");
+    }
+
+    if rustc::is_max_version("1.53").unwrap() {
+        t.compile_fail("tests/ui/before_1.54/*.rs");
     }
 }
diff --git a/testing/tests/ui/1.54_to_1.57/incorrect_path.rs b/testing/tests/ui/1.54_to_1.57/incorrect_path.rs
new file mode 120000
index 0000000..ee3ef39
--- /dev/null
+++ b/testing/tests/ui/1.54_to_1.57/incorrect_path.rs
@@ -0,0 +1 @@
+../before_1.54/incorrect_path.rs
\ No newline at end of file
diff --git a/testing/tests/ui/since_1_54/incorrect_path.stderr b/testing/tests/ui/1.54_to_1.57/incorrect_path.stderr
index e3d7ca4..e3d7ca4 100644
--- a/testing/tests/ui/since_1_54/incorrect_path.stderr
+++ b/testing/tests/ui/1.54_to_1.57/incorrect_path.stderr
diff --git a/testing/tests/ui/before_1_54/incorrect_path.rs b/testing/tests/ui/before_1.54/incorrect_path.rs
index f0c85cf..f0c85cf 100644
--- a/testing/tests/ui/before_1_54/incorrect_path.rs
+++ b/testing/tests/ui/before_1.54/incorrect_path.rs
diff --git a/testing/tests/ui/before_1_54/incorrect_path.stderr b/testing/tests/ui/before_1.54/incorrect_path.stderr
index ea97149..ea97149 100644
--- a/testing/tests/ui/before_1_54/incorrect_path.stderr
+++ b/testing/tests/ui/before_1.54/incorrect_path.stderr
diff --git a/testing/tests/ui/break_outside_of_loop.rs b/testing/tests/ui/before_1.58/break_outside_of_loop.rs
index ccbb0a9..ccbb0a9 100644
--- a/testing/tests/ui/break_outside_of_loop.rs
+++ b/testing/tests/ui/before_1.58/break_outside_of_loop.rs
diff --git a/testing/tests/ui/break_outside_of_loop.stderr b/testing/tests/ui/before_1.58/break_outside_of_loop.stderr
index 99d1d25..99d1d25 100644
--- a/testing/tests/ui/break_outside_of_loop.stderr
+++ b/testing/tests/ui/before_1.58/break_outside_of_loop.stderr
diff --git a/testing/tests/ui/typo_in_keyword.rs b/testing/tests/ui/before_1.58/typo_in_keyword.rs
index acbf5d7..acbf5d7 100644
--- a/testing/tests/ui/typo_in_keyword.rs
+++ b/testing/tests/ui/before_1.58/typo_in_keyword.rs
diff --git a/testing/tests/ui/typo_in_keyword.stderr b/testing/tests/ui/before_1.58/typo_in_keyword.stderr
index 545476e..545476e 100644
--- a/testing/tests/ui/typo_in_keyword.stderr
+++ b/testing/tests/ui/before_1.58/typo_in_keyword.stderr
diff --git a/testing/tests/ui/since_1.58/break_outside_of_loop.rs b/testing/tests/ui/since_1.58/break_outside_of_loop.rs
new file mode 120000
index 0000000..ae7115e
--- /dev/null
+++ b/testing/tests/ui/since_1.58/break_outside_of_loop.rs
@@ -0,0 +1 @@
+../before_1.58/break_outside_of_loop.rs
\ No newline at end of file
diff --git a/testing/tests/ui/since_1.58/break_outside_of_loop.stderr b/testing/tests/ui/since_1.58/break_outside_of_loop.stderr
new file mode 100644
index 0000000..8f6ba68
--- /dev/null
+++ b/testing/tests/ui/since_1.58/break_outside_of_loop.stderr
@@ -0,0 +1,8 @@
+error: problems parsing template source at row 1, column 9 near:
+       "break%}, have a parsing error!"
+ --> tests/ui/since_1.58/break_outside_of_loop.rs:3:10
+  |
+3 | #[derive(Template)]
+  |          ^^^^^^^^
+  |
+  = note: this error originates in the derive macro `Template` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/testing/tests/ui/since_1.58/incorrect_path.rs b/testing/tests/ui/since_1.58/incorrect_path.rs
new file mode 120000
index 0000000..ee3ef39
--- /dev/null
+++ b/testing/tests/ui/since_1.58/incorrect_path.rs
@@ -0,0 +1 @@
+../before_1.54/incorrect_path.rs
\ No newline at end of file
diff --git a/testing/tests/ui/since_1.58/incorrect_path.stderr b/testing/tests/ui/since_1.58/incorrect_path.stderr
new file mode 100644
index 0000000..7581a91
--- /dev/null
+++ b/testing/tests/ui/since_1.58/incorrect_path.stderr
@@ -0,0 +1,7 @@
+error: template "thisdoesnotexist.html" not found in directories ["$WORKSPACE/target/tests/askama_testing/templates"]
+ --> tests/ui/since_1.58/incorrect_path.rs:3:10
+  |
+3 | #[derive(Template)]
+  |          ^^^^^^^^
+  |
+  = note: this error originates in the derive macro `Template` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/testing/tests/ui/since_1.58/typo_in_keyword.rs b/testing/tests/ui/since_1.58/typo_in_keyword.rs
new file mode 120000
index 0000000..927f556
--- /dev/null
+++ b/testing/tests/ui/since_1.58/typo_in_keyword.rs
@@ -0,0 +1 @@
+../before_1.58/typo_in_keyword.rs
\ No newline at end of file
diff --git a/testing/tests/ui/since_1.58/typo_in_keyword.stderr b/testing/tests/ui/since_1.58/typo_in_keyword.stderr
new file mode 100644
index 0000000..92c638d
--- /dev/null
+++ b/testing/tests/ui/since_1.58/typo_in_keyword.stderr
@@ -0,0 +1,8 @@
+error: problems parsing template source at row 1, column 26 near:
+       "endfo%}\n12345678901234567890123456789012"...
+ --> tests/ui/since_1.58/typo_in_keyword.rs:3:10
+  |
+3 | #[derive(Template)]
+  |          ^^^^^^^^
+  |
+  = note: this error originates in the derive macro `Template` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/testing/tests/ui/since_1_54/incorrect_path.rs b/testing/tests/ui/since_1_54/incorrect_path.rs
deleted file mode 120000
index 224f517..0000000
--- a/testing/tests/ui/since_1_54/incorrect_path.rs
+++ /dev/null
@@ -1 +0,0 @@
-../before_1_54/incorrect_path.rs
\ No newline at end of file