Merge remote-tracking branch 'upstream/master' into 503-hover-doc-links

Hasn't fixed tests yet.

5 files changed, 15 insertions, 14 deletions

diff --git a/crates/ra_mbe/Cargo.toml b/crates/ra_mbe/Cargo.toml
index 4dec24914..a26746a19 100644
--- a/crates/ra_mbe/Cargo.toml
+++ b/crates/ra_mbe/Cargo.toml
@@ -3,6 +3,7 @@ edition = "2018"
 name = "ra_mbe"
 version = "0.1.0"
 authors = ["rust-analyzer developers"]
+license = "MIT OR Apache-2.0"
 
 [lib]
 doctest = false
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<T: Default> From<Result<T, ExpandError>> for ExpandResult<T> {
             .map_or_else(|e| ExpandResult(Default::default(), Some(e)), |it| ExpandResult(it, None))
     }
 }
-
-#[cfg(test)]
-mod tests;
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),
         }
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 c43003fd6..707e84f42 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#"[email protected]
-  FN_DEF@0..15
+  [email protected]
     [email protected] "fn"
     [email protected]
       [email protected] "bar"
@@ -490,13 +490,13 @@ fn test_expand_to_item_list() {
         format!("{:#?}", tree).trim(),
         r#"
 [email protected]
-  STRUCT_DEF@0..20
+  [email protected]
     [email protected] "struct"
     [email protected]
       [email protected] "Foo"
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
-      RECORD_FIELD_DEF@10..19
+      [email protected]
         [email protected]
           [email protected] "field"
         [email protected] ":"
@@ -506,13 +506,13 @@ [email protected]
               [email protected]
                 [email protected] "u32"
       [email protected] "}"
-  STRUCT_DEF@20..40
+  [email protected]
     [email protected] "struct"
     [email protected]
       [email protected] "Bar"
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
-      RECORD_FIELD_DEF@30..39
+      [email protected]
         [email protected]
           [email protected] "field"
         [email protected] ":"
@@ -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]