upstream/mercurial-mirror Files · rust/hg-cpython/src/conversion.rs

revlog-native: introduced ABI version in capsule...

revlog-native: introduced ABI version in capsule Concerns that an inconsistency could arise between the actual contents of the capsule in revlog.c and the Rust consumer have been raised after the switch to the array of data and function pointers in f384d68d8ea8. It has been suggested that the `version` from parsers.c could be use for this. In this change, we introduce instead a separate ABI version number, which should have the following advantages: - no need to change the consuming Rust code for changes that have nothing to do with the contents of the capsule - the version number in parsers.c is not explicitely flagged as ABI. It's not obvious to me whether an ABI change that would be invisible to Python would warrant an increment The drawback is that developers now have to consider two version numbers. We expect the added cost of the check to be negligible because it occurs at instantiation of `CIndex` only, which in turn is tied to instantiation of Python objects such as `LazyAncestors` and `MixedIndex`. Frequent calls to `Cindex::new` should also probably hit the CPU branch predictor. Differential Revision: https://phab.mercurial-scm.org/D7856

Georges Racinet - - Load All Authors

File last commit:

r43563:33fe96a5 default


                r44523:f5d2720f

default

Download file

             conversion.rs
        
                    28 lines
            
             | 1.0 KiB
            
                | application/rls-services+xml
            
             |
                RustLexer
            
             / rust / hg-cpython / src / conversion.rs
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      // conversion.rs

      //

      // Copyright 2019 Georges Racinet <georges.racinet@octobus.net>

      //

      // This software may be used and distributed according to the terms of the

      // GNU General Public License version 2 or any later version.

      //! Bindings for the hg::ancestors module provided by the

      //! `hg-core` crate. From Python, this will be seen as `rustext.ancestor`

      use cpython::{ObjectProtocol, PyObject, PyResult, Python};

      use hg::Revision;

      use std::iter::FromIterator;

      /// Utility function to convert a Python iterable into various collections

      ///

      /// We need this in particular to feed to various methods of inner objects

      /// with `impl IntoIterator<Item=Revision>` arguments, because

      /// a `PyErr` can arise at each step of iteration, whereas these methods

      /// expect iterables over `Revision`, not over some `Result<Revision, PyErr>`

      pub fn rev_pyiter_collect<C>(py: Python, revs: &PyObject) -> PyResult<C>

      where

          C: FromIterator<Revision>,

      {

          revs.iter(py)?

              .map(|r| r.and_then(|o| o.extract::<Revision>(py)))

              .collect()

      }

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				// conversion.rs
				//
				// Copyright 2019 Georges Racinet <georges.racinet@octobus.net>
				//
				// This software may be used and distributed according to the terms of the
				// GNU General Public License version 2 or any later version.

				//! Bindings for the hg::ancestors module provided by the
				//! `hg-core` crate. From Python, this will be seen as `rustext.ancestor`

				use cpython::{ObjectProtocol, PyObject, PyResult, Python};
				use hg::Revision;
				use std::iter::FromIterator;

				/// Utility function to convert a Python iterable into various collections
				///
				/// We need this in particular to feed to various methods of inner objects
				/// with `impl IntoIterator<Item=Revision>` arguments, because
				/// a `PyErr` can arise at each step of iteration, whereas these methods
				/// expect iterables over `Revision`, not over some `Result<Revision, PyErr>`
				pub fn rev_pyiter_collect<C>(py: Python, revs: &PyObject) -> PyResult<C>
				where
				C: FromIterator<Revision>,
				{
				revs.iter(py)?
				.map(\|r\| r.and_then(\|o\| o.extract::<Revision>(py)))
				.collect()
				}