From 2d3940d0ab862dbfaed4f4c844faaca6a38e31e9 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 11 Jan 2019 19:59:06 +0300 Subject: rename TreePtr -> TreeArc This is much clearer about the semantics --- crates/ra_ide_api/src/hover.rs | 4 ++-- crates/ra_ide_api/src/lib.rs | 4 ++-- crates/ra_ide_api/src/symbol_index.rs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'crates/ra_ide_api') diff --git a/crates/ra_ide_api/src/hover.rs b/crates/ra_ide_api/src/hover.rs index f544ffa6d..b66774cdf 100644 --- a/crates/ra_ide_api/src/hover.rs +++ b/crates/ra_ide_api/src/hover.rs @@ -1,6 +1,6 @@ use ra_db::{Cancelable, SyntaxDatabase}; use ra_syntax::{ - AstNode, SyntaxNode, TreePtr, + AstNode, SyntaxNode, TreeArc, ast::{self, NameOwner}, algo::{find_covering_node, find_node_at_offset, find_leaf_at_offset, visit::{visitor, Visitor}}, }; @@ -87,7 +87,7 @@ fn doc_text_for(db: &RootDatabase, nav: NavigationTarget) -> Cancelable Option> { + fn node(&self, db: &RootDatabase) -> Option> { let source_file = db.source_file(self.file_id()); let source_file = source_file.syntax(); let node = source_file diff --git a/crates/ra_ide_api/src/lib.rs b/crates/ra_ide_api/src/lib.rs index 6155d903a..abb50ff95 100644 --- a/crates/ra_ide_api/src/lib.rs +++ b/crates/ra_ide_api/src/lib.rs @@ -35,7 +35,7 @@ mod parent_module; use std::{fmt, sync::Arc}; -use ra_syntax::{SourceFile, TreePtr, TextRange, TextUnit}; +use ra_syntax::{SourceFile, TreeArc, TextRange, TextUnit}; use ra_text_edit::TextEdit; use ra_db::{SyntaxDatabase, FilesDatabase, BaseDatabase}; use rayon::prelude::*; @@ -303,7 +303,7 @@ impl Analysis { } /// Gets the syntax tree of the file. - pub fn file_syntax(&self, file_id: FileId) -> TreePtr { + pub fn file_syntax(&self, file_id: FileId) -> TreeArc { self.db.source_file(file_id).clone() } diff --git a/crates/ra_ide_api/src/symbol_index.rs b/crates/ra_ide_api/src/symbol_index.rs index 8dd15b40e..fdda57022 100644 --- a/crates/ra_ide_api/src/symbol_index.rs +++ b/crates/ra_ide_api/src/symbol_index.rs @@ -27,7 +27,7 @@ use std::{ use fst::{self, Streamer}; use ra_syntax::{ - SyntaxNode, SourceFile, SmolStr, TreePtr, AstNode, + SyntaxNode, SourceFile, SmolStr, TreeArc, AstNode, algo::{visit::{visitor, Visitor}, find_covering_node}, SyntaxKind::{self, *}, ast::{self, NameOwner}, @@ -141,7 +141,7 @@ impl SymbolIndex { } pub(crate) fn for_files( - files: impl ParallelIterator)>, + files: impl ParallelIterator)>, ) -> SymbolIndex { let symbols = files .flat_map(|(file_id, file)| { -- cgit v1.2.3