From 9f6cf42c5fd0bd98dd3445239f2c6414e8fd9324 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 15 Aug 2018 17:24:20 +0300 Subject: Switch to file ids --- crates/libanalysis/src/lib.rs | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'crates/libanalysis') diff --git a/crates/libanalysis/src/lib.rs b/crates/libanalysis/src/lib.rs index fc0b9ee9a..7c52080cb 100644 --- a/crates/libanalysis/src/lib.rs +++ b/crates/libanalysis/src/lib.rs @@ -37,7 +37,6 @@ pub type Result = ::std::result::Result; const INDEXING_THRESHOLD: usize = 128; pub struct WorldState { - next_file_id: u32, data: Arc } @@ -47,12 +46,11 @@ pub struct World { } #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] -pub struct FileId(u32); +pub struct FileId(pub u32); impl WorldState { pub fn new() -> WorldState { WorldState { - next_file_id: 0, data: Arc::new(WorldData::default()) } } @@ -61,12 +59,6 @@ impl WorldState { World { data: self.data.clone() } } - pub fn new_file_id(&mut self) -> FileId { - let id = FileId(self.next_file_id); - self.next_file_id += 1; - id - } - pub fn change_file(&mut self, file_id: FileId, text: Option) { self.change_files(::std::iter::once((file_id, text))); } -- cgit v1.2.3