##// END OF EJS Templates
rust: Add type annotation to fix inference on Rust Nightly...
rust: Add type annotation to fix inference on Rust Nightly When compiling with Rust Nightly, the im-rs crate silently makes use of the experimental language feature for trait impl specialization. This apperently changes public its APIs in subtle ways such that type inference of some user code can fail where it succeeds when specialization is disabled. This made Mercurial’s Rust unit tests have compilation errors on Nightly. I have not managed to find the exactl root cause, but I wrote down my findings so far at https://github.com/bodil/im-rs/issues/188 This adds type annotation to make unit tests rely less on type inference and work around the issue. Differential Revision: https://phab.mercurial-scm.org/D10742

File last commit:

r47894:cd8ca38f default
r48062:ebf84336 default
Show More
dirstate.rs
133 lines | 3.5 KiB | application/rls-services+xml | RustLexer
Raphaël Gomès
rust-parsers: switch to parse/pack_dirstate to mutate-on-loop...
r42993 // 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.
Simon Sapin
rust: Remove DirstateParseError and ListDirstateTrackedFilesError...
r47169 use crate::errors::HgError;
Simon Sapin
rust: Make `DirstateParents`’s fields typed `Node`s...
r47337 use crate::revlog::Node;
Simon Sapin
rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs...
r47894 use crate::utils::hg_path::{HgPath, HgPathBuf};
use crate::FastHashMap;
Simon Sapin
rust: Rewrite dirstate parsing usin the `bytes-cast` crate...
r47336 use bytes_cast::{unaligned, BytesCast};
Raphaël Gomès
rust-dirstate: use EntryState enum instead of literals...
r42994 use std::convert::TryFrom;
Raphaël Gomès
rust-parsers: switch to parse/pack_dirstate to mutate-on-loop...
r42993
Raphaël Gomès
rust: switch hg-core and hg-cpython to rust 2018 edition...
r42828 pub mod dirs_multiset;
Raphaël Gomès
rust-dirstate: rust implementation of dirstatemap...
r42998 pub mod dirstate_map;
Raphaël Gomès
rust: switch hg-core and hg-cpython to rust 2018 edition...
r42828 pub mod parsers;
Raphaël Gomès
rust-dirstate-status: add first Rust implementation of `dirstate.status`...
r43565 pub mod status;
Raphaël Gomès
rust: switch hg-core and hg-cpython to rust 2018 edition...
r42828
Simon Sapin
rust: Rewrite dirstate parsing usin the `bytes-cast` crate...
r47336 #[derive(Debug, PartialEq, Clone, BytesCast)]
#[repr(C)]
Raphaël Gomès
rust-parsers: switch to parse/pack_dirstate to mutate-on-loop...
r42993 pub struct DirstateParents {
Simon Sapin
rust: Make `DirstateParents`’s fields typed `Node`s...
r47337 pub p1: Node,
pub p2: Node,
Raphaël Gomès
rust: switch hg-core and hg-cpython to rust 2018 edition...
r42828 }
/// The C implementation uses all signed types. This will be an issue
/// either when 4GB+ source files are commonplace or in 2038, whichever
/// comes first.
Raphaël Gomès
rust-parsers: switch to parse/pack_dirstate to mutate-on-loop...
r42993 #[derive(Debug, PartialEq, Copy, Clone)]
Raphaël Gomès
rust: switch hg-core and hg-cpython to rust 2018 edition...
r42828 pub struct DirstateEntry {
Raphaël Gomès
rust-dirstate: use EntryState enum instead of literals...
r42994 pub state: EntryState,
Raphaël Gomès
rust: switch hg-core and hg-cpython to rust 2018 edition...
r42828 pub mode: i32,
pub mtime: i32,
pub size: i32,
}
Simon Sapin
dirstate-tree: Add "non normal" and "from other parent" sets...
r47878 impl DirstateEntry {
pub fn is_non_normal(&self) -> bool {
self.state != EntryState::Normal || self.mtime == MTIME_UNSET
}
pub fn is_from_other_parent(&self) -> bool {
self.state == EntryState::Normal && self.size == SIZE_FROM_OTHER_PARENT
}
Simon Sapin
dirstate-tree: Add the new `status()` algorithm...
r47883
// TODO: other platforms
#[cfg(unix)]
pub fn mode_changed(
&self,
filesystem_metadata: &std::fs::Metadata,
) -> bool {
use std::os::unix::fs::MetadataExt;
const EXEC_BIT_MASK: u32 = 0o100;
let dirstate_exec_bit = (self.mode as u32) & EXEC_BIT_MASK;
let fs_exec_bit = filesystem_metadata.mode() & EXEC_BIT_MASK;
dirstate_exec_bit != fs_exec_bit
}
Simon Sapin
dirstate-tree: Add "non normal" and "from other parent" sets...
r47878 }
Simon Sapin
rust: Rewrite dirstate parsing usin the `bytes-cast` crate...
r47336 #[derive(BytesCast)]
#[repr(C)]
struct RawEntry {
state: u8,
mode: unaligned::I32Be,
size: unaligned::I32Be,
mtime: unaligned::I32Be,
length: unaligned::I32Be,
}
Simon Sapin
dirstate-tree: Add "non normal" and "from other parent" sets...
r47878 const MTIME_UNSET: i32 = -1;
Raphaël Gomès
rust: introduce SIZE_FROM_OTHER_PARENT constant...
r44003 /// A `DirstateEntry` with a size of `-2` means that it was merged from the
/// other parent. This allows revert to pick the right status back during a
/// merge.
pub const SIZE_FROM_OTHER_PARENT: i32 = -2;
Raphaël Gomès
rust-performance: introduce FastHashMap type alias for HashMap...
r44278 pub type StateMap = FastHashMap<HgPathBuf, DirstateEntry>;
Simon Sapin
dirstate-tree: Make Rust DirstateMap bindings go through a trait object...
r47863 pub type StateMapIter<'a> =
Simon Sapin
rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs...
r47894 Box<dyn Iterator<Item = (&'a HgPath, &'a DirstateEntry)> + Send + 'a>;
Raphaël Gomès
rust: start plugging the dirstate tree behind a feature gate...
r46185
Raphaël Gomès
rust-performance: introduce FastHashMap type alias for HashMap...
r44278 pub type CopyMap = FastHashMap<HgPathBuf, HgPathBuf>;
Simon Sapin
dirstate-tree: Make Rust DirstateMap bindings go through a trait object...
r47863 pub type CopyMapIter<'a> =
Simon Sapin
rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs...
r47894 Box<dyn Iterator<Item = (&'a HgPath, &'a HgPath)> + Send + 'a>;
Raphaël Gomès
rust: switch hg-core and hg-cpython to rust 2018 edition...
r42828
Raphaël Gomès
rust-dirstate: use EntryState enum instead of literals...
r42994 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
pub enum EntryState {
Normal,
Added,
Removed,
Merged,
Unknown,
}
Simon Sapin
dirstate-tree: Add has_dir and has_tracked_dir...
r47876 impl EntryState {
pub fn is_tracked(self) -> bool {
use EntryState::*;
match self {
Normal | Added | Merged => true,
Removed | Unknown => false,
}
}
}
Raphaël Gomès
rust-dirstate: use EntryState enum instead of literals...
r42994 impl TryFrom<u8> for EntryState {
Simon Sapin
rust: Remove DirstateParseError and ListDirstateTrackedFilesError...
r47169 type Error = HgError;
Raphaël Gomès
rust-dirstate: use EntryState enum instead of literals...
r42994
fn try_from(value: u8) -> Result<Self, Self::Error> {
match value {
b'n' => Ok(EntryState::Normal),
b'a' => Ok(EntryState::Added),
b'r' => Ok(EntryState::Removed),
b'm' => Ok(EntryState::Merged),
b'?' => Ok(EntryState::Unknown),
Simon Sapin
rust: Remove DirstateParseError and ListDirstateTrackedFilesError...
r47169 _ => Err(HgError::CorruptedRepository(format!(
"Incorrect dirstate entry state {}",
Raphaël Gomès
rust-dirstate: use EntryState enum instead of literals...
r42994 value
))),
}
}
}
impl Into<u8> for EntryState {
fn into(self) -> u8 {
match self {
EntryState::Normal => b'n',
EntryState::Added => b'a',
EntryState::Removed => b'r',
EntryState::Merged => b'm',
EntryState::Unknown => b'?',
}
}
}