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

copies-rust: refactor the "deletion" case...

copies-rust: refactor the "deletion" case We rearrange the code to single out the case where information need to be overwritten on both side of the merge. This open the way to better dealing with this case. Differential Revision: https://phab.mercurial-scm.org/D9651

Georges Racinet - - Load All Authors

File last commit:

r43563:33fe96a5 default


                r47322:2076df13

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()
				}