upstream/mercurial-mirror Files · rust/hg-core/src/dirstate.rs

rust: make `Revision` a newtype...

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

Raphaël Gomès - - Load All Authors

File last commit:

r50825:e98fd81b default


                r51872:4c5f6e95

default

Download file

             dirstate.rs
        
                    50 lines
            
             | 1.1 KiB
            
                | application/rls-services+xml
            
             |
                RustLexer
            
             / rust / hg-core / src / dirstate.rs
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      // dirstate module

      //

      // Copyright 2019 Raphaël Gomès <rgomes@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.

      use crate::dirstate_tree::on_disk::DirstateV2ParseError;

      use crate::revlog::node::NULL_NODE;

      use crate::revlog::Node;

      use crate::utils::hg_path::HgPath;

      use bytes_cast::BytesCast;

      pub mod dirs_multiset;

      pub mod entry;

      pub mod parsers;

      pub mod status;

      pub use self::entry::*;

      #[derive(Debug, PartialEq, Copy, Clone, BytesCast)]

      #[repr(C)]

      pub struct DirstateParents {

          pub p1: Node,

          pub p2: Node,

      }

      impl DirstateParents {

          pub const NULL: Self = Self {

              p1: NULL_NODE,

              p2: NULL_NODE,

          };

          pub fn is_merge(&self) -> bool {

              !(self.p2 == NULL_NODE)

          }

      }

      pub type StateMapIter<'a> = Box<

          dyn Iterator<

                  Item = Result<(&'a HgPath, DirstateEntry), DirstateV2ParseError>,

              > + Send

              + 'a,

      >;

      pub type CopyMapIter<'a> = Box<

          dyn Iterator<Item = Result<(&'a HgPath, &'a HgPath), DirstateV2ParseError>>

              + Send

              + 'a,

      >;

	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

				// dirstate module
				//
				// Copyright 2019 Raphaël Gomès <rgomes@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.

				use crate::dirstate_tree::on_disk::DirstateV2ParseError;
				use crate::revlog::node::NULL_NODE;
				use crate::revlog::Node;
				use crate::utils::hg_path::HgPath;
				use bytes_cast::BytesCast;

				pub mod dirs_multiset;
				pub mod entry;
				pub mod parsers;
				pub mod status;

				pub use self::entry::*;

				#[derive(Debug, PartialEq, Copy, Clone, BytesCast)]
				#[repr(C)]
				pub struct DirstateParents {
				pub p1: Node,
				pub p2: Node,
				}

				impl DirstateParents {
				pub const NULL: Self = Self {
				p1: NULL_NODE,
				p2: NULL_NODE,
				};

				pub fn is_merge(&self) -> bool {
				!(self.p2 == NULL_NODE)
				}
				}

				pub type StateMapIter<'a> = Box<
				dyn Iterator<
				Item = Result<(&'a HgPath, DirstateEntry), DirstateV2ParseError>,
				> + Send
				+ 'a,
				>;

				pub type CopyMapIter<'a> = Box<
				dyn Iterator<Item = Result<(&'a HgPath, &'a HgPath), DirstateV2ParseError>>
				+ Send
				+ 'a,
				>;