Merge branch 'master' of github.com:rust-analyzer/rust-analyzer

author: Benjamin Coenen <[email protected]> 2020-05-02 11:25:04 +0100
committer: Benjamin Coenen <[email protected]> 2020-05-02 11:25:04 +0100
commit: 0b40876b993ab30421624b831cb03b4042eb0142 (patch)
tree: 85abb233dd8645480d61ab857a2b46c1209b142a /crates/ra_mbe
parent: eea21738ab9e0b7438d03f7b2efc18c15cc30cf2 (diff)
parent: 75bc0249463b72971200e482d69dad88d4e76ae3 (diff)
1 files changed, 75 insertions, 77 deletions
diff --git a/crates/ra_mbe/src/tests.rs b/crates/ra_mbe/src/tests.rs
index 0d924ce58..c43003fd6 100644
--- a/crates/ra_mbe/src/tests.rs
+++ b/crates/ra_mbe/src/tests.rs
@@ -266,21 +266,20 @@ fn test_expr_order() {
      [email protected] "("
      [email protected] ")"
    [email protected]
-      [email protected]
+      [email protected] "{"
-        [email protected] "{"
+      [email protected]
-        [email protected]
+        [email protected]
-          [email protected]
+          [email protected]
-            [email protected]
+            [email protected]
-              [email protected]
+              [email protected] "1"
-                [email protected] "1"
+            [email protected] "+"
-              [email protected] "+"
+            [email protected]
-              [email protected]
+              [email protected] "1"
-                [email protected] "1"
+          [email protected] "*"
-            [email protected] "*"
+          [email protected]
-            [email protected]
+            [email protected] "2"
-              [email protected] "2"
+        [email protected] ";"
-          [email protected] ";"
+      [email protected] "}""#,
-        [email protected] "}""#,
    );
 }
@@ -1114,68 +1113,67 @@ fn test_vec() {
    assert_eq!(
        format!("{:#?}", tree).trim(),
        r#"[email protected]
-  [email protected]
+  [email protected] "{"
-    [email protected] "{"
+  [email protected]
-    [email protected]
+    [email protected] "let"
-      [email protected] "let"
+    [email protected]
-      [email protected]
+      [email protected] "mut"
-        [email protected] "mut"
+      [email protected]
-        [email protected]
+        [email protected] "v"
-          [email protected] "v"
+    [email protected] "="
-      [email protected] "="
+    [email protected]
-      [email protected]
+      [email protected]
-        [email protected]
+        [email protected]
-          [email protected]
+          [email protected]
-            [email protected]
+            [email protected]
-              [email protected]
+              [email protected]
-                [email protected]
+                [email protected] "Vec"
-                  [email protected] "Vec"
+          [email protected] "::"
-            [email protected] "::"
+          [email protected]
-            [email protected]
+            [email protected]
-              [email protected]
+              [email protected] "new"
-                [email protected] "new"
+      [email protected]
-        [email protected]
+        [email protected] "("
-          [email protected] "("
+        [email protected] ")"
-          [email protected] ")"
+    [email protected] ";"
-      [email protected] ";"
+  [email protected]
-    [email protected]
+    [email protected]
-      [email protected]
+      [email protected]
-        [email protected]
+        [email protected]
-          [email protected]
+          [email protected]
-            [email protected]
+            [email protected]
-              [email protected]
+              [email protected] "v"
-                [email protected] "v"
+      [email protected] "."
-        [email protected] "."
+      [email protected]
-        [email protected]
+        [email protected] "push"
-          [email protected] "push"
+      [email protected]
-        [email protected]
+        [email protected] "("
-          [email protected] "("
+        [email protected]
-          [email protected]
+          [email protected] "1u32"
-            [email protected] "1u32"
+        [email protected] ")"
-          [email protected] ")"
+    [email protected] ";"
-      [email protected] ";"
+  [email protected]
-    [email protected]
+    [email protected]
-      [email protected]
+      [email protected]
-        [email protected]
+        [email protected]
-          [email protected]
+          [email protected]
-            [email protected]
+            [email protected]
-              [email protected]
+              [email protected] "v"
-                [email protected] "v"
+      [email protected] "."
-        [email protected] "."
+      [email protected]
-        [email protected]
+        [email protected] "push"
-          [email protected] "push"
+      [email protected]
-        [email protected]
+        [email protected] "("
-          [email protected] "("
+        [email protected]
-          [email protected]
+          [email protected] "2"
-            [email protected] "2"
+        [email protected] ")"
-          [email protected] ")"
+    [email protected] ";"
-      [email protected] ";"
+  [email protected]
-    [email protected]
+    [email protected]
-      [email protected]
+      [email protected]
-        [email protected]
+        [email protected]
-          [email protected]
+          [email protected] "v"
-            [email protected] "v"
+  [email protected] "}""#
-    [email protected] "}""#
    );
 }
author	Benjamin Coenen <[email protected]>	2020-05-02 11:25:04 +0100
committer	Benjamin Coenen <[email protected]>	2020-05-02 11:25:04 +0100
commit	0b40876b993ab30421624b831cb03b4042eb0142 (patch)
tree	85abb233dd8645480d61ab857a2b46c1209b142a /crates/ra_mbe
parent	eea21738ab9e0b7438d03f7b2efc18c15cc30cf2 (diff)
parent	75bc0249463b72971200e482d69dad88d4e76ae3 (diff)

diff --git a/crates/ra_mbe/src/tests.rs b/crates/ra_mbe/src/tests.rs index 0d924ce58..c43003fd6 100644 --- a/crates/ra_mbe/src/tests.rs +++ b/crates/ra_mbe/src/tests.rs
@@ -266,21 +266,20 @@ fn test_expr_order() {
266	[email protected] "("	266	[email protected] "("
267	[email protected] ")"	267	[email protected] ")"
268	[email protected]	268	[email protected]
269	[email protected]	269	[email protected] "{"
270	[email protected] "{"	270	[email protected]
271	[email protected]	271	[email protected]
272	[email protected]	272	[email protected]
273	[email protected]	273	[email protected]
274	[email protected]	274	[email protected] "1"
275	[email protected] "1"	275	[email protected] "+"
276	[email protected] "+"	276	[email protected]
277	[email protected]	277	[email protected] "1"
278	[email protected] "1"	278	[email protected] "*"
279	[email protected] "*"	279	[email protected]
280	[email protected]	280	[email protected] "2"
281	[email protected] "2"	281	[email protected] ";"
282	[email protected] ";"	282	[email protected] "}""#,
283	[email protected] "}""#,
284	);	283	);
285	}	284	}
286		285
@@ -1114,68 +1113,67 @@ fn test_vec() {
1114	assert_eq!(	1113	assert_eq!(
1115	format!("{:#?}", tree).trim(),	1114	format!("{:#?}", tree).trim(),
1116	r#"[email protected]	1115	r#"[email protected]
1117	[email protected]	1116	[email protected] "{"
1118	[email protected] "{"	1117	[email protected]
1119	[email protected]	1118	[email protected] "let"
1120	[email protected] "let"	1119	[email protected]
1121	[email protected]	1120	[email protected] "mut"
1122	[email protected] "mut"	1121	[email protected]
1123	[email protected]	1122	[email protected] "v"
1124	[email protected] "v"	1123	[email protected] "="
1125	[email protected] "="	1124	[email protected]
1126	[email protected]	1125	[email protected]
1127	[email protected]	1126	[email protected]
1128	[email protected]	1127	[email protected]
1129	[email protected]	1128	[email protected]
1130	[email protected]	1129	[email protected]
1131	[email protected]	1130	[email protected] "Vec"
1132	[email protected] "Vec"	1131	[email protected] "::"
1133	[email protected] "::"	1132	[email protected]
1134	[email protected]	1133	[email protected]
1135	[email protected]	1134	[email protected] "new"
1136	[email protected] "new"	1135	[email protected]
1137	[email protected]	1136	[email protected] "("
1138	[email protected] "("	1137	[email protected] ")"
1139	[email protected] ")"	1138	[email protected] ";"
1140	[email protected] ";"	1139	[email protected]
1141	[email protected]	1140	[email protected]
1142	[email protected]	1141	[email protected]
1143	[email protected]	1142	[email protected]
1144	[email protected]	1143	[email protected]
1145	[email protected]	1144	[email protected]
1146	[email protected]	1145	[email protected] "v"
1147	[email protected] "v"	1146	[email protected] "."
1148	[email protected] "."	1147	[email protected]
1149	[email protected]	1148	[email protected] "push"
1150	[email protected] "push"	1149	[email protected]
1151	[email protected]	1150	[email protected] "("
1152	[email protected] "("	1151	[email protected]
1153	[email protected]	1152	[email protected] "1u32"
1154	[email protected] "1u32"	1153	[email protected] ")"
1155	[email protected] ")"	1154	[email protected] ";"
1156	[email protected] ";"	1155	[email protected]
1157	[email protected]	1156	[email protected]
1158	[email protected]	1157	[email protected]
1159	[email protected]	1158	[email protected]
1160	[email protected]	1159	[email protected]
1161	[email protected]	1160	[email protected]
1162	[email protected]	1161	[email protected] "v"
1163	[email protected] "v"	1162	[email protected] "."
1164	[email protected] "."	1163	[email protected]
1165	[email protected]	1164	[email protected] "push"
1166	[email protected] "push"	1165	[email protected]
1167	[email protected]	1166	[email protected] "("
1168	[email protected] "("	1167	[email protected]
1169	[email protected]	1168	[email protected] "2"
1170	[email protected] "2"	1169	[email protected] ")"
1171	[email protected] ")"	1170	[email protected] ";"
1172	[email protected] ";"	1171	[email protected]
1173	[email protected]	1172	[email protected]
1174	[email protected]	1173	[email protected]
1175	[email protected]	1174	[email protected]
1176	[email protected]	1175	[email protected] "v"
1177	[email protected] "v"	1176	[email protected] "}""#
1178	[email protected] "}""#
1179	);	1177	);
1180	}	1178	}
1181		1179