Rollup of 7 pull requests #117400

matthiaskrgr · 2023-10-30T14:48:55Z

Successful merges:

share some track_caller logic between interpret and codegen #117317 (share some track_caller logic between interpret and codegen)
Rename a few remaining references to abort terminator #117357 (Rename a few remaining references to abort terminator)
improve and fix x install #117383 (improve and fix x install)
Some diagnostics improvements of gen blocks #117389 (Some diagnostics improvements of gen blocks)
Fix unused variables lint issue for args in macro #117390 (Fix unused variables lint issue for args in macro)
Fix missing leading space in suggestion #117395 (Fix missing leading space in suggestion)
Don't treat closures/coroutine types as part of the public API #117396 (Don't treat closures/coroutine types as part of the public API)

r? @ghost
@rustbot modify labels: rollup

…share some code

Follow up to e3f2edc

Fix: Write access check of `prefix` and `sysconfdir` when DESTDIR is present. Improvement: Instead of repeatedly reading `DESTDIR` within each `fn prepare_dir` usage, read it once and pass it to the `fn prepare_dir`. Signed-off-by: onur-ozkan <[email protected]>

For a local pattern with no space between `let` and `(` e.g.: let(_a) = 3; we were previously suggesting this illegal code: let_a =3; After this change the suggestion will instead be: let _a =3; (Note the space after `let`)

share some track_caller logic between interpret and codegen Also move the code that implements the track_caller intrinsics out of the core interpreter engine -- it's just a helper creating a const-allocation, doesn't need to be part of the interpreter core.

Rename a few remaining references to abort terminator Follow up to e3f2edc

…larsan68 improve and fix `x install` Fix: Write access check of `prefix` and `sysconfdir` when DESTDIR is present. Improvement: Instead of repeatedly reading `DESTDIR` within each `fn prepare_dir` usage, read it once and pass it to the `fn prepare_dir`. Fixes rust-lang#117203

Some diagnostics improvements of `gen` blocks These are leftovers from rust-lang#116447

…d-macro, r=estebank Fix unused variables lint issue for args in macro Fixes rust-lang#117284 r? `@estebank`

…Nilstrieb Fix missing leading space in suggestion For a local pattern with no space between `let` and `(` e.g.: ```rust let(_a) = 3; ``` we were previously suggesting this illegal code: ```rust let_a = 3; ``` After this change the suggestion will instead be: ```rust let _a = 3; ``` Fixes rust-lang#117380

…ompiler-errors Don't treat closures/coroutine types as part of the public API Fixes a regression from rust-lang#117076 r? `@compiler-errors`

matthiaskrgr · 2023-10-30T14:49:09Z

@bors r+ rollup=never p=7

bors · 2023-10-30T14:49:11Z

📌 Commit 3f4edea has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-10-30T15:16:15Z

⌛ Testing commit 3f4edea with merge 8bd0f22...

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#117317 (share some track_caller logic between interpret and codegen) - rust-lang#117357 (Rename a few remaining references to abort terminator) - rust-lang#117383 (improve and fix `x install`) - rust-lang#117389 (Some diagnostics improvements of `gen` blocks) - rust-lang#117390 (Fix unused variables lint issue for args in macro) - rust-lang#117395 (Fix missing leading space in suggestion) - rust-lang#117396 (Don't treat closures/coroutine types as part of the public API) r? `@ghost` `@rustbot` modify labels: rollup

rust-log-analyzer · 2023-10-30T15:36:44Z

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)

---- [ui] tests/ui/coroutine/gen_block_panic.rs stdout ----

error: test run failed!
status: exit status: 101
command: cd "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/coroutine/gen_block_panic" && RUST_TEST_THREADS="8" "/node-v18.12.0-linux-x64/bin/node" "/checkout/src/etc/wasm32-shim.js" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/coroutine/gen_block_panic/a.wasm"
--- stderr -------------------------------
RuntimeError: unreachable
RuntimeError: unreachable
    at __rust_start_panic (wasm://wasm/0001a09a:wasm-function[49]:0x329a)
    at rust_panic (wasm://wasm/0001a09a:wasm-function[47]:0x3268)
    at _ZN3std9panicking20rust_panic_with_hook17h6443c1ec7c3e90daE (wasm://wasm/0001a09a:wasm-function[46]:0x325a)
    at _ZN3std9panicking19begin_panic_handler28_$u7b$$u7b$closure$u7d$$u7d$17he79bec1d8dac721dE (wasm://wasm/0001a09a:wasm-function[36]:0x2ab4)
    at _ZN3std10sys_common9backtrace26__rust_end_short_backtrace17h6548160920a0aa24E (wasm://wasm/0001a09a:wasm-function[35]:0x2a1a)
    at rust_begin_unwind (wasm://wasm/0001a09a:wasm-function[41]:0x2ef4)
    at _ZN4core9panicking9panic_fmt17h211f4f538284a6e5E (wasm://wasm/0001a09a:wasm-function[61]:0x3938)
    at _ZN15gen_block_panic4main17h487d60b56fd50e89E (wasm://wasm/0001a09a:wasm-function[5]:0x1f4)
    at _ZN3std10sys_common9backtrace28__rust_begin_short_backtrace17h1879bf9d5eb09394E (wasm://wasm/0001a09a:wasm-function[0]:0x13f)
    at _ZN3std2rt10lang_start28_$u7b$$u7b$closure$u7d$$u7d$17h2f005318e2fcf935E (wasm://wasm/0001a09a:wasm-function[2]:0x191)
    at _ZN3std2rt19lang_start_internal17h56723d5513298b48E (wasm://wasm/0001a09a:wasm-function[32]:0x2876)
    at _ZN3std2rt10lang_start17h192e97c8c981651fE (wasm://wasm/0001a09a:wasm-function[1]:0x174)
    at main (wasm://wasm/0001a09a:wasm-function[6]:0x20a)
    at Object.<anonymous> (/checkout/src/etc/wasm32-shim.js:20:20)
    at Module._compile (node:internal/modules/cjs/loader:1159:14)
    at Module._extensions..js (node:internal/modules/cjs/loader:1213:10)
    at Module.load (node:internal/modules/cjs/loader:1037:32)
    at Module._load (node:internal/modules/cjs/loader:878:12)
    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:81:12)
    at node:internal/main/run_main_module:23:47



failures:

bors · 2023-10-30T15:37:17Z

💔 Test failed - checks-actions

RalfJung and others added 19 commits October 28, 2023 15:40

interpret: call caller_location logic the same way codegen does, and …

351d532

…share some code

share the track_caller handling within a mir::Body

04fa124

Rename a few remaining references to abort terminator

552abdc

Follow up to e3f2edc

Talk about gen fn in diagnostics about gen fn

745c600

Add a custom panic message for resuming gen blocks after they panicked

bc926f7

Fix missing leading space in suggestion

a2486db

For a local pattern with no space between `let` and `(` e.g.: let(_a) = 3; we were previously suggesting this illegal code: let_a =3; After this change the suggestion will instead be: let _a =3; (Note the space after `let`)

Fix rust-lang#117284, Fix unused variables lint issue for args in macro

82f34fd

Add regression test

972ee01

Don't treat closures/coroutines as part of the public API

8d03e13

Merge two equal match arms

251021c

Some manual rustfmt as rustfmt is broken on this file

43ff2a7

Rollup merge of rust-lang#117357 - tmiasko:terminate, r=wesleywiser

dfe0a6a

Rename a few remaining references to abort terminator Follow up to e3f2edc

Rollup merge of rust-lang#117389 - oli-obk:gen_fn, r=compiler-errors

399aae3

Some diagnostics improvements of `gen` blocks These are leftovers from rust-lang#116447

Rollup merge of rust-lang#117390 - chenyukang:yukang-fix-117284-unuse…

da5475b

…d-macro, r=estebank Fix unused variables lint issue for args in macro Fixes rust-lang#117284 r? `@estebank`

Rollup merge of rust-lang#117396 - oli-obk:privacy_visitor_types, r=c…

3f4edea

…ompiler-errors Don't treat closures/coroutine types as part of the public API Fixes a regression from rust-lang#117076 r? `@compiler-errors`

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 30, 2023

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 30, 2023

matthiaskrgr mentioned this pull request Oct 30, 2023

Don't treat closures/coroutine types as part of the public API #117396

Merged

matthiaskrgr closed this Oct 30, 2023

matthiaskrgr deleted the rollup-egvtgh4 branch March 16, 2024 18:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 7 pull requests #117400

Rollup of 7 pull requests #117400

Uh oh!

matthiaskrgr commented Oct 30, 2023

Uh oh!

matthiaskrgr commented Oct 30, 2023

Uh oh!

bors commented Oct 30, 2023

Uh oh!

bors commented Oct 30, 2023

Uh oh!

rust-log-analyzer commented Oct 30, 2023

Uh oh!

bors commented Oct 30, 2023

Uh oh!

Uh oh!

Rollup of 7 pull requests #117400

Rollup of 7 pull requests #117400

Uh oh!

Conversation

matthiaskrgr commented Oct 30, 2023

Uh oh!

matthiaskrgr commented Oct 30, 2023

Uh oh!

bors commented Oct 30, 2023

Uh oh!

bors commented Oct 30, 2023

Uh oh!

rust-log-analyzer commented Oct 30, 2023

Uh oh!

bors commented Oct 30, 2023

Uh oh!

Uh oh!