Skip to content

fix(deps): bump pyo3 0.24 -> 0.29 for GHSA-36hh-v3qg-5jq4 (#838) #839

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dmtrKovalenko merged 1 commit into from
Aug 30, 2026
Merged

fix(deps): bump pyo3 0.24 -> 0.29 for GHSA-36hh-v3qg-5jq4 (#838) #839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 10 additions & 40 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/fff-python/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ zlob = ["fff/zlob", "fff-query-parser/zlob"]
fff = { package = "fff-search", path = "../fff-core", version = "0.10.5", default-features = false }
fff-query-parser = { path = "../fff-query-parser", version = "0.10.5", default-features = false }
git2 = { workspace = true }
pyo3 = { version = "0.24.0", features = ["extension-module", "abi3-py310"] }
pyo3 = { version = "0.29.0", features = ["extension-module", "abi3-py310"] }
40 changes: 20 additions & 20 deletions crates/fff-python/src/finder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ impl FileFinder {
let init_frecency = shared_frecency.clone();
let init_query_tracker = query_tracker.clone();

py.allow_threads(move || -> PyResult<()> {
py.detach(move || -> PyResult<()> {
if let Some(path) = frecency_db_path {
create_parent_dir(&path)?;
let tracker = FrecencyTracker::open(&path).map_err(py_err)?;
Expand Down Expand Up @@ -274,17 +274,17 @@ impl FileFinder {
fn __exit__(
&mut self,
py: Python<'_>,
_exc_type: PyObject,
_exc_value: PyObject,
_traceback: PyObject,
_exc_type: Py<PyAny>,
_exc_value: Py<PyAny>,
_traceback: Py<PyAny>,
) {
let _ = self.close(py);
}

fn close(&mut self, py: Python<'_>) -> PyResult<()> {
// Release the GIL while an in-flight callback finishes.
let picker = self.picker.clone();
py.allow_threads(move || picker.shutdown_watches_and_wait());
py.detach(move || picker.shutdown_watches_and_wait());
clear_shared_state(&self.picker, &self.frecency, &self.query_tracker);
Ok(())
}
Expand Down Expand Up @@ -355,7 +355,7 @@ impl FileFinder {
let query_tracker = self.query_tracker.clone();
let query = query.to_string();

py.allow_threads(move || -> PyResult<_> {
py.detach(move || -> PyResult<_> {
let picker_guard = picker.read().map_err(py_err)?;
let picker = picker_guard
.as_ref()
Expand Down Expand Up @@ -410,7 +410,7 @@ impl FileFinder {
let picker = self.picker.clone();
let pattern = pattern.to_string();

py.allow_threads(move || -> PyResult<_> {
py.detach(move || -> PyResult<_> {
let picker_guard = picker.read().map_err(py_err)?;
let picker = picker_guard
.as_ref()
Expand Down Expand Up @@ -462,7 +462,7 @@ impl FileFinder {
let picker = self.picker.clone();
let query = query.to_string();

py.allow_threads(move || -> PyResult<_> {
py.detach(move || -> PyResult<_> {
let picker_guard = picker.read().map_err(py_err)?;
let picker = picker_guard
.as_ref()
Expand Down Expand Up @@ -522,7 +522,7 @@ impl FileFinder {
let query = query.to_string();

let (items, scores, total_matched, total_files, total_dirs) =
py.allow_threads(move || -> PyResult<_> {
py.detach(move || -> PyResult<_> {
let picker_guard = picker.read().map_err(py_err)?;
let picker = picker_guard
.as_ref()
Expand Down Expand Up @@ -566,7 +566,7 @@ impl FileFinder {
))
})?;

let items: PyResult<Vec<PyObject>> = items
let items: PyResult<Vec<Py<PyAny>>> = items
.into_iter()
.map(|item| match item {
MixedItem::File(file) => Ok(Py::new(py, file)?.into_any()),
Expand Down Expand Up @@ -618,7 +618,7 @@ impl FileFinder {
let mode = parse_grep_mode(mode)?;
let cursor_offset = cursor.map(|c| c.offset as usize).unwrap_or(0);

py.allow_threads(move || -> PyResult<_> {
py.detach(move || -> PyResult<_> {
let picker_guard = picker.read().map_err(py_err)?;
let picker = picker_guard
.as_ref()
Expand Down Expand Up @@ -682,7 +682,7 @@ impl FileFinder {
let mode = parse_grep_mode(mode)?;
let cursor_offset = cursor.map(|c| c.offset as usize).unwrap_or(0);

py.allow_threads(move || -> PyResult<_> {
py.detach(move || -> PyResult<_> {
let picker_guard = picker.read().map_err(py_err)?;
let picker = picker_guard
.as_ref()
Expand Down Expand Up @@ -734,7 +734,7 @@ impl FileFinder {
#[pyo3(signature = (timeout_ms=5000))]
fn wait_for_scan_blocking(&self, py: Python<'_>, timeout_ms: u64) -> PyResult<bool> {
let picker = self.picker.clone();
py.allow_threads(move || Ok(picker.wait_for_scan(Duration::from_millis(timeout_ms))))
py.detach(move || Ok(picker.wait_for_scan(Duration::from_millis(timeout_ms))))
}

/// Subscribe to filesystem changes matching `pattern`.
Expand Down Expand Up @@ -768,9 +768,9 @@ impl FileFinder {

let id = {
let picker = self.picker.clone();
py.allow_threads(move || {
py.detach(move || {
picker.watch(&pattern, options, move |_id, events| {
Python::with_gil(|py| {
Python::attach(|py| {
if !active_cb.load(Ordering::Acquire) {
return;
}
Expand Down Expand Up @@ -800,7 +800,7 @@ impl FileFinder {
let cache_budget_max_bytes = self.cache_budget_max_bytes;
let cache_budget_max_file_size = self.cache_budget_max_file_size;

py.allow_threads(move || -> PyResult<()> {
py.detach(move || -> PyResult<()> {
if !new_path.exists() {
return Err(py_err(format!(
"Path does not exist: {}",
Expand Down Expand Up @@ -852,7 +852,7 @@ impl FileFinder {
fn refresh_git_status(&self, py: Python<'_>) -> PyResult<i64> {
let picker = self.picker.clone();
let frecency = self.frecency.clone();
py.allow_threads(move || {
py.detach(move || {
picker
.refresh_git_status(&frecency)
.map_err(py_err)
Expand All @@ -871,7 +871,7 @@ impl FileFinder {
let query_tracker = self.query_tracker.clone();
let query = query.to_string();

py.allow_threads(move || -> PyResult<bool> {
py.detach(move || -> PyResult<bool> {
let file_path = fff::path_utils::canonicalize(&selected_file_path).map_err(py_err)?;
let project_path = {
let guard = picker.read().map_err(py_err)?;
Expand All @@ -898,7 +898,7 @@ impl FileFinder {
let picker = self.picker.clone();
let query_tracker = self.query_tracker.clone();

py.allow_threads(move || -> PyResult<Option<String>> {
py.detach(move || -> PyResult<Option<String>> {
let project_path = {
let guard = picker.read().map_err(py_err)?;
guard.as_ref().map(|p| p.base_path().to_path_buf())
Expand Down Expand Up @@ -936,7 +936,7 @@ impl FileFinder {
picker_indexed_files,
frecency_initialized,
query_tracker_initialized,
) = py.allow_threads(move || -> PyResult<_> {
) = py.detach(move || -> PyResult<_> {
// Resolve the path to inspect: explicit arg → indexed base path →
// process cwd. Report a cwd-resolution failure instead of silently
// discovering from an empty path.
Expand Down
Loading
Loading