Mercurial > hg
comparison rust/hg-cpython/src/conversion.rs @ 50979:4c5f6e95df84
rust: make `Revision` a newtype
This change is the one we've been building towards during this series.
The aim is to make `Revision` mean more than a simple integer, holding
the information that it is valid for a given revlog index.
While this still allows for programmer error, since creating a revision
directly and querying a different index with a "checked" revision are
still possible, the friction created by the newtype will hopefully make
us think twice about which type to use.
Enough of the Rust ecosystem relies on the newtype pattern to be
efficiently optimized away (even compiler in codegen testsĀ¹), so I'm not
worried about this being a fundamental problem.
[1] https://github.com/rust-lang/rust/blob/7a70647f195f6b0a0f1ebd72b1542ba91a32f43a/tests/codegen/vec-in-place.rs#L47
author | Raphaël Gomès <rgomes@octobus.net> |
---|---|
date | Fri, 18 Aug 2023 14:34:29 +0200 |
parents | c7fb9b74e753 |
children | 5a7d5fd6808c |
comparison
equal
deleted
inserted
replaced
50978:27e773aa607d | 50979:4c5f6e95df84 |
---|---|
6 // GNU General Public License version 2 or any later version. | 6 // GNU General Public License version 2 or any later version. |
7 | 7 |
8 //! Bindings for the hg::ancestors module provided by the | 8 //! Bindings for the hg::ancestors module provided by the |
9 //! `hg-core` crate. From Python, this will be seen as `rustext.ancestor` | 9 //! `hg-core` crate. From Python, this will be seen as `rustext.ancestor` |
10 | 10 |
11 use cpython::{ObjectProtocol, PyObject, PyResult, Python}; | 11 use cpython::{ObjectProtocol, PyErr, PyObject, PyResult, Python}; |
12 use hg::Revision; | 12 use hg::{Revision, RevlogIndex, UncheckedRevision}; |
13 | |
14 use crate::{exceptions::GraphError, PyRevision}; | |
13 | 15 |
14 /// Utility function to convert a Python iterable into various collections | 16 /// Utility function to convert a Python iterable into various collections |
15 /// | 17 /// |
16 /// We need this in particular to feed to various methods of inner objects | 18 /// We need this in particular to feed to various methods of inner objects |
17 /// with `impl IntoIterator<Item=Revision>` arguments, because | 19 /// with `impl IntoIterator<Item=Revision>` arguments, because |
18 /// a `PyErr` can arise at each step of iteration, whereas these methods | 20 /// a `PyErr` can arise at each step of iteration, whereas these methods |
19 /// expect iterables over `Revision`, not over some `Result<Revision, PyErr>` | 21 /// expect iterables over `Revision`, not over some `Result<Revision, PyErr>` |
20 pub fn rev_pyiter_collect<C>(py: Python, revs: &PyObject) -> PyResult<C> | 22 pub fn rev_pyiter_collect<C, I>( |
23 py: Python, | |
24 revs: &PyObject, | |
25 index: &I, | |
26 ) -> PyResult<C> | |
21 where | 27 where |
22 C: FromIterator<Revision>, | 28 C: FromIterator<Revision>, |
29 I: RevlogIndex, | |
23 { | 30 { |
24 revs.iter(py)? | 31 revs.iter(py)? |
25 .map(|r| r.and_then(|o| o.extract::<Revision>(py))) | 32 .map(|r| { |
33 r.and_then(|o| match o.extract::<PyRevision>(py) { | |
34 Ok(r) => index | |
35 .check_revision(UncheckedRevision(r.0)) | |
36 .ok_or_else(|| { | |
37 PyErr::new::<GraphError, _>( | |
38 py, | |
39 ("InvalidRevision", r.0), | |
40 ) | |
41 }), | |
42 Err(e) => Err(e), | |
43 }) | |
44 }) | |
26 .collect() | 45 .collect() |
27 } | 46 } |