From d016cb486738c1ab2574a322924183fa8a870b06 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 24 Jun 2020 00:48:38 +0200 Subject: Use only one code-path for parsing fixtures This removes leading newlines everywhere, shifting all ranges in tests by one --- crates/ra_hir_ty/src/tests/never_type.rs | 190 +++++++++++++++---------------- 1 file changed, 95 insertions(+), 95 deletions(-) (limited to 'crates/ra_hir_ty/src/tests/never_type.rs') diff --git a/crates/ra_hir_ty/src/tests/never_type.rs b/crates/ra_hir_ty/src/tests/never_type.rs index 082c47208..ab9a990f5 100644 --- a/crates/ra_hir_ty/src/tests/never_type.rs +++ b/crates/ra_hir_ty/src/tests/never_type.rs @@ -291,40 +291,40 @@ fn test6() { true, ); assert_snapshot!(t, @r###" - 25..53 '{ ...urn; }': () - 35..36 'x': u32 - 44..50 'return': ! - 65..98 '{ ...; }; }': () - 75..76 'x': u32 - 84..95 '{ return; }': u32 - 86..92 'return': ! - 110..139 '{ ... {}; }': () - 120..121 'x': u32 - 129..136 'loop {}': ! - 134..136 '{}': () - 151..184 '{ ...} }; }': () - 161..162 'x': u32 - 170..181 '{ loop {} }': u32 - 172..179 'loop {}': ! - 177..179 '{}': () - 196..260 '{ ...} }; }': () - 206..207 'x': u32 - 215..257 '{ if t...}; } }': u32 - 217..255 'if tru... {}; }': u32 - 220..224 'true': bool - 225..237 '{ loop {}; }': u32 - 227..234 'loop {}': ! - 232..234 '{}': () - 243..255 '{ loop {}; }': u32 - 245..252 'loop {}': ! - 250..252 '{}': () - 272..324 '{ ...; }; }': () - 282..283 'x': u32 - 291..321 '{ let ...; }; }': u32 - 297..298 'y': u32 - 306..318 '{ loop {}; }': u32 - 308..315 'loop {}': ! - 313..315 '{}': () + 11..39 '{ ...urn; }': () + 21..22 'x': u32 + 30..36 'return': ! + 51..84 '{ ...; }; }': () + 61..62 'x': u32 + 70..81 '{ return; }': u32 + 72..78 'return': ! + 96..125 '{ ... {}; }': () + 106..107 'x': u32 + 115..122 'loop {}': ! + 120..122 '{}': () + 137..170 '{ ...} }; }': () + 147..148 'x': u32 + 156..167 '{ loop {} }': u32 + 158..165 'loop {}': ! + 163..165 '{}': () + 182..246 '{ ...} }; }': () + 192..193 'x': u32 + 201..243 '{ if t...}; } }': u32 + 203..241 'if tru... {}; }': u32 + 206..210 'true': bool + 211..223 '{ loop {}; }': u32 + 213..220 'loop {}': ! + 218..220 '{}': () + 229..241 '{ loop {}; }': u32 + 231..238 'loop {}': ! + 236..238 '{}': () + 258..310 '{ ...; }; }': () + 268..269 'x': u32 + 277..307 '{ let ...; }; }': u32 + 283..284 'y': u32 + 292..304 '{ loop {}; }': u32 + 294..301 'loop {}': ! + 299..301 '{}': () "###); } @@ -341,14 +341,14 @@ fn test1() { true, ); assert_snapshot!(t, @r###" - 25..98 '{ ..." }; }': () - 68..69 'x': u32 - 77..95 '{ loop...foo" }': &str - 79..86 'loop {}': ! - 84..86 '{}': () - 88..93 '"foo"': &str - 77..95: expected u32, got &str - 88..93: expected u32, got &str + 11..84 '{ ..." }; }': () + 54..55 'x': u32 + 63..81 '{ loop...foo" }': &str + 65..72 'loop {}': ! + 70..72 '{}': () + 74..79 '"foo"': &str + 63..81: expected u32, got &str + 74..79: expected u32, got &str "###); } @@ -381,58 +381,58 @@ fn test3() { true, ); assert_snapshot!(t, @r###" - 25..99 '{ ...} }; }': () - 68..69 'x': u32 - 77..96 '{ loop...k; } }': () - 79..94 'loop { break; }': () - 84..94 '{ break; }': () - 86..91 'break': ! - 77..96: expected u32, got () - 79..94: expected u32, got () - 111..357 '{ ...; }; }': () - 154..155 'x': u32 - 163..189 '{ for ...; }; }': () - 165..186 'for a ...eak; }': () - 169..170 'a': {unknown} - 174..175 'b': {unknown} - 176..186 '{ break; }': () - 178..183 'break': ! - 240..241 'x': u32 - 249..267 '{ for ... {}; }': () - 251..264 'for a in b {}': () - 255..256 'a': {unknown} - 260..261 'b': {unknown} - 262..264 '{}': () - 318..319 'x': u32 - 327..354 '{ for ...; }; }': () - 329..351 'for a ...urn; }': () - 333..334 'a': {unknown} - 338..339 'b': {unknown} - 340..351 '{ return; }': () - 342..348 'return': ! - 163..189: expected u32, got () - 249..267: expected u32, got () - 327..354: expected u32, got () - 369..668 '{ ...; }; }': () - 412..413 'x': u32 - 421..447 '{ whil...; }; }': () - 423..444 'while ...eak; }': () - 429..433 'true': bool - 434..444 '{ break; }': () - 436..441 'break': ! - 551..552 'x': u32 - 560..578 '{ whil... {}; }': () - 562..575 'while true {}': () - 568..572 'true': bool - 573..575 '{}': () - 629..630 'x': u32 - 638..665 '{ whil...; }; }': () - 640..662 'while ...urn; }': () - 646..650 'true': bool - 651..662 '{ return; }': () - 653..659 'return': ! - 421..447: expected u32, got () - 560..578: expected u32, got () - 638..665: expected u32, got () + 11..85 '{ ...} }; }': () + 54..55 'x': u32 + 63..82 '{ loop...k; } }': () + 65..80 'loop { break; }': () + 70..80 '{ break; }': () + 72..77 'break': ! + 63..82: expected u32, got () + 65..80: expected u32, got () + 97..343 '{ ...; }; }': () + 140..141 'x': u32 + 149..175 '{ for ...; }; }': () + 151..172 'for a ...eak; }': () + 155..156 'a': {unknown} + 160..161 'b': {unknown} + 162..172 '{ break; }': () + 164..169 'break': ! + 226..227 'x': u32 + 235..253 '{ for ... {}; }': () + 237..250 'for a in b {}': () + 241..242 'a': {unknown} + 246..247 'b': {unknown} + 248..250 '{}': () + 304..305 'x': u32 + 313..340 '{ for ...; }; }': () + 315..337 'for a ...urn; }': () + 319..320 'a': {unknown} + 324..325 'b': {unknown} + 326..337 '{ return; }': () + 328..334 'return': ! + 149..175: expected u32, got () + 235..253: expected u32, got () + 313..340: expected u32, got () + 355..654 '{ ...; }; }': () + 398..399 'x': u32 + 407..433 '{ whil...; }; }': () + 409..430 'while ...eak; }': () + 415..419 'true': bool + 420..430 '{ break; }': () + 422..427 'break': ! + 537..538 'x': u32 + 546..564 '{ whil... {}; }': () + 548..561 'while true {}': () + 554..558 'true': bool + 559..561 '{}': () + 615..616 'x': u32 + 624..651 '{ whil...; }; }': () + 626..648 'while ...urn; }': () + 632..636 'true': bool + 637..648 '{ return; }': () + 639..645 'return': ! + 407..433: expected u32, got () + 546..564: expected u32, got () + 624..651: expected u32, got () "###); } -- cgit v1.2.3