This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10328

rust: Remove use of `py.eval()`
ClosedPublic

Authored by SimonSapin on Apr 8 2021, 3:39 PM.

Details

Reviewers
marmoute
pulkit
Group Reviewers
hg-reviewers
Commits
rHGc6ceb5f27f97: rust: Remove use of `py.eval()`
Summary

The previous Rust code allocated an intermediate Vec, converted that
to a Python list, then used eval to run Python code that converts that
list to a Python set.

rust-cpython exposes Rust bindings for Python sets, let’s use that instead
to construct a set directly.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

SimonSapin created this revision.Apr 8 2021, 3:39 PM
baymax updated this revision to Diff 26736.Apr 8 2021, 8:16 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute accepted this revision.Apr 8 2021, 11:36 PM
marmoute added a subscriber: marmoute.

+1 (the set binding was not available at the time of writing, but they are not need to keep doing this now.)

pulkit accepted this revision.Apr 11 2021, 5:25 PM
This revision is now accepted and ready to land.Apr 11 2021, 5:25 PM
SimonSapin added a commit: rHGc6ceb5f27f97: rust: Remove use of `py.eval()`.Apr 11 2021, 7:23 PM
Closed by commit rHGc6ceb5f27f97: rust: Remove use of `py.eval()` (authored by SimonSapin). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 26803

rust/hg-cpython/src/dirstate/dirstate_map.rs

// dirstate_map.rs // dirstate_map.rs
// //
// Copyright 2019 Raphaël Gomès <rgomes@octobus.net> // Copyright 2019 Raphaël Gomès <rgomes@octobus.net>
// //
// This software may be used and distributed according to the terms of the // This software may be used and distributed according to the terms of the
// GNU General Public License version 2 or any later version. // GNU General Public License version 2 or any later version.
//! Bindings for the `hg::dirstate::dirstate_map` file provided by the //! Bindings for the `hg::dirstate::dirstate_map` file provided by the
//! `hg-core` package. //! `hg-core` package.
use std::cell::{Ref, RefCell}; use std::cell::{Ref, RefCell};
use std::convert::TryInto; use std::convert::TryInto;
use std::time::Duration; use std::time::Duration;
use cpython::{ use cpython::{
exc, ObjectProtocol, PyBool, PyBytes, PyClone, PyDict, PyErr, PyList, exc, ObjectProtocol, PyBool, PyBytes, PyClone, PyDict, PyErr, PyList,
PyObject, PyResult, PyString, PyTuple, Python, PythonObject, ToPyObject, PyObject, PyResult, PySet, PyString, PyTuple, Python, PythonObject,
UnsafePyLeaked, ToPyObject, UnsafePyLeaked,
}; };
use crate::{ use crate::{
dirstate::copymap::{CopyMap, CopyMapItemsIterator, CopyMapKeysIterator}, dirstate::copymap::{CopyMap, CopyMapItemsIterator, CopyMapKeysIterator},
dirstate::non_normal_entries::{ dirstate::non_normal_entries::{
NonNormalEntries, NonNormalEntriesIterator, NonNormalEntries, NonNormalEntriesIterator,
}, },
dirstate::{dirs_multiset::Dirs, make_dirstate_tuple}, dirstate::{dirs_multiset::Dirs, make_dirstate_tuple},
Ok(py.None()) Ok(py.None())
} }
def other_parent_entries(&self) -> PyResult<PyObject> { def other_parent_entries(&self) -> PyResult<PyObject> {
let mut inner_shared = self.inner(py).borrow_mut(); let mut inner_shared = self.inner(py).borrow_mut();
let (_, other_parent) = let (_, other_parent) =
inner_shared.get_non_normal_other_parent_entries(); inner_shared.get_non_normal_other_parent_entries();
let locals = PyDict::new(py); let set = PySet::empty(py)?;
locals.set_item( for path in other_parent.iter() {
py, set.add(py, PyBytes::new(py, path.as_bytes()))?;
"other_parent", }
other_parent Ok(set.into_object())
.iter()
.map(|v| PyBytes::new(py, v.as_bytes()))
.collect::<Vec<PyBytes>>()
.to_py_object(py),
)?;
py.eval("set(other_parent)", None, Some(&locals))
} }
def non_normal_entries(&self) -> PyResult<NonNormalEntries> { def non_normal_entries(&self) -> PyResult<NonNormalEntries> {
NonNormalEntries::from_inner(py, self.clone_ref(py)) NonNormalEntries::from_inner(py, self.clone_ref(py))
} }
def non_normal_entries_contains(&self, key: PyObject) -> PyResult<bool> { def non_normal_entries_contains(&self, key: PyObject) -> PyResult<bool> {
let key = key.extract::<PyBytes>(py)?; let key = key.extract::<PyBytes>(py)?;