From e85bb06e2b3d07b1a88f24d10482f8017d68333a Mon Sep 17 00:00:00 2001 From: Matthew Neeley Date: Mon, 25 Jan 2021 11:21:22 -0800 Subject: [PATCH 1/2] Use full-qualified Result in pyobject_native_type_base --- src/types/mod.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/types/mod.rs b/src/types/mod.rs index db0731c15be..e6d29b47168 100644 --- a/src/types/mod.rs +++ b/src/types/mod.rs @@ -35,7 +35,7 @@ macro_rules! pyobject_native_type_base( impl<$($generics,)*> std::fmt::Debug for $name { fn fmt(&self, f: &mut std::fmt::Formatter) - -> Result<(), std::fmt::Error> + -> std::result::Result<(), std::fmt::Error> { let s = self.repr().map_err(|_| std::fmt::Error)?; f.write_str(&s.to_string_lossy()) @@ -44,7 +44,7 @@ macro_rules! pyobject_native_type_base( impl<$($generics,)*> std::fmt::Display for $name { fn fmt(&self, f: &mut std::fmt::Formatter) - -> Result<(), std::fmt::Error> + -> std::result::Result<(), std::fmt::Error> { let s = self.str().map_err(|_| std::fmt::Error)?; f.write_str(&s.to_string_lossy()) From d92f22a7fc0e861eec1f0689ffdb9e0a3ac732b8 Mon Sep 17 00:00:00 2001 From: Matthew Neeley Date: Mon, 25 Jan 2021 11:49:20 -0800 Subject: [PATCH 2/2] Add CHANGELOG entry --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e0e12042b4..66aef949c5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,9 +18,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Mark FFI definitions `PyListObject` and those from `funcobject.h` as requiring non-limited API. [#1387](https://github.com/PyO3/pyo3/pull/1387) - Fix typo in FFI definition `PyFunction_Code` to `PyFunction_GetCode`. [#1387](https://github.com/PyO3/pyo3/pull/1387) - ### Fixed - Fix support for using `r#raw_idents` as argument names in pyfunctions. [#1383](https://github.com/PyO3/pyo3/pull/1383) +- Fix unqualified `Result` usage in `pyobject_native_type_base`. [#1402](https://github.com/PyO3/pyo3/pull/1402) ## [0.13.1] - 2021-01-10 ### Added