From cae2498513601c507bb10b15710feb800a24517f Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 16 Apr 2020 19:21:18 +0200 Subject: Don't expose SyntaxNodePtr impl details --- crates/ra_syntax/src/algo.rs | 2 +- crates/ra_syntax/src/ptr.rs | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'crates/ra_syntax/src') diff --git a/crates/ra_syntax/src/algo.rs b/crates/ra_syntax/src/algo.rs index 7f87f4212..ea41bf85d 100644 --- a/crates/ra_syntax/src/algo.rs +++ b/crates/ra_syntax/src/algo.rs @@ -351,7 +351,7 @@ fn with_children( // FIXME: use a more elegant way to re-fetch the node (#1185), make // `range` private afterwards let mut ptr = SyntaxNodePtr::new(parent); - ptr.range = TextRange::offset_len(ptr.range().start(), len); + ptr.range = TextRange::offset_len(ptr.range.start(), len); ptr.to_node(&new_root_node) } diff --git a/crates/ra_syntax/src/ptr.rs b/crates/ra_syntax/src/ptr.rs index bc48a2e71..3be648c2a 100644 --- a/crates/ra_syntax/src/ptr.rs +++ b/crates/ra_syntax/src/ptr.rs @@ -34,12 +34,8 @@ impl SyntaxNodePtr { self.range } - pub fn kind(&self) -> SyntaxKind { - self.kind - } - pub fn cast(self) -> Option> { - if !N::can_cast(self.kind()) { + if !N::can_cast(self.kind) { return None; } Some(AstPtr { raw: self, _ty: PhantomData }) @@ -88,7 +84,7 @@ impl AstPtr { } pub fn cast(self) -> Option> { - if !U::can_cast(self.raw.kind()) { + if !U::can_cast(self.raw.kind) { return None; } Some(AstPtr { raw: self.raw, _ty: PhantomData }) -- cgit v1.2.3