rust/tests/ui/parser/diff-markers/unclosed-delims-in-macro.stderr

error: this file contains an unclosed delimiter
  --> $DIR/unclosed-delims-in-macro.rs:11:48
   |
LL | macro_rules! foo {
   |                  - unclosed delimiter
LL | <<<<<<< HEAD
LL |     () {
   |        - this delimiter might not be properly closed...
...
LL | }
   | -                                             ^
   | |
   | ...as it matches this but it has different indentation

error: aborting due to 1 previous error
Remove `Lexer`'s dependency on `Parser`. Lexing precedes parsing, as you'd expect: `Lexer` creates a `TokenStream` and `Parser` then parses that `TokenStream`. But, in a horrendous violation of layering abstractions and common sense, `Lexer` depends on `Parser`! The `Lexer::unclosed_delim_err` method does some error recovery that relies on creating a `Parser` to do some post-processing of the `TokenStream` that the `Lexer` just created. This commit just removes `unclosed_delim_err`. This change removes `Lexer`'s dependency on `Parser`, and also means that `lex_token_tree`'s return value can have a more typical form. The cost is slightly worse error messages in two obscure cases, as shown in these tests: - tests/ui/parser/brace-in-let-chain.rs: there is slightly less explanation in this case involving an extra `{`. - tests/ui/parser/diff-markers/unclosed-delims{,-in-macro}.rs: the diff marker detection is no longer supported (because that detection is implemented in the parser). In my opinion this cost is outweighed by the magnitude of the code cleanup. 2024-12-12 00:49:31 +00:00			`error: this file contains an unclosed delimiter`
			`--> $DIR/unclosed-delims-in-macro.rs:11:48`
When encountering unclosed delimiters during parsing, check for diff markers Fix #116252. 2023-10-13 22:43:48 +00:00			`\|`
Remove `Lexer`'s dependency on `Parser`. Lexing precedes parsing, as you'd expect: `Lexer` creates a `TokenStream` and `Parser` then parses that `TokenStream`. But, in a horrendous violation of layering abstractions and common sense, `Lexer` depends on `Parser`! The `Lexer::unclosed_delim_err` method does some error recovery that relies on creating a `Parser` to do some post-processing of the `TokenStream` that the `Lexer` just created. This commit just removes `unclosed_delim_err`. This change removes `Lexer`'s dependency on `Parser`, and also means that `lex_token_tree`'s return value can have a more typical form. The cost is slightly worse error messages in two obscure cases, as shown in these tests: - tests/ui/parser/brace-in-let-chain.rs: there is slightly less explanation in this case involving an extra `{`. - tests/ui/parser/diff-markers/unclosed-delims{,-in-macro}.rs: the diff marker detection is no longer supported (because that detection is implemented in the parser). In my opinion this cost is outweighed by the magnitude of the code cleanup. 2024-12-12 00:49:31 +00:00			`LL \| macro_rules! foo {`
			`\| - unclosed delimiter`
When encountering unclosed delimiters during parsing, check for diff markers Fix #116252. 2023-10-13 22:43:48 +00:00			`LL \| <<<<<<< HEAD`
Remove `Lexer`'s dependency on `Parser`. Lexing precedes parsing, as you'd expect: `Lexer` creates a `TokenStream` and `Parser` then parses that `TokenStream`. But, in a horrendous violation of layering abstractions and common sense, `Lexer` depends on `Parser`! The `Lexer::unclosed_delim_err` method does some error recovery that relies on creating a `Parser` to do some post-processing of the `TokenStream` that the `Lexer` just created. This commit just removes `unclosed_delim_err`. This change removes `Lexer`'s dependency on `Parser`, and also means that `lex_token_tree`'s return value can have a more typical form. The cost is slightly worse error messages in two obscure cases, as shown in these tests: - tests/ui/parser/brace-in-let-chain.rs: there is slightly less explanation in this case involving an extra `{`. - tests/ui/parser/diff-markers/unclosed-delims{,-in-macro}.rs: the diff marker detection is no longer supported (because that detection is implemented in the parser). In my opinion this cost is outweighed by the magnitude of the code cleanup. 2024-12-12 00:49:31 +00:00			`LL \| () {`
			`\| - this delimiter might not be properly closed...`
When encountering unclosed delimiters during parsing, check for diff markers Fix #116252. 2023-10-13 22:43:48 +00:00			`...`
Remove `Lexer`'s dependency on `Parser`. Lexing precedes parsing, as you'd expect: `Lexer` creates a `TokenStream` and `Parser` then parses that `TokenStream`. But, in a horrendous violation of layering abstractions and common sense, `Lexer` depends on `Parser`! The `Lexer::unclosed_delim_err` method does some error recovery that relies on creating a `Parser` to do some post-processing of the `TokenStream` that the `Lexer` just created. This commit just removes `unclosed_delim_err`. This change removes `Lexer`'s dependency on `Parser`, and also means that `lex_token_tree`'s return value can have a more typical form. The cost is slightly worse error messages in two obscure cases, as shown in these tests: - tests/ui/parser/brace-in-let-chain.rs: there is slightly less explanation in this case involving an extra `{`. - tests/ui/parser/diff-markers/unclosed-delims{,-in-macro}.rs: the diff marker detection is no longer supported (because that detection is implemented in the parser). In my opinion this cost is outweighed by the magnitude of the code cleanup. 2024-12-12 00:49:31 +00:00			`LL \| }`
			`\| - ^`
			`\| \|`
			`\| ...as it matches this but it has different indentation`
When encountering unclosed delimiters during parsing, check for diff markers Fix #116252. 2023-10-13 22:43:48 +00:00
Show number in error message even for one error Co-authored-by: Adrian <adrian.iosdev@gmail.com> 2023-11-21 15:44:16 +00:00			`error: aborting due to 1 previous error`
When encountering unclosed delimiters during parsing, check for diff markers Fix #116252. 2023-10-13 22:43:48 +00:00