Update for Pyo3 0.23 #1289
Update for Pyo3 0.23 #1289
Conversation
|
Hi @ngoldbaum! Thank you for your pull request. We require contributors to sign our Contributor License Agreement, and yours needs attention. You currently have a record in our system, but the CLA is no longer valid, and will need to be resubmitted. ProcessIn order for us to review and merge your suggested changes, please sign at https://code.facebook.com/cla. If you are contributing on behalf of someone else (eg your employer), the individual CLA may not be sufficient and your employer may need to sign the corporate CLA. Once the CLA is signed, our tooling will perform checks and validations. Afterwards, the pull request will be tagged with If you have received this in error or have any questions, please contact us at [email protected]. Thanks! |
|
I signed the CLA. |
facebook-github-bot
added
the
CLA Signed
|
Thank you for signing our Contributor License Agreement. We can now accept your code for this (and any) Meta Open Source project. Thanks! |
| } | ||
| } | ||
|
|
||
| impl TryIntoPy<PyObject> for PyTuple { |
There was a problem hiding this comment.
I found that with IntoPyObject that some of these impls aren't needed at all. I didn't look too closely to try to understand why though so there could be something subtle happening.
There was a problem hiding this comment.
Great, I was hoping to get rid of these.
| }() { | ||
| Ok(py_err_value) => PyErr::from_value(py_err_value), | ||
| Err(e) => e, | ||
| } |
There was a problem hiding this comment.
Since ultimately we want a PyErr in both the success and error cases, we can make use of a closure that returns a result and ? to avoid unwrap or expect in the new into_pyobject() calls that can return errors and at the same time clean up some unnecessary pre-existing expect use to turn some panics into errors. This is a neat Rust trick, unfortuntely it's only convenient in error handling code.
| }) | ||
| } | ||
| } | ||
|
|
||
| impl<'a> PyErrArguments for Details { |
There was a problem hiding this comment.
Both this and Details are unused and the compiler warns about them.
| } | ||
| } | ||
|
|
||
| impl TryIntoPy<PyObject> for PyTuple { |
There was a problem hiding this comment.
Great, I was hoping to get rid of these.
native/libcst/src/nodes/traits.rs
Outdated
| impl TryIntoPy<PyObject> for PyTuple { | ||
| fn try_into_py(self, py: Python) -> PyResult<PyObject> { | ||
| Ok(self.into_py(py)) | ||
| PyTuple::new(py, converted).unwrap().into_py_any(py) |
There was a problem hiding this comment.
Anything we can do to avoid the unwrap() and potential panic here?
zsol
changed the title
zsol
changed the title
|
Ugh, apologies for the churn, my tools messed with the PR - I did my best to revert my changes |
|
Sorry for the delay here - I accidentally marked the TODO item I had for this as "done". Will try to deal with the |
|
🎉 thanks! |
This PR: 1. marks the `libcst.native` module as free-threading-compatible 2. replaces the use of ProcessPoolExecutor with ThreadPoolExecutor if free-threaded CPython is detected at runtime This depends on Instagram#1294 and Instagram#1289.
This PR: 1. marks the `libcst.native` module as free-threading-compatible 2. replaces the use of ProcessPoolExecutor with ThreadPoolExecutor if free-threaded CPython is detected at runtime This depends on Instagram#1294 and Instagram#1289.
This PR: 1. marks the `libcst.native` module as free-threading-compatible 2. replaces the use of ProcessPoolExecutor with ThreadPoolExecutor if free-threaded CPython is detected at runtime This depends on Instagram#1294 and Instagram#1289.
Summary
Updates the native library to use PyO3 0.23. This is the first step towards declaring support for the free-threaded interpreter.
I could have gone further in ripping out
TryIntoPyin favor ofIntoPyObject. If you'd prefer not to leave this project in a state with an unnecessary wrapper trait I'm happy to implement that, I just wanted to make the smallest possible working diff.Test Plan
This passes the tests for me locally. Let's see if CI spots and issues.