Merge #6896

6896: Node-ify lifetimes r=jonas-schievink a=Veykril

Let's see if this passes the tests 🤞 

Depends on https://github.com/rust-analyzer/ungrammar/pull/15

Co-authored-by: Jonas Schievink <[email protected]>
Co-authored-by: Jonas Schievink <[email protected]>
Co-authored-by: Lukas Wirth <[email protected]>

17 files changed, 70 insertions, 35 deletions

diff --git a/crates/syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast b/crates/syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast
index a4271fc87..0adf2cd5a 100644
--- a/crates/syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast
+++ b/crates/syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast
@@ -14,7 +14,8 @@ [email protected]
       [email protected]
         [email protected]
           [email protected]
-            [email protected] "\'loop"
+            [email protected]
+              [email protected] "\'loop"
             [email protected] ":"
       [email protected] " "
       [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0003_where_pred_for.rast b/crates/syntax/test_data/parser/inline/ok/0003_where_pred_for.rast
index 62da7b887..6cdfd058b 100644
--- a/crates/syntax/test_data/parser/inline/ok/0003_where_pred_for.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0003_where_pred_for.rast
@@ -22,7 +22,8 @@ [email protected]
         [email protected]
           [email protected] "<"
           [email protected]
-            [email protected] "\'a"
+            [email protected]
+              [email protected] "\'a"
           [email protected] ">"
         [email protected] " "
         [email protected]
@@ -44,7 +45,8 @@ [email protected]
                     [email protected]
                       [email protected]
                         [email protected] "&"
-                        [email protected] "\'a"
+                        [email protected]
+                          [email protected] "\'a"
                         [email protected] " "
                         [email protected]
                           [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0006_self_param.rast b/crates/syntax/test_data/parser/inline/ok/0006_self_param.rast
index d24ad7423..8048f5fad 100644
--- a/crates/syntax/test_data/parser/inline/ok/0006_self_param.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0006_self_param.rast
@@ -52,7 +52,8 @@ [email protected]
           [email protected] "("
           [email protected]
             [email protected] "&"
-            [email protected] "\'a"
+            [email protected]
+              [email protected] "\'a"
             [email protected] " "
             [email protected] "self"
           [email protected] ","
@@ -71,7 +72,8 @@ [email protected]
           [email protected] "("
           [email protected]
             [email protected] "&"
-            [email protected] "\'a"
+            [email protected]
+              [email protected] "\'a"
             [email protected] " "
             [email protected] "mut"
             [email protected] " "
diff --git a/crates/syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast b/crates/syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast
index e95688f56..075b438d2 100644
--- a/crates/syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast
@@ -13,7 +13,8 @@ [email protected]
         [email protected] " "
         [email protected]
           [email protected]
-            [email protected] "\'a"
+            [email protected]
+              [email protected] "\'a"
           [email protected] " "
           [email protected] "+"
           [email protected] " "
diff --git a/crates/syntax/test_data/parser/inline/ok/0015_continue_expr.rast b/crates/syntax/test_data/parser/inline/ok/0015_continue_expr.rast
index 104e153ce..b9e92b57a 100644
--- a/crates/syntax/test_data/parser/inline/ok/0015_continue_expr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0015_continue_expr.rast
@@ -26,7 +26,8 @@ [email protected]
             [email protected]
               [email protected] "continue"
               [email protected] " "
-              [email protected] "\'l"
+              [email protected]
+                [email protected] "\'l"
             [email protected] ";"
           [email protected] "\n    "
           [email protected] "}"
diff --git a/crates/syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast b/crates/syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast
index 32b2959bd..dad4362b7 100644
--- a/crates/syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast
@@ -31,13 +31,15 @@ [email protected]
                           [email protected]
                             [email protected] "<"
                             [email protected]
-                              [email protected] "\'a"
+                              [email protected]
+                                [email protected] "\'a"
                             [email protected] ">"
                   [email protected] ">"
         [email protected] " "
         [email protected] "+"
         [email protected] " "
         [email protected]
-          [email protected] "\'a"
+          [email protected]
+            [email protected] "\'a"
     [email protected] ";"
   [email protected] "\n"
diff --git a/crates/syntax/test_data/parser/inline/ok/0033_reference_type;.rast b/crates/syntax/test_data/parser/inline/ok/0033_reference_type;.rast
index 974df9f9a..ac0299268 100644
--- a/crates/syntax/test_data/parser/inline/ok/0033_reference_type;.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0033_reference_type;.rast
@@ -24,7 +24,8 @@ [email protected]
     [email protected] " "
     [email protected]
       [email protected] "&"
-      [email protected] "\'static"
+      [email protected]
+        [email protected] "\'static"
       [email protected] " "
       [email protected]
         [email protected] "("
diff --git a/crates/syntax/test_data/parser/inline/ok/0034_break_expr.rast b/crates/syntax/test_data/parser/inline/ok/0034_break_expr.rast
index f905def6f..828013d45 100644
--- a/crates/syntax/test_data/parser/inline/ok/0034_break_expr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0034_break_expr.rast
@@ -26,7 +26,8 @@ [email protected]
             [email protected]
               [email protected] "break"
               [email protected] " "
-              [email protected] "\'l"
+              [email protected]
+                [email protected] "\'l"
             [email protected] ";"
           [email protected] "\n        "
           [email protected]
@@ -41,7 +42,8 @@ [email protected]
             [email protected]
               [email protected] "break"
               [email protected] " "
-              [email protected] "\'l"
+              [email protected]
+                [email protected] "\'l"
               [email protected] " "
               [email protected]
                 [email protected] "92"
diff --git a/crates/syntax/test_data/parser/inline/ok/0039_type_arg.rast b/crates/syntax/test_data/parser/inline/ok/0039_type_arg.rast
index 69e98b9d6..51e881a8e 100644
--- a/crates/syntax/test_data/parser/inline/ok/0039_type_arg.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0039_type_arg.rast
@@ -15,7 +15,8 @@ [email protected]
           [email protected]
             [email protected] "<"
             [email protected]
-              [email protected] "\'static"
+              [email protected]
+                [email protected] "\'static"
             [email protected] ","
             [email protected] " "
             [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast b/crates/syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast
index 6baea6e3c..b6f5a5689 100644
--- a/crates/syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast
@@ -33,7 +33,8 @@ [email protected]
                               [email protected]
                                 [email protected] "<"
                                 [email protected]
-                                  [email protected] "\'a"
+                                  [email protected]
+                                    [email protected] "\'a"
                                 [email protected] ">"
                     [email protected] ")"
       [email protected] ">"
diff --git a/crates/syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast b/crates/syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast
index 4d8404e7c..7df6e190a 100644
--- a/crates/syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast
@@ -31,7 +31,8 @@ [email protected]
                     [email protected] "+"
                     [email protected] " "
                     [email protected]
-                      [email protected] "\'f"
+                      [email protected]
+                        [email protected] "\'f"
               [email protected] ">"
     [email protected] " "
     [email protected]
@@ -72,7 +73,8 @@ [email protected]
                     [email protected] "+"
                     [email protected] " "
                     [email protected]
-                      [email protected] "\'f"
+                      [email protected]
+                        [email protected] "\'f"
               [email protected] ">"
     [email protected] " "
     [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0056_where_clause.rast b/crates/syntax/test_data/parser/inline/ok/0056_where_clause.rast
index 28129c50c..61dea413d 100644
--- a/crates/syntax/test_data/parser/inline/ok/0056_where_clause.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0056_where_clause.rast
@@ -12,17 +12,20 @@ [email protected]
       [email protected] "where"
       [email protected] "\n   "
       [email protected]
-        [email protected] "\'a"
+        [email protected]
+          [email protected] "\'a"
         [email protected] ":"
         [email protected] " "
         [email protected]
           [email protected]
-            [email protected] "\'b"
+            [email protected]
+              [email protected] "\'b"
           [email protected] " "
           [email protected] "+"
           [email protected] " "
           [email protected]
-            [email protected] "\'c"
+            [email protected]
+              [email protected] "\'c"
       [email protected] ","
       [email protected] "\n   "
       [email protected]
@@ -53,7 +56,8 @@ [email protected]
           [email protected] "+"
           [email protected] " "
           [email protected]
-            [email protected] "\'static"
+            [email protected]
+              [email protected] "\'static"
       [email protected] ","
       [email protected] "\n   "
       [email protected]
@@ -71,7 +75,8 @@ [email protected]
         [email protected] " "
         [email protected]
           [email protected]
-            [email protected] "\'a"
+            [email protected]
+              [email protected] "\'a"
       [email protected] ","
       [email protected] "\n   "
       [email protected]
@@ -102,7 +107,8 @@ [email protected]
         [email protected] " "
         [email protected]
           [email protected]
-            [email protected] "\'a"
+            [email protected]
+              [email protected] "\'a"
     [email protected] "\n"
     [email protected]
       [email protected] "{"
diff --git a/crates/syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast b/crates/syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast
index 3a7fcfe24..49d26cef4 100644
--- a/crates/syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast
@@ -31,13 +31,15 @@ [email protected]
                           [email protected]
                             [email protected] "<"
                             [email protected]
-                              [email protected] "\'a"
+                              [email protected]
+                                [email protected] "\'a"
                             [email protected] ">"
                   [email protected] ">"
         [email protected] " "
         [email protected] "+"
         [email protected] " "
         [email protected]
-          [email protected] "\'a"
+          [email protected]
+            [email protected] "\'a"
     [email protected] ";"
   [email protected] "\n"
diff --git a/crates/syntax/test_data/parser/inline/ok/0081_for_type.rast b/crates/syntax/test_data/parser/inline/ok/0081_for_type.rast
index f319d5141..8c909b5af 100644
--- a/crates/syntax/test_data/parser/inline/ok/0081_for_type.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0081_for_type.rast
@@ -12,7 +12,8 @@ [email protected]
       [email protected]
         [email protected] "<"
         [email protected]
-          [email protected] "\'a"
+          [email protected]
+            [email protected] "\'a"
         [email protected] ">"
       [email protected] " "
       [email protected]
@@ -42,7 +43,8 @@ [email protected]
       [email protected]
         [email protected] "<"
         [email protected]
-          [email protected] "\'a"
+          [email protected]
+            [email protected] "\'a"
         [email protected] ">"
       [email protected] " "
       [email protected]
@@ -59,7 +61,8 @@ [email protected]
           [email protected]
             [email protected]
               [email protected] "&"
-              [email protected] "\'a"
+              [email protected]
+                [email protected] "\'a"
               [email protected] " "
               [email protected]
                 [email protected] "("
@@ -87,7 +90,8 @@ [email protected]
       [email protected]
         [email protected] "<"
         [email protected]
-          [email protected] "\'a"
+          [email protected]
+            [email protected] "\'a"
         [email protected] ">"
       [email protected] " "
       [email protected]
@@ -100,7 +104,8 @@ [email protected]
               [email protected]
                 [email protected]
                   [email protected] "&"
-                  [email protected] "\'a"
+                  [email protected]
+                    [email protected] "\'a"
                   [email protected] " "
                   [email protected]
                     [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0109_label.rast b/crates/syntax/test_data/parser/inline/ok/0109_label.rast
index c9588025c..860dfe608 100644
--- a/crates/syntax/test_data/parser/inline/ok/0109_label.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0109_label.rast
@@ -14,7 +14,8 @@ [email protected]
       [email protected]
         [email protected]
           [email protected]
-            [email protected] "\'a"
+            [email protected]
+              [email protected] "\'a"
             [email protected] ":"
           [email protected] " "
           [email protected] "loop"
@@ -26,7 +27,8 @@ [email protected]
       [email protected]
         [email protected]
           [email protected]
-            [email protected] "\'b"
+            [email protected]
+              [email protected] "\'b"
             [email protected] ":"
           [email protected] " "
           [email protected] "while"
@@ -41,7 +43,8 @@ [email protected]
       [email protected] "\n    "
       [email protected]
         [email protected]
-          [email protected] "\'c"
+          [email protected]
+            [email protected] "\'c"
           [email protected] ":"
         [email protected] " "
         [email protected] "for"
diff --git a/crates/syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast b/crates/syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast
index 570b95205..616aa984e 100644
--- a/crates/syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast
@@ -20,7 +20,8 @@ [email protected]
             [email protected] ")"
           [email protected] "]"
         [email protected] " "
-        [email protected] "\'a"
+        [email protected]
+          [email protected] "\'a"
       [email protected] ","
       [email protected] " "
       [email protected]
@@ -49,7 +50,8 @@ [email protected]
         [email protected] " "
         [email protected]
           [email protected] "&"
-          [email protected] "\'a"
+          [email protected]
+            [email protected] "\'a"
           [email protected] " "
           [email protected]
             [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0161_labeled_block.rast b/crates/syntax/test_data/parser/inline/ok/0161_labeled_block.rast
index 9e9a5f9c5..c2dea1cc1 100644
--- a/crates/syntax/test_data/parser/inline/ok/0161_labeled_block.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0161_labeled_block.rast
@@ -14,7 +14,8 @@ [email protected]
       [email protected]
         [email protected]
           [email protected]
-            [email protected] "\'label"
+            [email protected]
+              [email protected] "\'label"
             [email protected] ":"
           [email protected] " "
           [email protected]