Mercurial > hg
comparison rust/hg-core/src/revlog/revlog.rs @ 45603:be951ca95b08
hg-core: use `.or(Err(Error))` not `.map_err(|_| Error)` (D9100#inline-15067)
Differential Revision: https://phab.mercurial-scm.org/D9108
author | Antoine cezar<acezar@chwitlabs.fr> |
---|---|
date | Mon, 28 Sep 2020 16:52:35 +0200 |
parents | 1cef583541c0 |
children | 7252f5237352 |
comparison
equal
deleted
inserted
replaced
45602:1cef583541c0 | 45603:be951ca95b08 |
---|---|
109 // Todo return -> Cow | 109 // Todo return -> Cow |
110 let mut entry = self.get_entry(rev)?; | 110 let mut entry = self.get_entry(rev)?; |
111 let mut delta_chain = vec![]; | 111 let mut delta_chain = vec![]; |
112 while let Some(base_rev) = entry.base_rev { | 112 while let Some(base_rev) = entry.base_rev { |
113 delta_chain.push(entry); | 113 delta_chain.push(entry); |
114 entry = self | 114 entry = |
115 .get_entry(base_rev) | 115 self.get_entry(base_rev).or(Err(RevlogError::Corrupted))?; |
116 .map_err(|_| RevlogError::Corrupted)?; | |
117 } | 116 } |
118 | 117 |
119 // TODO do not look twice in the index | 118 // TODO do not look twice in the index |
120 let index_entry = self | 119 let index_entry = self |
121 .index | 120 .index |