From 1865e179799203bee9723c8feea8a4aa2be1bf94 Mon Sep 17 00:00:00 2001
From: Jake Goulding <jake.goulding@gmail.com>
Date: Mon, 3 Jan 2022 21:04:43 -0500
Subject: [PATCH] Update tests for newer version of trybuild

---
 .../tests/ui/error-reporting.stderr            | 18 +++++++++---------
 .../tests/ui/stringly-typed.stderr             | 16 ++++++++--------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/compatibility-tests/compile-fail/tests/ui/error-reporting.stderr b/compatibility-tests/compile-fail/tests/ui/error-reporting.stderr
index 42646958..f69e6e6b 100644
--- a/compatibility-tests/compile-fail/tests/ui/error-reporting.stderr
+++ b/compatibility-tests/compile-fail/tests/ui/error-reporting.stderr
@@ -1,23 +1,23 @@
 error: Can only derive `Snafu` for an enum or a newtype
- --> $DIR/error-reporting.rs:5:5
+ --> tests/ui/error-reporting.rs:5:5
   |
 5 |     union AUnion {
   |     ^^^^^
 
 error: Can only derive `Snafu` for enums with struct-like and unit enum variants
-  --> $DIR/error-reporting.rs:11:14
+  --> tests/ui/error-reporting.rs:11:14
    |
 11 |         Alpha(i32),
    |              ^^^^^
 
 error: unexpected end of input, expected parentheses
-  --> $DIR/error-reporting.rs:30:16
+  --> tests/ui/error-reporting.rs:30:24
    |
 30 |         #[snafu(display)]
-   |                ^^^^^^^^^
+   |                        ^
 
 error: format argument must be a string literal
-  --> $DIR/error-reporting.rs:36:25
+  --> tests/ui/error-reporting.rs:36:25
    |
 36 |         #[snafu(display(foo()))]
    |                         ^^^^^
@@ -28,7 +28,7 @@ help: you might be missing a string literal to format with
    |                         +++++
 
 error: format argument must be a string literal
-  --> $DIR/error-reporting.rs:39:25
+  --> tests/ui/error-reporting.rs:39:25
    |
 39 |         #[snafu(display(42))]
    |                         ^^
@@ -39,19 +39,19 @@ help: you might be missing a string literal to format with
    |                         +++++
 
 error: Can only derive `Snafu` for tuple structs with exactly one field
-  --> $DIR/error-reporting.rs:56:5
+  --> tests/ui/error-reporting.rs:56:5
    |
 56 |     struct ShortTupleStruct();
    |     ^^^^^^
 
 error: Can only derive `Snafu` for tuple structs with exactly one field
-  --> $DIR/error-reporting.rs:59:5
+  --> tests/ui/error-reporting.rs:59:5
    |
 59 |     struct LongTupleStruct(i32, i32);
    |     ^^^^^^
 
 error: cannot find attribute `serde` in this scope
-  --> $DIR/error-reporting.rs:20:11
+  --> tests/ui/error-reporting.rs:20:11
    |
 20 |         #[serde]
    |           ^^^^^
diff --git a/compatibility-tests/compile-fail/tests/ui/stringly-typed.stderr b/compatibility-tests/compile-fail/tests/ui/stringly-typed.stderr
index d1e82952..4bb68d83 100644
--- a/compatibility-tests/compile-fail/tests/ui/stringly-typed.stderr
+++ b/compatibility-tests/compile-fail/tests/ui/stringly-typed.stderr
@@ -1,41 +1,41 @@
 error: Cannot be both a `context` and `whatever` error
- --> $DIR/stringly-typed.rs:5:13
+ --> tests/ui/stringly-typed.rs:5:13
   |
 5 |     #[snafu(context, whatever)]
   |             ^^^^^^^
 
 error: Cannot be both a `context` and `whatever` error
- --> $DIR/stringly-typed.rs:5:22
+ --> tests/ui/stringly-typed.rs:5:22
   |
 5 |     #[snafu(context, whatever)]
   |                      ^^^^^^^^
 
 error: expected `,`
-  --> $DIR/stringly-typed.rs:13:21
+  --> tests/ui/stringly-typed.rs:13:21
    |
 13 |     #[snafu(whatever(true))]
-   |                     ^^^^^^
+   |                     ^
 
 error: Whatever selectors must have a message field
-  --> $DIR/stringly-typed.rs:21:5
+  --> tests/ui/stringly-typed.rs:21:5
    |
 21 |     #[snafu(whatever)]
    |     ^
 
 error: Multiple `message` attributes are not supported on a named struct
-  --> $DIR/stringly-typed.rs:32:9
+  --> tests/ui/stringly-typed.rs:32:9
    |
 32 |         message: String,
    |         ^^^^^^^^^^^^^^^
 
 error: Whatever selectors must not have context fields
-  --> $DIR/stringly-typed.rs:43:9
+  --> tests/ui/stringly-typed.rs:43:9
    |
 43 |         user_id: i32,
    |         ^^^^^^^^^^^^
 
 error[E0124]: field `message` is already declared
-  --> $DIR/stringly-typed.rs:32:9
+  --> tests/ui/stringly-typed.rs:32:9
    |
 31 |         message: String,
    |         --------------- `message` first declared here