language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-08 03:20:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

simplify trait bounds

Browse source
This commit is contained in:
Aleksey Kladov 2019-02-21 16:12:15 +03:00
parent b51b71bf25
commit 7060a39d5c
1 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

30
crates/ra_syntax/src/syntax_node.rs
View file

@ -6,7 +6,10 @@
//! The *real* implementation is in the (language-agnostic) `rowan` crate, this //! The *real* implementation is in the (language-agnostic) `rowan` crate, this
//! modules just wraps its API. //! modules just wraps its API.
use std::{fmt::{self, Write}, borrow::Borrow}; use std::{
fmt::{self, Write},
borrow::Borrow,
};
use rowan::{Types, TransparentNewType}; use rowan::{Types, TransparentNewType};
@ -24,14 +27,17 @@ impl Types for RaTypes {
type RootData = Vec<SyntaxError>; type RootData = Vec<SyntaxError>;
} }
pub type GreenNode = rowan::GreenNode<RaTypes>; pub(crate) type GreenNode = rowan::GreenNode<RaTypes>;
/// Marker trait for CST and AST nodes
pub trait SyntaxNodeWrapper: TransparentNewType<Repr = rowan::SyntaxNode<RaTypes>> {}
impl<T: TransparentNewType<Repr = rowan::SyntaxNode<RaTypes>>> SyntaxNodeWrapper for T {}
/// An owning smart pointer for CST or AST node.
#[derive(PartialEq, Eq, Hash)] #[derive(PartialEq, Eq, Hash)]
pub struct TreeArc<T: TransparentNewType<Repr = rowan::SyntaxNode<RaTypes>>>( pub struct TreeArc<T: SyntaxNodeWrapper>(pub(crate) rowan::TreeArc<RaTypes, T>);
pub(crate) rowan::TreeArc<RaTypes, T>,
);
impl<T: TransparentNewType<Repr = rowan::SyntaxNode<RaTypes>>> Borrow<T> for TreeArc<T> { impl<T: SyntaxNodeWrapper> Borrow<T> for TreeArc<T> {
fn borrow(&self) -> &T { fn borrow(&self) -> &T {
&*self &*self
} }
@ -39,11 +45,11 @@ impl<T: TransparentNewType<Repr = rowan::SyntaxNode<RaTypes>>> Borrow<T> for Tre
impl<T> TreeArc<T> impl<T> TreeArc<T>
where where
T: TransparentNewType<Repr = rowan::SyntaxNode<RaTypes>>, T: SyntaxNodeWrapper,
{ {
pub(crate) fn cast<U>(this: TreeArc<T>) -> TreeArc<U> pub(crate) fn cast<U>(this: TreeArc<T>) -> TreeArc<U>
where where
U: TransparentNewType<Repr = rowan::SyntaxNode<RaTypes>>, U: SyntaxNodeWrapper,
{ {
TreeArc(rowan::TreeArc::cast(this.0)) TreeArc(rowan::TreeArc::cast(this.0))
} }
@ -51,7 +57,7 @@ where
impl<T> std::ops::Deref for TreeArc<T> impl<T> std::ops::Deref for TreeArc<T>
where where
T: TransparentNewType<Repr = rowan::SyntaxNode<RaTypes>>, T: SyntaxNodeWrapper,
{ {
type Target = T; type Target = T;
fn deref(&self) -> &T { fn deref(&self) -> &T {
@ -61,7 +67,7 @@ where
impl<T> PartialEq<T> for TreeArc<T> impl<T> PartialEq<T> for TreeArc<T>
where where
T: TransparentNewType<Repr = rowan::SyntaxNode<RaTypes>>, T: SyntaxNodeWrapper,
T: PartialEq<T>, T: PartialEq<T>,
{ {
fn eq(&self, other: &T) -> bool { fn eq(&self, other: &T) -> bool {
@ -72,7 +78,7 @@ where
impl<T> Clone for TreeArc<T> impl<T> Clone for TreeArc<T>
where where
T: TransparentNewType<Repr = rowan::SyntaxNode<RaTypes>>, T: SyntaxNodeWrapper,
{ {
fn clone(&self) -> TreeArc<T> { fn clone(&self) -> TreeArc<T> {
TreeArc(self.0.clone()) TreeArc(self.0.clone())
@ -81,7 +87,7 @@ where
impl<T> fmt::Debug for TreeArc<T> impl<T> fmt::Debug for TreeArc<T>
where where
T: TransparentNewType<Repr = rowan::SyntaxNode<RaTypes>>, T: SyntaxNodeWrapper,
T: fmt::Debug, T: fmt::Debug,
{ {
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {