From 36ecadd69f8e81ffdb19dff77d3e1579877e42ba Mon Sep 17 00:00:00 2001
From: David Hewitt <1939362+davidhewitt@users.noreply.github.com>
Date: Tue, 23 Aug 2022 08:07:13 +0100
Subject: [PATCH] ci: unpin serde, fixup nightly ui tests

---
 .github/workflows/ci.yml             |  1 -
 tests/ui/not_send_auto_trait.stderr  | 10 ++++++----
 tests/ui/not_send_auto_trait2.stderr | 15 ++++++++++-----
 tests/ui/send_wrapper.stderr         | 16 +++++++++++-----
 4 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e29e280b..6a518931 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -189,7 +189,6 @@ jobs:
           cargo update -p plotters --precise 0.3.1
           cargo update -p plotters-svg --precise 0.3.1
           cargo update -p plotters-backend --precise 0.3.2
-          cargo update -p serde --precise 1.0.142
           cargo update -p bumpalo --precise 3.10.0
 
       - name: Build docs
diff --git a/tests/ui/not_send_auto_trait.stderr b/tests/ui/not_send_auto_trait.stderr
index a769d7e8..99f46dc3 100644
--- a/tests/ui/not_send_auto_trait.stderr
+++ b/tests/ui/not_send_auto_trait.stderr
@@ -1,10 +1,12 @@
 error[E0277]: the trait bound `pyo3::Python<'_>: Ungil` is not satisfied in `[closure@$DIR/tests/ui/not_send_auto_trait.rs:4:22: 4:24]`
-   --> tests/ui/not_send_auto_trait.rs:4:8
+   --> tests/ui/not_send_auto_trait.rs:4:22
     |
 4   |     py.allow_threads(|| { drop(py); });
-    |        ^^^^^^^^^^^^^ -- within this `[closure@$DIR/tests/ui/not_send_auto_trait.rs:4:22: 4:24]`
-    |        |
-    |        within `[closure@$DIR/tests/ui/not_send_auto_trait.rs:4:22: 4:24]`, the trait `Ungil` is not implemented for `pyo3::Python<'_>`
+    |        ------------- --^^^^^^^^^^^^^^
+    |        |             |
+    |        |             within `[closure@$DIR/tests/ui/not_send_auto_trait.rs:4:22: 4:24]`, the trait `Ungil` is not implemented for `pyo3::Python<'_>`
+    |        |             within this `[closure@$DIR/tests/ui/not_send_auto_trait.rs:4:22: 4:24]`
+    |        required by a bound introduced by this call
     |
     = note: required because it appears within the type `&pyo3::Python<'_>`
 note: required because it's used within this closure
diff --git a/tests/ui/not_send_auto_trait2.stderr b/tests/ui/not_send_auto_trait2.stderr
index 3aedb37c..592efb4a 100644
--- a/tests/ui/not_send_auto_trait2.stderr
+++ b/tests/ui/not_send_auto_trait2.stderr
@@ -1,10 +1,15 @@
 error[E0277]: the trait bound `PyAny: Ungil` is not satisfied in `[closure@$DIR/tests/ui/not_send_auto_trait2.rs:8:26: 8:28]`
-   --> tests/ui/not_send_auto_trait2.rs:8:12
+   --> tests/ui/not_send_auto_trait2.rs:8:26
     |
-8   |         py.allow_threads(|| {
-    |            ^^^^^^^^^^^^^ -- within this `[closure@$DIR/tests/ui/not_send_auto_trait2.rs:8:26: 8:28]`
-    |            |
-    |            within `[closure@$DIR/tests/ui/not_send_auto_trait2.rs:8:26: 8:28]`, the trait `Ungil` is not implemented for `PyAny`
+8   |           py.allow_threads(|| {
+    |              ------------- ^-
+    |              |             |
+    |  ____________|_____________within this `[closure@$DIR/tests/ui/not_send_auto_trait2.rs:8:26: 8:28]`
+    | |            |
+    | |            required by a bound introduced by this call
+9   | |             println!("{:?}", string);
+10  | |         });
+    | |_________^ within `[closure@$DIR/tests/ui/not_send_auto_trait2.rs:8:26: 8:28]`, the trait `Ungil` is not implemented for `PyAny`
     |
     = note: required because it appears within the type `PyString`
     = note: required because it appears within the type `&PyString`
diff --git a/tests/ui/send_wrapper.stderr b/tests/ui/send_wrapper.stderr
index b24fb106..1f41784f 100644
--- a/tests/ui/send_wrapper.stderr
+++ b/tests/ui/send_wrapper.stderr
@@ -1,10 +1,16 @@
 error[E0277]: the trait bound `PyAny: Ungil` is not satisfied in `[closure@$DIR/tests/ui/send_wrapper.rs:11:26: 11:28]`
-   --> tests/ui/send_wrapper.rs:11:12
+   --> tests/ui/send_wrapper.rs:11:26
     |
-11  |         py.allow_threads(|| {
-    |            ^^^^^^^^^^^^^ -- within this `[closure@$DIR/tests/ui/send_wrapper.rs:11:26: 11:28]`
-    |            |
-    |            within `[closure@$DIR/tests/ui/send_wrapper.rs:11:26: 11:28]`, the trait `Ungil` is not implemented for `PyAny`
+11  |           py.allow_threads(|| {
+    |              ------------- ^-
+    |              |             |
+    |  ____________|_____________within this `[closure@$DIR/tests/ui/send_wrapper.rs:11:26: 11:28]`
+    | |            |
+    | |            required by a bound introduced by this call
+12  | |             let smuggled: &PyString = *wrapped;
+13  | |             println!("{:?}", smuggled);
+14  | |         });
+    | |_________^ within `[closure@$DIR/tests/ui/send_wrapper.rs:11:26: 11:28]`, the trait `Ungil` is not implemented for `PyAny`
     |
     = note: required because it appears within the type `PyString`
     = note: required because it appears within the type `&PyString`