Rename helper trait

pyo3-macros-backend/src/method.rs

@@ -483,8 +483,8 @@ impl<'a> FnSpec<'a> {
         let rust_call = quote! {
             let ret = #rust_name(#self_arg #(#arg_names),*);
 
-            use _pyo3::callback::IntoResult;
-            let ret: _pyo3::PyResult<_> = ret.into_result();
+            use _pyo3::callback::IntoPyResult;
+            let ret: _pyo3::PyResult<_> = ret.into_py_result();
 
             _pyo3::callback::convert(#py, ret)
         };

src/callback.rs

@@ -35,26 +35,27 @@ impl PyCallbackOutput for () {
     const ERR_VALUE: Self = ();
 }
 
+/// A helper trait to result-wrap the return values of functions and methods.
 #[doc(hidden)]
-pub trait IntoResult<R> {
-    fn into_result(self) -> R;
+pub trait IntoPyResult<R> {
+    fn into_py_result(self) -> R;
 }
 
-impl<T> IntoResult<PyResult<T>> for T
+impl<T> IntoPyResult<PyResult<T>> for T
 where
     T: IntoPy<PyObject>,
 {
-    fn into_result(self) -> PyResult<Self> {
+    fn into_py_result(self) -> PyResult<Self> {
         Ok(self)
     }
 }
 
-impl<T, E> IntoResult<PyResult<T>> for Result<T, E>
+impl<T, E> IntoPyResult<PyResult<T>> for Result<T, E>
 where
     T: IntoPy<PyObject>,
     E: Into<PyErr>,
 {
-    fn into_result(self) -> PyResult<T> {
+    fn into_py_result(self) -> PyResult<T> {
         self.map_err(Into::into)
     }
 }

tests/ui/invalid_result_conversion.stderr

@@ -1,12 +1,12 @@
-error[E0599]: the method `into_result` exists for enum `Result<(), MyError>`, but its trait bounds were not satisfied
+error[E0599]: the method `into_py_result` exists for enum `Result<(), MyError>`, but its trait bounds were not satisfied
   --> tests/ui/invalid_result_conversion.rs:21:1
    |
 21 | #[pyfunction]
    | ^^^^^^^^^^^^^ method cannot be called on `Result<(), MyError>` due to unsatisfied trait bounds
    |
    = note: the following trait bounds were not satisfied:
            `&Result<(), MyError>: IntoPy<Py<PyAny>>`
-           which is required by `&Result<(), MyError>: IntoResult<Result<&Result<(), MyError>, PyErr>>`
+           which is required by `&Result<(), MyError>: IntoPyResult<Result<&Result<(), MyError>, PyErr>>`
            `&mut Result<(), MyError>: IntoPy<Py<PyAny>>`
-           which is required by `&mut Result<(), MyError>: IntoResult<Result<&mut Result<(), MyError>, PyErr>>`
+           which is required by `&mut Result<(), MyError>: IntoPyResult<Result<&mut Result<(), MyError>, PyErr>>`
    = note: this error originates in the attribute macro `pyfunction` (in Nightly builds, run with -Z macro-backtrace for more info)

tests/ui/missing_intopy.stderr

@@ -1,23 +1,23 @@
-error[E0599]: the method `into_result` exists for struct `Blah`, but its trait bounds were not satisfied
+error[E0599]: the method `into_py_result` exists for struct `Blah`, but its trait bounds were not satisfied
    --> tests/ui/missing_intopy.rs:3:1
     |
 1   | struct Blah;
     | ------------
     | |
-    | method `into_result` not found for this
+    | method `into_py_result` not found for this
     | doesn't satisfy `Blah: IntoPy<Py<PyAny>>`
-    | doesn't satisfy `Blah: IntoResult<Result<Blah, PyErr>>`
+    | doesn't satisfy `Blah: IntoPyResult<Result<Blah, PyErr>>`
 2   |
 3   | #[pyo3::pyfunction]
     | ^^^^^^^^^^^^^^^^^^^ method cannot be called on `Blah` due to unsatisfied trait bounds
     |
     = note: the following trait bounds were not satisfied:
             `Blah: IntoPy<Py<PyAny>>`
-            which is required by `Blah: IntoResult<Result<Blah, PyErr>>`
+            which is required by `Blah: IntoPyResult<Result<Blah, PyErr>>`
             `&Blah: IntoPy<Py<PyAny>>`
-            which is required by `&Blah: IntoResult<Result<&Blah, PyErr>>`
+            which is required by `&Blah: IntoPyResult<Result<&Blah, PyErr>>`
             `&mut Blah: IntoPy<Py<PyAny>>`
-            which is required by `&mut Blah: IntoResult<Result<&mut Blah, PyErr>>`
+            which is required by `&mut Blah: IntoPyResult<Result<&mut Blah, PyErr>>`
 note: the following trait must be implemented
    --> src/conversion.rs
     |