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

renames

Browse source
This commit is contained in:
Aleksey Kladov 2018-08-13 18:27:26 +03:00
parent 9149fd2c0c
commit c1a7b72fb7
132 changed files with 252 additions and 252 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/libsyntax2/src/ast/generated.rs
View file

@ -14,7 +14,7 @@ pub struct ConstItem<R: TreeRoot = Arc<SyntaxRoot>> {
impl<R: TreeRoot> AstNode<R> for ConstItem<R> {
fn cast(syntax: SyntaxNode<R>) -> Option<Self> {
match syntax.kind() {
CONST_ITEM => Some(ConstItem { syntax }),
CONST_DEF => Some(ConstItem { syntax }),
_ => None,
}
}
@ -33,7 +33,7 @@ pub struct Enum<R: TreeRoot = Arc<SyntaxRoot>> {
impl<R: TreeRoot> AstNode<R> for Enum<R> {
fn cast(syntax: SyntaxNode<R>) -> Option<Self> {
match syntax.kind() {
ENUM => Some(Enum { syntax }),
ENUM_DEF => Some(Enum { syntax }),
_ => None,
}
}
@ -76,7 +76,7 @@ pub struct Function<R: TreeRoot = Arc<SyntaxRoot>> {
impl<R: TreeRoot> AstNode<R> for Function<R> {
fn cast(syntax: SyntaxNode<R>) -> Option<Self> {
match syntax.kind() {
FUNCTION => Some(Function { syntax }),
FN_DEF => Some(Function { syntax }),
_ => None,
}
}
@ -150,7 +150,7 @@ pub struct StaticItem<R: TreeRoot = Arc<SyntaxRoot>> {
impl<R: TreeRoot> AstNode<R> for StaticItem<R> {
fn cast(syntax: SyntaxNode<R>) -> Option<Self> {
match syntax.kind() {
STATIC_ITEM => Some(StaticItem { syntax }),
STATIC_DEF => Some(StaticItem { syntax }),
_ => None,
}
}
@ -169,7 +169,7 @@ pub struct Struct<R: TreeRoot = Arc<SyntaxRoot>> {
impl<R: TreeRoot> AstNode<R> for Struct<R> {
fn cast(syntax: SyntaxNode<R>) -> Option<Self> {
match syntax.kind() {
STRUCT => Some(Struct { syntax }),
STRUCT_DEF => Some(Struct { syntax }),
_ => None,
}
}
@ -188,7 +188,7 @@ pub struct Trait<R: TreeRoot = Arc<SyntaxRoot>> {
impl<R: TreeRoot> AstNode<R> for Trait<R> {
fn cast(syntax: SyntaxNode<R>) -> Option<Self> {
match syntax.kind() {
TRAIT => Some(Trait { syntax }),
TRAIT_DEF => Some(Trait { syntax }),
_ => None,
}
}
@ -207,7 +207,7 @@ pub struct TypeItem<R: TreeRoot = Arc<SyntaxRoot>> {
impl<R: TreeRoot> AstNode<R> for TypeItem<R> {
fn cast(syntax: SyntaxNode<R>) -> Option<Self> {
match syntax.kind() {
TYPE_ITEM => Some(TypeItem { syntax }),
TYPE_DEF => Some(TypeItem { syntax }),
_ => None,
}
}

14
crates/libsyntax2/src/grammar.ron
View file

@ -109,17 +109,17 @@ Grammar(
nodes: [
"FILE",
"STRUCT",
"ENUM",
"FUNCTION",
"STRUCT_DEF",
"ENUM_DEF",
"FN_DEF",
"EXTERN_CRATE_ITEM",
"MODULE",
"USE_ITEM",
"STATIC_ITEM",
"CONST_ITEM",
"TRAIT",
"STATIC_DEF",
"CONST_DEF",
"TRAIT_DEF",
"IMPL_ITEM",
"TYPE_ITEM",
"TYPE_DEF",
"MACRO_CALL",
"TOKEN_TREE",

14
crates/libsyntax2/src/grammar/items/mod.rs
View file

@ -108,7 +108,7 @@ pub(super) fn maybe_item(p: &mut Parser) -> MaybeItem {
// unsafe fn foo() {}
FN_KW => {
function(p);
FUNCTION
FN_DEF
}
// test unsafe_trait
@ -121,7 +121,7 @@ pub(super) fn maybe_item(p: &mut Parser) -> MaybeItem {
// unsafe auto trait T {}
TRAIT_KW => {
traits::trait_item(p);
TRAIT
TRAIT_DEF
}
// test unsafe_impl
@ -157,7 +157,7 @@ fn items_without_modifiers(p: &mut Parser) -> Option<SyntaxKind> {
}
TYPE_KW => {
type_item(p);
TYPE_ITEM
TYPE_DEF
}
MOD_KW => {
mod_item(p);
@ -171,11 +171,11 @@ fn items_without_modifiers(p: &mut Parser) -> Option<SyntaxKind> {
consider removing this semicolon"
);
}
STRUCT
STRUCT_DEF
}
ENUM_KW => {
structs::enum_item(p);
ENUM
ENUM_DEF
}
USE_KW => {
use_item::use_item(p);
@ -183,11 +183,11 @@ fn items_without_modifiers(p: &mut Parser) -> Option<SyntaxKind> {
}
CONST_KW if (la == IDENT || la == MUT_KW) => {
consts::const_item(p);
CONST_ITEM
CONST_DEF
}
STATIC_KW => {
consts::static_item(p);
STATIC_ITEM
STATIC_DEF
}
// test extern_block
// extern {}

28
crates/libsyntax2/src/syntax_kinds/generated.rs
View file

@ -109,17 +109,17 @@ pub enum SyntaxKind {
DOC_COMMENT,
SHEBANG,
FILE,
STRUCT,
ENUM,
FUNCTION,
STRUCT_DEF,
ENUM_DEF,
FN_DEF,
EXTERN_CRATE_ITEM,
MODULE,
USE_ITEM,
STATIC_ITEM,
CONST_ITEM,
TRAIT,
STATIC_DEF,
CONST_DEF,
TRAIT_DEF,
IMPL_ITEM,
TYPE_ITEM,
TYPE_DEF,
MACRO_CALL,
TOKEN_TREE,
PAREN_TYPE,
@ -347,17 +347,17 @@ impl SyntaxKind {
DOC_COMMENT => &SyntaxInfo { name: "DOC_COMMENT" },
SHEBANG => &SyntaxInfo { name: "SHEBANG" },
FILE => &SyntaxInfo { name: "FILE" },
STRUCT => &SyntaxInfo { name: "STRUCT" },
ENUM => &SyntaxInfo { name: "ENUM" },
FUNCTION => &SyntaxInfo { name: "FUNCTION" },
STRUCT_DEF => &SyntaxInfo { name: "STRUCT_DEF" },
ENUM_DEF => &SyntaxInfo { name: "ENUM_DEF" },
FN_DEF => &SyntaxInfo { name: "FN_DEF" },
EXTERN_CRATE_ITEM => &SyntaxInfo { name: "EXTERN_CRATE_ITEM" },
MODULE => &SyntaxInfo { name: "MODULE" },
USE_ITEM => &SyntaxInfo { name: "USE_ITEM" },
STATIC_ITEM => &SyntaxInfo { name: "STATIC_ITEM" },
CONST_ITEM => &SyntaxInfo { name: "CONST_ITEM" },
TRAIT => &SyntaxInfo { name: "TRAIT" },
STATIC_DEF => &SyntaxInfo { name: "STATIC_DEF" },
CONST_DEF => &SyntaxInfo { name: "CONST_DEF" },
TRAIT_DEF => &SyntaxInfo { name: "TRAIT_DEF" },
IMPL_ITEM => &SyntaxInfo { name: "IMPL_ITEM" },
TYPE_ITEM => &SyntaxInfo { name: "TYPE_ITEM" },
TYPE_DEF => &SyntaxInfo { name: "TYPE_DEF" },
MACRO_CALL => &SyntaxInfo { name: "MACRO_CALL" },
TOKEN_TREE => &SyntaxInfo { name: "TOKEN_TREE" },
PAREN_TYPE => &SyntaxInfo { name: "PAREN_TYPE" },