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

// The diff marker detection was removed for this example, because it relied on
// the lexer having a dependency on the parser, which was horrible.

macro_rules! foo {
<<<<<<< HEAD
    () {
=======
    () { //
>>>>>>> 7a4f13c blah blah blah
    }
} //~ ERROR this file contains an unclosed delimiter
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 11:49:31 +11:00			`// The diff marker detection was removed for this example, because it relied on`
			`// the lexer having a dependency on the parser, which was horrible.`

When encountering unclosed delimiters during parsing, check for diff markers Fix #116252. 2023-10-13 22:43:48 +00:00			`macro_rules! foo {`
			`<<<<<<< HEAD`
			`() {`
			`=======`
			`() { //`
			`>>>>>>> 7a4f13c blah blah blah`
			`}`
UI tests: add missing diagnostic kinds where possible 2025-04-05 19:19:56 +03:00			`} //~ ERROR this file contains an unclosed delimiter`