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

errors: introduce InputError and use it from commands and cmdutil...

errors: introduce InputError and use it from commands and cmdutil This patch introduces a `InputError` class and replaces many uses of `error.Abort` by it in `commands` and `cmdutil`. This is a part of https://www.mercurial-scm.org/wiki/ErrorCategoriesPlan. There will later be a different class for state errors (to raise e.g. when there's an unfinished operation). It's not always clear when one should report an input error and when it should be a state error. We can always adjust later if I got something wrong in this patch (but feel free to point out any you notice now). Differential Revision: https://phab.mercurial-scm.org/D9167

Georges Racinet - - Load All Authors

File last commit:

r43563:33fe96a5 default


                r46431:8d72e29a

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