Fix .gitattributes for test_data

diff --git a/.gitattributes b/.gitattributes
index 3b3d2d0d656d32c909b61bfbeb33b4bbb1b36387..cb87b5d01385ad82c7a1658208d0a2605c7f4306 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,7 +1,8 @@
 * text=auto eol=lf
+
 # git grep shouldn't match entries in this benchmark data
 bench_data/** binary
-crates/syntax/test_data/** -text eof=LF
+
 # Older git versions try to fix line endings on images, this prevents it.
 *.png binary
 *.jpg binary

diff --git a/crates/syntax/test_data/parser/validation/0045_ambiguous_trait_object.rs b/crates/syntax/test_data/parser/validation/0045_ambiguous_trait_object.rs
index 3a73d81bb5dc6afcfe9470eca8e18e6f04a7b20d..0a5958f25f7ab99df4d04f74bb0027fa29d8c322 100644 (file)
--- a/crates/syntax/test_data/parser/validation/0045_ambiguous_trait_object.rs
+++ b/crates/syntax/test_data/parser/validation/0045_ambiguous_trait_object.rs
@@ -1,6 +1,6 @@
-type Foo<'a> = &'a dyn Send + Sync;\r
-type Foo = *const dyn Send + Sync;\r
-type Foo = fn() -> dyn Send + 'static;\r
-fn main() {\r
-    let b = (&a) as &dyn Add<Other, Output = Addable> + Other;\r
-}\r
+type Foo<'a> = &'a dyn Send + Sync;
+type Foo = *const dyn Send + Sync;
+type Foo = fn() -> dyn Send + 'static;
+fn main() {
+    let b = (&a) as &dyn Add<Other, Output = Addable> + Other;
+}

diff --git a/crates/syntax/test_data/parser/validation/0046_mutable_const_item.rs b/crates/syntax/test_data/parser/validation/0046_mutable_const_item.rs
index b34336f3f15d041458f14e178df6608953e697c6..ccab6bccfaa1278674691f975c23f940082fb3f2 100644 (file)
--- a/crates/syntax/test_data/parser/validation/0046_mutable_const_item.rs
+++ b/crates/syntax/test_data/parser/validation/0046_mutable_const_item.rs
@@ -1 +1 @@
-const mut FOO: () = ();\r
+const mut FOO: () = ();

diff --git a/crates/syntax/test_data/parser/validation/invalid_let_expr.rast b/crates/syntax/test_data/parser/validation/invalid_let_expr.rast
index 5b37b597832049c6f1658c0634761acd7ae9b2dd..9e1e4886401a1c32d9a218ac372d1a2b5ccc6142 100644 (file)
--- a/crates/syntax/test_data/parser/validation/invalid_let_expr.rast
+++ b/crates/syntax/test_data/parser/validation/invalid_let_expr.rast
@@ -1,216 +1,216 @@
-SOURCE_FILE@0..282\r
-  FN@0..281\r
-    FN_KW@0..2 "fn"\r
-    WHITESPACE@2..3 " "\r
-    NAME@3..6\r
-      IDENT@3..6 "foo"\r
-    PARAM_LIST@6..8\r
-      L_PAREN@6..7 "("\r
-      R_PAREN@7..8 ")"\r
-    WHITESPACE@8..9 " "\r
-    BLOCK_EXPR@9..281\r
-      STMT_LIST@9..281\r
-        L_CURLY@9..10 "{"\r
-        WHITESPACE@10..15 "\n    "\r
-        CONST@15..42\r
-          CONST_KW@15..20 "const"\r
-          WHITESPACE@20..21 " "\r
-          UNDERSCORE@21..22 "_"\r
-          COLON@22..23 ":"\r
-          WHITESPACE@23..24 " "\r
-          TUPLE_TYPE@24..26\r
-            L_PAREN@24..25 "("\r
-            R_PAREN@25..26 ")"\r
-          WHITESPACE@26..27 " "\r
-          EQ@27..28 "="\r
-          WHITESPACE@28..29 " "\r
-          LET_EXPR@29..41\r
-            LET_KW@29..32 "let"\r
-            WHITESPACE@32..33 " "\r
-            WILDCARD_PAT@33..34\r
-              UNDERSCORE@33..34 "_"\r
-            WHITESPACE@34..35 " "\r
-            EQ@35..36 "="\r
-            WHITESPACE@36..37 " "\r
-            PATH_EXPR@37..41\r
-              PATH@37..41\r
-                PATH_SEGMENT@37..41\r
-                  NAME_REF@37..41\r
-                    IDENT@37..41 "None"\r
-          SEMICOLON@41..42 ";"\r
-        WHITESPACE@42..48 "\n\n    "\r
-        LET_STMT@48..83\r
-          LET_KW@48..51 "let"\r
-          WHITESPACE@51..52 " "\r
-          WILDCARD_PAT@52..53\r
-            UNDERSCORE@52..53 "_"\r
-          WHITESPACE@53..54 " "\r
-          EQ@54..55 "="\r
-          WHITESPACE@55..56 " "\r
-          IF_EXPR@56..82\r
-            IF_KW@56..58 "if"\r
-            WHITESPACE@58..59 " "\r
-            LITERAL@59..63\r
-              TRUE_KW@59..63 "true"\r
-            WHITESPACE@63..64 " "\r
-            BLOCK_EXPR@64..82\r
-              STMT_LIST@64..82\r
-                L_CURLY@64..65 "{"\r
-                WHITESPACE@65..66 " "\r
-                PAREN_EXPR@66..80\r
-                  L_PAREN@66..67 "("\r
-                  LET_EXPR@67..79\r
-                    LET_KW@67..70 "let"\r
-                    WHITESPACE@70..71 " "\r
-                    WILDCARD_PAT@71..72\r
-                      UNDERSCORE@71..72 "_"\r
-                    WHITESPACE@72..73 " "\r
-                    EQ@73..74 "="\r
-                    WHITESPACE@74..75 " "\r
-                    PATH_EXPR@75..79\r
-                      PATH@75..79\r
-                        PATH_SEGMENT@75..79\r
-                          NAME_REF@75..79\r
-                            IDENT@75..79 "None"\r
-                  R_PAREN@79..80 ")"\r
-                WHITESPACE@80..81 " "\r
-                R_CURLY@81..82 "}"\r
-          SEMICOLON@82..83 ";"\r
-        WHITESPACE@83..89 "\n\n    "\r
-        IF_EXPR@89..279\r
-          IF_KW@89..91 "if"\r
-          WHITESPACE@91..92 " "\r
-          BIN_EXPR@92..114\r
-            LITERAL@92..96\r
-              TRUE_KW@92..96 "true"\r
-            WHITESPACE@96..97 " "\r
-            AMP2@97..99 "&&"\r
-            WHITESPACE@99..100 " "\r
-            PAREN_EXPR@100..114\r
-              L_PAREN@100..101 "("\r
-              LET_EXPR@101..113\r
-                LET_KW@101..104 "let"\r
-                WHITESPACE@104..105 " "\r
-                WILDCARD_PAT@105..106\r
-                  UNDERSCORE@105..106 "_"\r
-                WHITESPACE@106..107 " "\r
-                EQ@107..108 "="\r
-                WHITESPACE@108..109 " "\r
-                PATH_EXPR@109..113\r
-                  PATH@109..113\r
-                    PATH_SEGMENT@109..113\r
-                      NAME_REF@109..113\r
-                        IDENT@109..113 "None"\r
-              R_PAREN@113..114 ")"\r
-          WHITESPACE@114..115 " "\r
-          BLOCK_EXPR@115..279\r
-            STMT_LIST@115..279\r
-              L_CURLY@115..116 "{"\r
-              WHITESPACE@116..125 "\n        "\r
-              EXPR_STMT@125..140\r
-                PAREN_EXPR@125..139\r
-                  L_PAREN@125..126 "("\r
-                  LET_EXPR@126..138\r
-                    LET_KW@126..129 "let"\r
-                    WHITESPACE@129..130 " "\r
-                    WILDCARD_PAT@130..131\r
-                      UNDERSCORE@130..131 "_"\r
-                    WHITESPACE@131..132 " "\r
-                    EQ@132..133 "="\r
-                    WHITESPACE@133..134 " "\r
-                    PATH_EXPR@134..138\r
-                      PATH@134..138\r
-                        PATH_SEGMENT@134..138\r
-                          NAME_REF@134..138\r
-                            IDENT@134..138 "None"\r
-                  R_PAREN@138..139 ")"\r
-                SEMICOLON@139..140 ";"\r
-              WHITESPACE@140..149 "\n        "\r
-              WHILE_EXPR@149..273\r
-                WHILE_KW@149..154 "while"\r
-                WHITESPACE@154..155 " "\r
-                LET_EXPR@155..167\r
-                  LET_KW@155..158 "let"\r
-                  WHITESPACE@158..159 " "\r
-                  WILDCARD_PAT@159..160\r
-                    UNDERSCORE@159..160 "_"\r
-                  WHITESPACE@160..161 " "\r
-                  EQ@161..162 "="\r
-                  WHITESPACE@162..163 " "\r
-                  PATH_EXPR@163..167\r
-                    PATH@163..167\r
-                      PATH_SEGMENT@163..167\r
-                        NAME_REF@163..167\r
-                          IDENT@163..167 "None"\r
-                WHITESPACE@167..168 " "\r
-                BLOCK_EXPR@168..273\r
-                  STMT_LIST@168..273\r
-                    L_CURLY@168..169 "{"\r
-                    WHITESPACE@169..182 "\n            "\r
-                    MATCH_EXPR@182..263\r
-                      MATCH_KW@182..187 "match"\r
-                      WHITESPACE@187..188 " "\r
-                      PATH_EXPR@188..192\r
-                        PATH@188..192\r
-                          PATH_SEGMENT@188..192\r
-                            NAME_REF@188..192\r
-                              IDENT@188..192 "None"\r
-                      WHITESPACE@192..193 " "\r
-                      MATCH_ARM_LIST@193..263\r
-                        L_CURLY@193..194 "{"\r
-                        WHITESPACE@194..211 "\n                "\r
-                        MATCH_ARM@211..249\r
-                          WILDCARD_PAT@211..212\r
-                            UNDERSCORE@211..212 "_"\r
-                          WHITESPACE@212..213 " "\r
-                          MATCH_GUARD@213..228\r
-                            IF_KW@213..215 "if"\r
-                            WHITESPACE@215..216 " "\r
-                            LET_EXPR@216..228\r
-                              LET_KW@216..219 "let"\r
-                              WHITESPACE@219..220 " "\r
-                              WILDCARD_PAT@220..221\r
-                                UNDERSCORE@220..221 "_"\r
-                              WHITESPACE@221..222 " "\r
-                              EQ@222..223 "="\r
-                              WHITESPACE@223..224 " "\r
-                              PATH_EXPR@224..228\r
-                                PATH@224..228\r
-                                  PATH_SEGMENT@224..228\r
-                                    NAME_REF@224..228\r
-                                      IDENT@224..228 "None"\r
-                          WHITESPACE@228..229 " "\r
-                          FAT_ARROW@229..231 "=>"\r
-                          WHITESPACE@231..232 " "\r
-                          BLOCK_EXPR@232..249\r
-                            STMT_LIST@232..249\r
-                              L_CURLY@232..233 "{"\r
-                              WHITESPACE@233..234 " "\r
-                              LET_STMT@234..247\r
-                                LET_KW@234..237 "let"\r
-                                WHITESPACE@237..238 " "\r
-                                WILDCARD_PAT@238..239\r
-                                  UNDERSCORE@238..239 "_"\r
-                                WHITESPACE@239..240 " "\r
-                                EQ@240..241 "="\r
-                                WHITESPACE@241..242 " "\r
-                                PATH_EXPR@242..246\r
-                                  PATH@242..246\r
-                                    PATH_SEGMENT@242..246\r
-                                      NAME_REF@242..246\r
-                                        IDENT@242..246 "None"\r
-                                SEMICOLON@246..247 ";"\r
-                              WHITESPACE@247..248 " "\r
-                              R_CURLY@248..249 "}"\r
-                        WHITESPACE@249..262 "\n            "\r
-                        R_CURLY@262..263 "}"\r
-                    WHITESPACE@263..272 "\n        "\r
-                    R_CURLY@272..273 "}"\r
-              WHITESPACE@273..278 "\n    "\r
-              R_CURLY@278..279 "}"\r
-        WHITESPACE@279..280 "\n"\r
-        R_CURLY@280..281 "}"\r
-  WHITESPACE@281..282 "\n"\r
-error 29..41: `let` expressions are not supported here\r
-error 67..79: `let` expressions are not supported here\r
-error 126..138: `let` expressions are not supported here\r
+SOURCE_FILE@0..282
+  FN@0..281
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..6
+      IDENT@3..6 "foo"
+    PARAM_LIST@6..8
+      L_PAREN@6..7 "("
+      R_PAREN@7..8 ")"
+    WHITESPACE@8..9 " "
+    BLOCK_EXPR@9..281
+      STMT_LIST@9..281
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..15 "\n    "
+        CONST@15..42
+          CONST_KW@15..20 "const"
+          WHITESPACE@20..21 " "
+          UNDERSCORE@21..22 "_"
+          COLON@22..23 ":"
+          WHITESPACE@23..24 " "
+          TUPLE_TYPE@24..26
+            L_PAREN@24..25 "("
+            R_PAREN@25..26 ")"
+          WHITESPACE@26..27 " "
+          EQ@27..28 "="
+          WHITESPACE@28..29 " "
+          LET_EXPR@29..41
+            LET_KW@29..32 "let"
+            WHITESPACE@32..33 " "
+            WILDCARD_PAT@33..34
+              UNDERSCORE@33..34 "_"
+            WHITESPACE@34..35 " "
+            EQ@35..36 "="
+            WHITESPACE@36..37 " "
+            PATH_EXPR@37..41
+              PATH@37..41
+                PATH_SEGMENT@37..41
+                  NAME_REF@37..41
+                    IDENT@37..41 "None"
+          SEMICOLON@41..42 ";"
+        WHITESPACE@42..48 "\n\n    "
+        LET_STMT@48..83
+          LET_KW@48..51 "let"
+          WHITESPACE@51..52 " "
+          WILDCARD_PAT@52..53
+            UNDERSCORE@52..53 "_"
+          WHITESPACE@53..54 " "
+          EQ@54..55 "="
+          WHITESPACE@55..56 " "
+          IF_EXPR@56..82
+            IF_KW@56..58 "if"
+            WHITESPACE@58..59 " "
+            LITERAL@59..63
+              TRUE_KW@59..63 "true"
+            WHITESPACE@63..64 " "
+            BLOCK_EXPR@64..82
+              STMT_LIST@64..82
+                L_CURLY@64..65 "{"
+                WHITESPACE@65..66 " "
+                PAREN_EXPR@66..80
+                  L_PAREN@66..67 "("
+                  LET_EXPR@67..79
+                    LET_KW@67..70 "let"
+                    WHITESPACE@70..71 " "
+                    WILDCARD_PAT@71..72
+                      UNDERSCORE@71..72 "_"
+                    WHITESPACE@72..73 " "
+                    EQ@73..74 "="
+                    WHITESPACE@74..75 " "
+                    PATH_EXPR@75..79
+                      PATH@75..79
+                        PATH_SEGMENT@75..79
+                          NAME_REF@75..79
+                            IDENT@75..79 "None"
+                  R_PAREN@79..80 ")"
+                WHITESPACE@80..81 " "
+                R_CURLY@81..82 "}"
+          SEMICOLON@82..83 ";"
+        WHITESPACE@83..89 "\n\n    "
+        IF_EXPR@89..279
+          IF_KW@89..91 "if"
+          WHITESPACE@91..92 " "
+          BIN_EXPR@92..114
+            LITERAL@92..96
+              TRUE_KW@92..96 "true"
+            WHITESPACE@96..97 " "
+            AMP2@97..99 "&&"
+            WHITESPACE@99..100 " "
+            PAREN_EXPR@100..114
+              L_PAREN@100..101 "("
+              LET_EXPR@101..113
+                LET_KW@101..104 "let"
+                WHITESPACE@104..105 " "
+                WILDCARD_PAT@105..106
+                  UNDERSCORE@105..106 "_"
+                WHITESPACE@106..107 " "
+                EQ@107..108 "="
+                WHITESPACE@108..109 " "
+                PATH_EXPR@109..113
+                  PATH@109..113
+                    PATH_SEGMENT@109..113
+                      NAME_REF@109..113
+                        IDENT@109..113 "None"
+              R_PAREN@113..114 ")"
+          WHITESPACE@114..115 " "
+          BLOCK_EXPR@115..279
+            STMT_LIST@115..279
+              L_CURLY@115..116 "{"
+              WHITESPACE@116..125 "\n        "
+              EXPR_STMT@125..140
+                PAREN_EXPR@125..139
+                  L_PAREN@125..126 "("
+                  LET_EXPR@126..138
+                    LET_KW@126..129 "let"
+                    WHITESPACE@129..130 " "
+                    WILDCARD_PAT@130..131
+                      UNDERSCORE@130..131 "_"
+                    WHITESPACE@131..132 " "
+                    EQ@132..133 "="
+                    WHITESPACE@133..134 " "
+                    PATH_EXPR@134..138
+                      PATH@134..138
+                        PATH_SEGMENT@134..138
+                          NAME_REF@134..138
+                            IDENT@134..138 "None"
+                  R_PAREN@138..139 ")"
+                SEMICOLON@139..140 ";"
+              WHITESPACE@140..149 "\n        "
+              WHILE_EXPR@149..273
+                WHILE_KW@149..154 "while"
+                WHITESPACE@154..155 " "
+                LET_EXPR@155..167
+                  LET_KW@155..158 "let"
+                  WHITESPACE@158..159 " "
+                  WILDCARD_PAT@159..160
+                    UNDERSCORE@159..160 "_"
+                  WHITESPACE@160..161 " "
+                  EQ@161..162 "="
+                  WHITESPACE@162..163 " "
+                  PATH_EXPR@163..167
+                    PATH@163..167
+                      PATH_SEGMENT@163..167
+                        NAME_REF@163..167
+                          IDENT@163..167 "None"
+                WHITESPACE@167..168 " "
+                BLOCK_EXPR@168..273
+                  STMT_LIST@168..273
+                    L_CURLY@168..169 "{"
+                    WHITESPACE@169..182 "\n            "
+                    MATCH_EXPR@182..263
+                      MATCH_KW@182..187 "match"
+                      WHITESPACE@187..188 " "
+                      PATH_EXPR@188..192
+                        PATH@188..192
+                          PATH_SEGMENT@188..192
+                            NAME_REF@188..192
+                              IDENT@188..192 "None"
+                      WHITESPACE@192..193 " "
+                      MATCH_ARM_LIST@193..263
+                        L_CURLY@193..194 "{"
+                        WHITESPACE@194..211 "\n                "
+                        MATCH_ARM@211..249
+                          WILDCARD_PAT@211..212
+                            UNDERSCORE@211..212 "_"
+                          WHITESPACE@212..213 " "
+                          MATCH_GUARD@213..228
+                            IF_KW@213..215 "if"
+                            WHITESPACE@215..216 " "
+                            LET_EXPR@216..228
+                              LET_KW@216..219 "let"
+                              WHITESPACE@219..220 " "
+                              WILDCARD_PAT@220..221
+                                UNDERSCORE@220..221 "_"
+                              WHITESPACE@221..222 " "
+                              EQ@222..223 "="
+                              WHITESPACE@223..224 " "
+                              PATH_EXPR@224..228
+                                PATH@224..228
+                                  PATH_SEGMENT@224..228
+                                    NAME_REF@224..228
+                                      IDENT@224..228 "None"
+                          WHITESPACE@228..229 " "
+                          FAT_ARROW@229..231 "=>"
+                          WHITESPACE@231..232 " "
+                          BLOCK_EXPR@232..249
+                            STMT_LIST@232..249
+                              L_CURLY@232..233 "{"
+                              WHITESPACE@233..234 " "
+                              LET_STMT@234..247
+                                LET_KW@234..237 "let"
+                                WHITESPACE@237..238 " "
+                                WILDCARD_PAT@238..239
+                                  UNDERSCORE@238..239 "_"
+                                WHITESPACE@239..240 " "
+                                EQ@240..241 "="
+                                WHITESPACE@241..242 " "
+                                PATH_EXPR@242..246
+                                  PATH@242..246
+                                    PATH_SEGMENT@242..246
+                                      NAME_REF@242..246
+                                        IDENT@242..246 "None"
+                                SEMICOLON@246..247 ";"
+                              WHITESPACE@247..248 " "
+                              R_CURLY@248..249 "}"
+                        WHITESPACE@249..262 "\n            "
+                        R_CURLY@262..263 "}"
+                    WHITESPACE@263..272 "\n        "
+                    R_CURLY@272..273 "}"
+              WHITESPACE@273..278 "\n    "
+              R_CURLY@278..279 "}"
+        WHITESPACE@279..280 "\n"
+        R_CURLY@280..281 "}"
+  WHITESPACE@281..282 "\n"
+error 29..41: `let` expressions are not supported here
+error 67..79: `let` expressions are not supported here
+error 126..138: `let` expressions are not supported here