mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-06 03:22:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

index: add PrefixResolution::map() helper

Browse source 
I'm going to make IdIndex::resolve_prefix_with() return (key, values) pair,
and add convenient wrappers that .map() the pair to either key or values.
This commit is contained in:
Yuya Nishihara 2023-05-23 18:43:37 +09:00
parent d6f1ab697a
commit e7f83e7681
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/src/id_prefix.rs
View file

@ -249,13 +249,10 @@ mod tests {
#[test] #[test]
fn test_id_index_resolve_prefix() { fn test_id_index_resolve_prefix() {
fn sorted(resolution: PrefixResolution<Vec<i32>>) -> PrefixResolution<Vec<i32>> { fn sorted(resolution: PrefixResolution<Vec<i32>>) -> PrefixResolution<Vec<i32>> {
match resolution { resolution.map(|mut xs| {
PrefixResolution::SingleMatch(mut xs) => {
xs.sort(); // order of values might not be preserved by IdIndex xs.sort(); // order of values might not be preserved by IdIndex
PrefixResolution::SingleMatch(xs) xs
} })
_ => resolution,
}
} }
let id_index = IdIndex::from_vec(vec![ let id_index = IdIndex::from_vec(vec![
(ChangeId::from_hex("0000"), 0), (ChangeId::from_hex("0000"), 0),

10
lib/src/index.rs
View file

@ -165,6 +165,16 @@ pub enum PrefixResolution<T> {
AmbiguousMatch, AmbiguousMatch,
} }
impl<T> PrefixResolution<T> {
pub fn map<U>(self, f: impl FnOnce(T) -> U) -> PrefixResolution<U> {
match self {
PrefixResolution::NoMatch => PrefixResolution::NoMatch,
PrefixResolution::SingleMatch(x) => PrefixResolution::SingleMatch(f(x)),
PrefixResolution::AmbiguousMatch => PrefixResolution::AmbiguousMatch,
}
}
}
impl<T: Clone> PrefixResolution<T> { impl<T: Clone> PrefixResolution<T> {
pub fn plus(&self, other: &PrefixResolution<T>) -> PrefixResolution<T> { pub fn plus(&self, other: &PrefixResolution<T>) -> PrefixResolution<T> {
match (self, other) { match (self, other) {