Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-25 20:43:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #5942

Browse source 
5942: Actually assert disjointness
 r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2020-09-03 11:39:03 +00:00 committed by GitHub
commit 74e7422b69
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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 @@ impl TextEdit {
return Err(other); return Err(other);
} }
self.indels.extend(other.indels); self.indels.extend(other.indels);
assert!(check_disjoint(&mut self.indels)); assert_disjoint(&mut self.indels);
Ok(()) Ok(())
} }
@ -169,7 +169,7 @@ impl TextEditBuilder {
} }
pub fn finish(self) -> TextEdit { pub fn finish(self) -> TextEdit {
let mut indels = self.indels; let mut indels = self.indels;
assert!(check_disjoint(&mut indels)); assert_disjoint(&mut indels);
TextEdit { indels } TextEdit { indels }
} }
pub fn invalidates_offset(&self, offset: TextSize) -> bool { pub fn invalidates_offset(&self, offset: TextSize) -> bool {
@ -178,11 +178,14 @@ impl TextEditBuilder {
fn indel(&mut self, indel: Indel) { fn indel(&mut self, indel: Indel) {
self.indels.push(indel); self.indels.push(indel);
if self.indels.len() <= 16 { 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 { 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.sort_by_key(|indel| (indel.borrow().delete.start(), indel.borrow().delete.end()));
indels indels