Allow for missing invisible close delim when reparsing an expression.

[nnethercote]

This can happen when invalid syntax is passed to a declarative macro. We shouldn't be too strict about the token stream position once the parser has rejected the invalid syntax.

Fixes #139248.

r? @petrochenkov

---

try-job: test-various

[petrochenkov]

@bors r+ rollup

[bors]

📌 Commit a2a081a has been approved by petrochenkov

It is now in the queue for this repository.

[nnethercote]

#137874 is similar to #139248, there might be a common fix slightly different to what I've done here.

@bors r-

[nnethercote]

#137874 is similar to #139248, there might be a common fix slightly different to what I've done here.

No, it needs a separate fix.

@bors r=petrochenkov

[bors]

📌 Commit a2a081a has been approved by petrochenkov

It is now in the queue for this repository.

[Zalathar]

Possibly failed in rollup: #139344 (comment)

@bors r-

[Zalathar]

@bors try

[bors]

⌛ Trying commit a2a081a with merge 46cc200...

[bors]

💔 Test failed - checks-actions

[nnethercote]

I don't understand what's going wrong. The test passes locally and the diff on CI is strange:

41    |
42 LL | thread_local! { static a : () = (if b) }
43    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected expression
-   --> $SRC_DIR/std/src/sys/thread_local/native/mod.rs:LL:COL
45    |
46    = note: while parsing argument for this `expr` macro fragment
47    |

[Zalathar]

Oh, I wonder if this is wasm causing problems because the path of the source file defining the macro is different.

In the raw stderr, the path on line 44 is:

    --> /rustc/FAKE_PREFIX/library/std/src/sys/thread_local/statik.rs:28:18

[nnethercote]

How is wasm involved?

I could rewrite the test to use a local macro instead of thread_local!, that might help.

[nnethercote]

@bors try

[bors]

⌛ Trying commit ad9d8f9 with merge 281c69c...

[nnethercote]

@bors try

[bors]

⌛ Trying commit 296b484 with merge 9840dcf...

[rust-log-analyzer]

The job test-various failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

file:.git/config remote.origin.url=https://github.com/rust-lang-ci/rust
file:.git/config remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
file:.git/config gc.auto=0
file:.git/config http.https://github.com/.extraheader=AUTHORIZATION: basic ***
file:.git/config branch.try.remote=origin
file:.git/config branch.try.merge=refs/heads/try
file:.git/config remote.upstream.url=https://github.com/rust-lang/rust
file:.git/config remote.upstream.fetch=+refs/heads/*:refs/remotes/upstream/*
file:.git/config submodule.library/backtrace.active=true
file:.git/config submodule.library/backtrace.url=https://github.com/rust-lang/backtrace-rs.git
file:.git/config submodule.library/stdarch.active=true
---
Saved the actual stderr to "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/macros/no-close-delim-issue-139248/no-close-delim-issue-139248.stderr"
diff of stderr:

41    |
42 LL | thread_local! { static a : () = (if b) }
43    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected expression
-   --> $SRC_DIR/std/src/sys/thread_local/native/mod.rs:LL:COL
45    |
46    = note: while parsing argument for this `expr` macro fragment
47    |
---
To only update this specific test, also pass `--test-args macros/no-close-delim-issue-139248.rs`

error: 1 errors occurred comparing output.
status: exit status: 1
command: env -u RUSTC_LOG_COLOR RUSTC_ICE="0" RUST_BACKTRACE="short" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/tests/ui/macros/no-close-delim-issue-139248.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Z" "ignore-directory-in-diagnostics-source-blocks=/cargo" "-Z" "ignore-directory-in-diagnostics-source-blocks=/checkout/vendor" "--sysroot" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2" "--target=wasm32-wasip1" "--check-cfg" "cfg(test,FALSE)" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zwrite-long-types-to-disk=no" "-Cstrip=debuginfo" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/macros/no-close-delim-issue-139248" "-A" "unused" "-A" "internal_features" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/wasm32-wasip1/native/rust-test-helpers"
stdout: none
--- stderr -------------------------------
error: expected `{`, found `)`
##[error]  --> /checkout/tests/ui/macros/no-close-delim-issue-139248.rs:9:38
   |
LL | thread_local! { static a : () = (if b) }
   |                                      ^ expected `{`
   |
note: the `if` expression is missing a block after this condition
  --> /checkout/tests/ui/macros/no-close-delim-issue-139248.rs:9:37
   |
LL | thread_local! { static a : () = (if b) }
   |                                     ^

error: expected `{`, found `)`
##[error]  --> /checkout/tests/ui/macros/no-close-delim-issue-139248.rs:9:38
   |
LL | thread_local! { static a : () = (if b) }
   |                                      ^ expected `{`
   |
note: the `if` expression is missing a block after this condition
  --> /checkout/tests/ui/macros/no-close-delim-issue-139248.rs:9:37
   |
LL | thread_local! { static a : () = (if b) }
   |                                     ^
   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`

error: expected `{`, found `)`
##[error]  --> /checkout/tests/ui/macros/no-close-delim-issue-139248.rs:9:38
   |
LL | thread_local! { static a : () = (if b) }
   |                                      ^ expected `{`
   |
note: the `if` expression is missing a block after this condition
  --> /checkout/tests/ui/macros/no-close-delim-issue-139248.rs:9:37
   |
LL | thread_local! { static a : () = (if b) }
   |                                     ^
   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`

error: expected expression, found end of macro arguments
##[error]  --> /checkout/tests/ui/macros/no-close-delim-issue-139248.rs:9:1
   |
LL | thread_local! { static a : () = (if b) }
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected expression
  --> /rustc/FAKE_PREFIX/library/std/src/sys/thread_local/no_threads.rs:28:18
   |
   = note: while parsing argument for this `expr` macro fragment
   |

[nnethercote]

@bors try

[bors]

⌛ Trying commit fbdf9f8 with merge 732ba88caf76736237d422d1580a6865c071b6ff...

[bors]

☀️ Try build successful - checks-actions
Build commit: 732ba88 (732ba88caf76736237d422d1580a6865c071b6ff)

[nnethercote]

I could rewrite the test to use a local macro instead of thread_local!, that might help.

That worked. I still don't understand what went wrong with the thread_local! version.

@bors r=petrochenkov

[bors]

📌 Commit fbdf9f8 has been approved by petrochenkov

It is now in the queue for this repository.