allow Bound<'_, T> in #[pymethods] self position#3896
Merged
davidhewitt merged 3 commits intoPyO3:mainfrom Feb 25, 2024
Merged
Conversation
davidhewitt
reviewed
Feb 24, 2024
Member
davidhewitt
left a comment
davidhewitt
left a comment
There was a problem hiding this comment.
Thanks for catching this one! I have a few small thoughts...
pyo3-macros-backend/src/method.rs
Outdated
| @@ -207,12 +207,11 @@ impl SelfType { | |||
| SelfType::TryFromPyCell(span) => { | |||
Member
There was a problem hiding this comment.
It might be nice to rename this TryFromPyCell variant to TryFromBoundRef.
Comment on lines
+529
to
+535
| impl<'a, 'py, T: PyClass> TryFrom<BoundRef<'a, 'py, T>> for PyRef<'py, T> { | ||
| type Error = PyBorrowError; | ||
| #[inline] | ||
| fn try_from(value: BoundRef<'a, 'py, T>) -> Result<Self, Self::Error> { | ||
| value.0.clone().into_gil_ref().try_into() | ||
| } | ||
| } |
Member
There was a problem hiding this comment.
This .into_gil_ref() use here and below seems correct for now (and gets cleaned up after #3860) 👍
src/impl_/pymethods.rs
Outdated
| Bound::ref_from_ptr_or_opt(py, ptr).as_ref().map(BoundRef) | ||
| } | ||
|
|
||
| pub unsafe fn downcast<T: PyTypeCheck>( |
Member
There was a problem hiding this comment.
I'd think this one is actually safe, given it's checked?
Suggested change
| pub unsafe fn downcast<T: PyTypeCheck>( | |
| pub fn downcast<T: PyTypeCheck>( |
Member
Author
There was a problem hiding this comment.
Your completely right, one of those copy pasta errors 😆 . I'll fix it
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
63 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Part of #3684
This allows extracting
&Bound<'_, T>andBound<'_, T>in#[pymethods]selfposition. This further discourages use ofPyCelland makesBound<'_, T>the primary type for interacting with Python objects.