mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Actually assert disjointness

Browse Source
This commit is contained in:
Aleksey Kladov 2020-09-03 13:24:06 +02:00
parent a000346ab2
commit 9684daa029
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crates/text_edit/src/lib.rs
View File

@ -119,7 +119,7 @@ pub fn union(&mut self, other: TextEdit) -> Result<(), TextEdit> {
return Err(other);
}
self.indels.extend(other.indels);
assert!(check_disjoint(&mut self.indels));
assert_disjoint(&mut self.indels);
Ok(())
}
@ -169,7 +169,7 @@ pub fn insert(&mut self, offset: TextSize, text: String) {
}
pub fn finish(self) -> TextEdit {
let mut indels = self.indels;
assert!(check_disjoint(&mut indels));
assert_disjoint(&mut indels);
TextEdit { indels }
}
pub fn invalidates_offset(&self, offset: TextSize) -> bool {
@ -178,11 +178,14 @@ pub fn invalidates_offset(&self, offset: TextSize) -> bool {
fn indel(&mut self, indel: Indel) {
self.indels.push(indel);
if self.indels.len() <= 16 {
check_disjoint(&mut self.indels);
assert_disjoint(&mut self.indels);
}
}
}
fn assert_disjoint(indels: &mut [impl std::borrow::Borrow<Indel>]) {
assert!(check_disjoint(indels));
}
fn check_disjoint(indels: &mut [impl std::borrow::Borrow<Indel>]) -> bool {
indels.sort_by_key(|indel| (indel.borrow().delete.start(), indel.borrow().delete.end()));
indels