From 4b7f473223a939b702b89b6ef4db59bdbfff32d4 Mon Sep 17 00:00:00 2001 From: kjeremy Date: Wed, 8 Jul 2020 09:45:29 -0400 Subject: Clippy perf warnings --- crates/ra_mbe/src/mbe_expander/matcher.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crates/ra_mbe/src') diff --git a/crates/ra_mbe/src/mbe_expander/matcher.rs b/crates/ra_mbe/src/mbe_expander/matcher.rs index 78f9efa1b..f9e515b81 100644 --- a/crates/ra_mbe/src/mbe_expander/matcher.rs +++ b/crates/ra_mbe/src/mbe_expander/matcher.rs @@ -260,7 +260,7 @@ impl<'a> TtIter<'a> { | ('|', '=', None) | ('|', '|', None) => { let tt2 = self.next().unwrap().clone(); - Ok(tt::Subtree { delimiter: None, token_trees: vec![tt.clone(), tt2] }.into()) + Ok(tt::Subtree { delimiter: None, token_trees: vec![tt, tt2] }.into()) } _ => Ok(tt), } -- cgit v1.2.3 From 19f891250647b9c08cf9d5f23433ec7380a85010 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sat, 11 Jul 2020 14:57:07 +0200 Subject: Minor --- crates/ra_mbe/src/lib.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'crates/ra_mbe/src') diff --git a/crates/ra_mbe/src/lib.rs b/crates/ra_mbe/src/lib.rs index 9c450eaba..dec7ba22e 100644 --- a/crates/ra_mbe/src/lib.rs +++ b/crates/ra_mbe/src/lib.rs @@ -9,6 +9,9 @@ mod syntax_bridge; mod tt_iter; mod subtree_source; +#[cfg(test)] +mod tests; + pub use tt::{Delimiter, Punct}; use crate::{ @@ -273,6 +276,3 @@ impl From> for ExpandResult { .map_or_else(|e| ExpandResult(Default::default(), Some(e)), |it| ExpandResult(it, None)) } } - -#[cfg(test)] -mod tests; -- cgit v1.2.3 From 1142112c70b705f59b7d559d9d72cdc831865158 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 30 Jul 2020 14:51:08 +0200 Subject: Rename FnDef -> Fn --- crates/ra_mbe/src/tests.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crates/ra_mbe/src') diff --git a/crates/ra_mbe/src/tests.rs b/crates/ra_mbe/src/tests.rs index c43003fd6..220690cdd 100644 --- a/crates/ra_mbe/src/tests.rs +++ b/crates/ra_mbe/src/tests.rs @@ -258,7 +258,7 @@ fn test_expr_order() { assert_eq_text!( dump.trim(), r#"MACRO_ITEMS@0..15 - FN_DEF@0..15 + FN@0..15 FN_KW@0..2 "fn" NAME@2..5 IDENT@2..5 "bar" -- cgit v1.2.3 From 0a9e3ccc262fbcbd4cdaab30384f8cb71584544b Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 30 Jul 2020 16:49:13 +0200 Subject: Rename FieldDef -> Field --- crates/ra_mbe/src/tests.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'crates/ra_mbe/src') diff --git a/crates/ra_mbe/src/tests.rs b/crates/ra_mbe/src/tests.rs index 220690cdd..d7b198458 100644 --- a/crates/ra_mbe/src/tests.rs +++ b/crates/ra_mbe/src/tests.rs @@ -494,9 +494,9 @@ MACRO_ITEMS@0..40 STRUCT_KW@0..6 "struct" NAME@6..9 IDENT@6..9 "Foo" - RECORD_FIELD_DEF_LIST@9..20 + RECORD_FIELD_LIST@9..20 L_CURLY@9..10 "{" - RECORD_FIELD_DEF@10..19 + RECORD_FIELD@10..19 NAME@10..15 IDENT@10..15 "field" COLON@15..16 ":" @@ -510,9 +510,9 @@ MACRO_ITEMS@0..40 STRUCT_KW@20..26 "struct" NAME@26..29 IDENT@26..29 "Bar" - RECORD_FIELD_DEF_LIST@29..40 + RECORD_FIELD_LIST@29..40 L_CURLY@29..30 "{" - RECORD_FIELD_DEF@30..39 + RECORD_FIELD@30..39 NAME@30..35 IDENT@30..35 "field" COLON@35..36 ":" -- cgit v1.2.3 From 216a5344c8ef3c3e430d2761dc8b1a7b60250a15 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 30 Jul 2020 17:50:40 +0200 Subject: Rename StructDef -> Struct --- crates/ra_mbe/src/syntax_bridge.rs | 2 +- crates/ra_mbe/src/tests.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'crates/ra_mbe/src') diff --git a/crates/ra_mbe/src/syntax_bridge.rs b/crates/ra_mbe/src/syntax_bridge.rs index fc4133a67..5fc48507f 100644 --- a/crates/ra_mbe/src/syntax_bridge.rs +++ b/crates/ra_mbe/src/syntax_bridge.rs @@ -825,7 +825,7 @@ mod tests { #[test] fn test_token_tree_multi_char_punct() { let source_file = ast::SourceFile::parse("struct Foo { a: x::Y }").ok().unwrap(); - let struct_def = source_file.syntax().descendants().find_map(ast::StructDef::cast).unwrap(); + let struct_def = source_file.syntax().descendants().find_map(ast::Struct::cast).unwrap(); let tt = ast_to_token_tree(&struct_def).unwrap().0; token_tree_to_syntax_node(&tt, FragmentKind::Item).unwrap(); } diff --git a/crates/ra_mbe/src/tests.rs b/crates/ra_mbe/src/tests.rs index d7b198458..21af06e73 100644 --- a/crates/ra_mbe/src/tests.rs +++ b/crates/ra_mbe/src/tests.rs @@ -490,7 +490,7 @@ fn test_expand_to_item_list() { format!("{:#?}", tree).trim(), r#" MACRO_ITEMS@0..40 - STRUCT_DEF@0..20 + STRUCT@0..20 STRUCT_KW@0..6 "struct" NAME@6..9 IDENT@6..9 "Foo" @@ -506,7 +506,7 @@ MACRO_ITEMS@0..40 NAME_REF@16..19 IDENT@16..19 "u32" R_CURLY@19..20 "}" - STRUCT_DEF@20..40 + STRUCT@20..40 STRUCT_KW@20..26 "struct" NAME@26..29 IDENT@26..29 "Bar" -- cgit v1.2.3 From 609680ef97dbf82c07b6b06e21aa366423892304 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 30 Jul 2020 17:52:53 +0200 Subject: Rename EnumDef -> Enum --- crates/ra_mbe/src/tests.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'crates/ra_mbe/src') diff --git a/crates/ra_mbe/src/tests.rs b/crates/ra_mbe/src/tests.rs index 21af06e73..707e84f42 100644 --- a/crates/ra_mbe/src/tests.rs +++ b/crates/ra_mbe/src/tests.rs @@ -1467,7 +1467,7 @@ macro_rules! quick_error { buf [ ] queue [ ] ) => { - quick_error!(ENUM_DEFINITION [enum $name $( #[$meta] )*] + quick_error!(ENUMINITION [enum $name $( #[$meta] )*] body [] queue [$( $( #[$imeta] )* @@ -1489,7 +1489,7 @@ quick_error ! (SORT [enum Wrapped # [derive (Debug)]] items [ "#, ); - assert_eq!(expanded.to_string(), "quick_error ! (ENUM_DEFINITION [enum Wrapped # [derive (Debug)]] body [] queue [=> One : UNIT [] => Two : TUPLE [s : String]]) ;"); + assert_eq!(expanded.to_string(), "quick_error ! (ENUMINITION [enum Wrapped # [derive (Debug)]] body [] queue [=> One : UNIT [] => Two : TUPLE [s : String]]) ;"); } #[test] -- cgit v1.2.3