Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-09-21 06:51:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

finer concurrency

Browse source
This commit is contained in:
Aleksey Kladov 2018-08-01 22:07:09 +03:00
parent 1954df6336
commit 7264c3294b
3 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.toml
View file

@ -12,6 +12,7 @@ unicode-xid = "0.1.0"
text_unit = "0.1.2"
itertools = "0.7.5"
drop_bomb = "0.1.4"
parking_lot = "0.6.0"
[dev-dependencies]
testutils = { path = "./tests/testutils" }

1
src/lib.rs
View file

@ -24,6 +24,7 @@ extern crate itertools;
extern crate text_unit;
extern crate unicode_xid;
extern crate drop_bomb;
extern crate parking_lot;
pub mod algo;
pub mod ast;

23
src/yellow/red.rs
View file

@ -1,4 +1,5 @@
use std::{ptr, sync::RwLock};
use std::ptr;
use parking_lot::RwLock;
use {yellow::GreenNode, TextUnit};
#[derive(Debug)]
@ -66,20 +67,20 @@ impl RedNode {
if idx >= self.n_children() {
return None;
}
match &self.children.read().unwrap()[idx] {
match &self.children.read()[idx] {
Some(child) => return Some(child.into()),
None => (),
}
let mut children = self.children.write().unwrap();
let green_children = self.green.children();
let start_offset = self.start_offset()
+ green_children[..idx]
.iter()
.map(|x| x.text_len())
.sum::<TextUnit>();
let child =
RedNode::new_child(green_children[idx].clone(), self.into(), start_offset, idx);
let mut children = self.children.write();
if children[idx].is_none() {
let green_children = self.green.children();
let start_offset = self.start_offset()
+ green_children[..idx]
.iter()
.map(|x| x.text_len())
.sum::<TextUnit>();
let child =
RedNode::new_child(green_children[idx].clone(), self.into(), start_offset, idx);
children[idx] = Some(child)
}
Some(children[idx].as_ref().unwrap().into())