Bless ui tests

PyO3 · Mar 31, 2022 · cb1ece7 · cb1ece7
1 parent e557025
commit cb1ece7
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 29 deletions.
diff --git a/tests/ui/invalid_pyfunctions.stderr b/tests/ui/invalid_pyfunctions.stderr
@@ -12,7 +12,7 @@ error: Python functions cannot have `impl Trait` arguments
 
 error: `async fn` is not yet supported for Python functions.
 
-Additional crates such as `pyo3-asyncio` can be used to integrate async Rust and Python. For more information, see https://github.com/PyO3/pyo3/issues/1632
+       Additional crates such as `pyo3-asyncio` can be used to integrate async Rust and Python. For more information, see https://github.com/PyO3/pyo3/issues/1632
   --> tests/ui/invalid_pyfunctions.rs:10:1
    |
 10 | async fn async_function() {}

diff --git a/tests/ui/invalid_pymethod_receiver.stderr b/tests/ui/invalid_pymethod_receiver.stderr
@@ -1,19 +1,14 @@
 error[E0277]: the trait bound `i32: From<&PyCell<MyClass>>` is not satisfied
-   --> tests/ui/invalid_pymethod_receiver.rs:8:43
-    |
-8   |     fn method_with_invalid_self_type(slf: i32, py: Python, index: u32) {}
-    |                                           ^^^ the trait `From<&PyCell<MyClass>>` is not implemented for `i32`
-    |
-    = help: the following implementations were found:
-              <i32 as From<NonZeroI32>>
-              <i32 as From<bool>>
-              <i32 as From<i16>>
-              <i32 as From<i8>>
-            and 2 others
-    = note: required because of the requirements on the impl of `Into<i32>` for `&PyCell<MyClass>`
-    = note: required because of the requirements on the impl of `TryFrom<&PyCell<MyClass>>` for `i32`
-note: required by `std::convert::TryFrom::try_from`
-   --> $RUST/core/src/convert/mod.rs
-    |
-    |     fn try_from(value: T) -> Result<Self, Self::Error>;
-    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ --> tests/ui/invalid_pymethod_receiver.rs:8:43
+  |
+8 |     fn method_with_invalid_self_type(slf: i32, py: Python, index: u32) {}
+  |                                           ^^^ the trait `From<&PyCell<MyClass>>` is not implemented for `i32`
+  |
+  = help: the following implementations were found:
+            <i32 as From<NonZeroI32>>
+            <i32 as From<bool>>
+            <i32 as From<i16>>
+            <i32 as From<i8>>
+          and 2 others
+  = note: required because of the requirements on the impl of `Into<i32>` for `&PyCell<MyClass>`
+  = note: required because of the requirements on the impl of `TryFrom<&PyCell<MyClass>>` for `i32`
diff --git a/tests/ui/invalid_pymethods.stderr b/tests/ui/invalid_pymethods.stderr
@@ -90,7 +90,7 @@ error: Python functions cannot have `impl Trait` arguments
 
 error: `async fn` is not yet supported for Python functions.
 
-Additional crates such as `pyo3-asyncio` can be used to integrate async Rust and Python. For more information, see https://github.com/PyO3/pyo3/issues/1632
+       Additional crates such as `pyo3-asyncio` can be used to integrate async Rust and Python. For more information, see https://github.com/PyO3/pyo3/issues/1632
    --> tests/ui/invalid_pymethods.rs:107:5
     |
 107 |     async fn async_method(&self) {}

diff --git a/tests/ui/missing_clone.stderr b/tests/ui/missing_clone.stderr
@@ -1,7 +1,12 @@
 error[E0277]: the trait bound `TestClass: Clone` is not satisfied
-  --> tests/ui/missing_clone.rs:15:32
-   |
-15 |     let t: TestClass = pyvalue.extract(py).unwrap();
-   |                                ^^^^^^^ the trait `Clone` is not implemented for `TestClass`
-   |
-   = note: required because of the requirements on the impl of `pyo3::FromPyObject<'_>` for `TestClass`
+   --> tests/ui/missing_clone.rs:15:32
+    |
+15  |     let t: TestClass = pyvalue.extract(py).unwrap();
+    |                                ^^^^^^^ the trait `Clone` is not implemented for `TestClass`
+    |
+    = note: required because of the requirements on the impl of `pyo3::FromPyObject<'_>` for `TestClass`
+note: required by a bound in `pyo3::Py::<T>::extract`
+   --> src/instance.rs:518:12
+    |
+518 |         D: FromPyObject<'p>,
+    |            ^^^^^^^^^^^^^^^^ required by this bound in `pyo3::Py::<T>::extract`
diff --git a/tests/ui/static_ref.stderr b/tests/ui/static_ref.stderr
@@ -4,7 +4,7 @@ error[E0495]: cannot infer an appropriate lifetime for lifetime parameter `'py`
 4 | #[pyfunction]
   | ^^^^^^^^^^^^^
   |
-note: first, the lifetime cannot outlive the anonymous lifetime #1 defined on the body at 4:1...
+note: first, the lifetime cannot outlive the anonymous lifetime #1 defined here...
  --> tests/ui/static_ref.rs:4:1
   |
 4 | #[pyfunction]

diff --git a/tests/ui/wrong_aspyref_lifetimes.stderr b/tests/ui/wrong_aspyref_lifetimes.stderr
@@ -2,9 +2,9 @@ error[E0505]: cannot move out of `gil` because it is borrowed
  --> tests/ui/wrong_aspyref_lifetimes.rs:7:10
   |
 6 |     let dict: &PyDict = dict.as_ref(gil.python());
-  |                                     --- borrow of `gil` occurs here
+  |                                     ------------ borrow of `gil` occurs here
 7 |     drop(gil);
   |          ^^^ move out of `gil` occurs here
 8 |
 9 |     let _py: Python = dict.py(); // Obtain a Python<'p> without GIL.
-  |                       ---- borrow later used here
+  |                       --------- borrow later used here