Skip to content

Rollup of 11 pull requests#157113

Closed
JonathanBrouwer wants to merge 37 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-OQIpn3C
Closed

Rollup of 11 pull requests#157113
JonathanBrouwer wants to merge 37 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-OQIpn3C

Conversation

@JonathanBrouwer
Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

Create a similar rollup

oli-obk and others added 30 commits May 26, 2026 09:54
…c-macros, skipping fields based on whether or not they are used in error messages
This makes the proc-macro RPC protocol platform independent as necessary
for running proc macros and rustc on different architectures.
This shrinks the proc-macro ABI a bit. Nothing on the client side needs
to allocate handles. This will share the counters between proc-macros,
which may cause us to run out of handles earlier, but 4 bilion handles
per process is still a lot. Rust-analyzer might run out at some point,
but it can recover by restarting the proc-macro-server, and it could
already run out before this change anyway,
Some cleanups around passing extra lifetime params from the resolver to ast lowering

No functional changes, mostly removing information that was never used at any step.

Possibly interesting to @petrochenkov and @cjgillot

I originally thought this was a necessary cleanup to be able to refactor our `extra_lifetime_params_map` handling, but it turns out that I can also just do rust-lang#156508 which removes all the ugly usage of that side table and makes it possible for that side table to be put into `PerOwnerResolverData`. The changes here still were an improvement on its own, thus this PR.
…ochenkov

definitions: remove `DefPathTable`, use `LocalDefId` instead of `DefIndex`

This PR removes `DefPathTable` and uses `LocalDefId` instead of `DefIndex` where possible.

r? @petrochenkov
…, r=petrochenkov

Eagerly resolve delegations in late resolution

This is necessary for allowing the `partial_res_map` to be split by owners. The current logic follows `NodeId` -> `DefId` -> `NodeId` mappings, but the resulting `NodeId` is then not under the same owner, so we can't look it up in the current owner table. After this PR everything is just a `DefId` -> `DefId` mapping, which always works fine.

cc @aerooneqq

r? @petrochenkov
…or, r=petrochenkov

NVPTX: Remove the unstable ptx linker flavor

Remove the ptx linker flavor as specified in [this accepted MCP](rust-lang/compiler-team#990)

Fixes rust-lang#156954

@rustbot label +O-NVPTX
@rustbot rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels May 29, 2026
@JonathanBrouwer
Copy link
Copy Markdown
Contributor Author

@bors r+ rollup=never p=5

@bors treeclosed=1
Getting a lot of spurious network failures again

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 29, 2026

📌 Commit 65eff88 has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 May 29, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 29, 2026

Tree closed for PRs with priority less than 1.

@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request May 29, 2026
…uwer

Rollup of 11 pull requests

Successful merges:

 - #156960 (Some cleanups around passing extra lifetime params from the resolver to ast lowering)
 - #156963 (definitions: remove `DefPathTable`, use `LocalDefId` instead of `DefIndex`)
 - #157053 (Eagerly resolve delegations in late resolution)
 - #157068 (NVPTX: Remove the unstable ptx linker flavor)
 - #157076 (Various proc-macro related code cleanups)
 - #157106 (add ABI check logic for wasm)
 - #154835 (std::offload sharedmem)
 - #157065 (Stabilize `Path::is_empty`)
 - #157070 (Remove `skip_arg` attribute from `Diagnostic` and `Subdiagnostic` proc-macros)
 - #157088 (Improve suggestions for malformed deprecated attribute)
 - #157103 (Add reproducibly failing tests for parallel frontend)

Failed merges:

 - #157100 (Some more per owner things)
@rust-bors rust-bors Bot 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 May 29, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 29, 2026

💔 Test for 1aa8c32 failed: CI. Failed job:

@rust-bors rust-bors Bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 29, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 29, 2026

PR #157070, which is a member of this rollup, was unapproved.

@rustbot rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label May 29, 2026
@rust-log-analyzer
Copy link
Copy Markdown
Collaborator

The job dist-aarch64-linux failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)
   Compiling rustc_thread_pool v0.0.0 (/checkout/compiler/rustc_thread_pool)
warning: using `into_iter` can result in unstable query results
  --> /rustc-dev/1aa8c32ff86f5485a9f278e8c377b1493819def8/compiler/rustc_macros/src/diagnostics/message.rs:38:32
   |
38 |         for (_, (ident, _)) in field_map {
   |                                ^^^^^^^^^
   |
   = note: if you believe this case to be fine, allow this lint and add a comment explaining your rationale
   = note: `-W rustc::potential-query-instability` implied by `-W rustc::internal`
   = help: to override `-W rustc::internal` add `#[allow(rustc::potential_query_instability)]`

warning: using `keys` can result in unstable query results
  --> /rustc-dev/1aa8c32ff86f5485a9f278e8c377b1493819def8/compiler/rustc_macros/src/diagnostics/message.rs:51:32
   |
51 |                         fields.keys().map(|s| s.as_str()).collect::<Vec<&str>>().join(", ")
   |                                ^^^^
   |
   = note: if you believe this case to be fine, allow this lint and add a comment explaining your rationale

warning: using `values` can result in unstable query results
---
   2: <std::backtrace::Backtrace>::create
             at /rustc/ef0fb8a2563200e322fa4419f09f65a63742038c/library/std/src/backtrace.rs:331:13
   3: <anyhow::Error>::msg::<alloc::string::String>
             at /rust/deps/anyhow-1.0.100/src/backtrace.rs:27:14
   4: <opt_dist::exec::CmdBuilder>::run
             at /rustc/1aa8c32ff86f5485a9f278e8c377b1493819def8/src/tools/opt-dist/src/exec.rs:80:17
   5: <opt_dist::exec::Bootstrap>::run
             at /rustc/1aa8c32ff86f5485a9f278e8c377b1493819def8/src/tools/opt-dist/src/exec.rs:199:18
   6: opt_dist::execute_pipeline::{closure#1}::{closure#0}
             at /rustc/1aa8c32ff86f5485a9f278e8c377b1493819def8/src/tools/opt-dist/src/main.rs:256:21
   7: <opt_dist::timer::TimerSection>::section::<opt_dist::execute_pipeline::{closure#1}::{closure#0}, ()>
             at /rustc/1aa8c32ff86f5485a9f278e8c377b1493819def8/src/tools/opt-dist/src/timer.rs:111:22
   8: opt_dist::execute_pipeline::{closure#1}
             at /rustc/1aa8c32ff86f5485a9f278e8c377b1493819def8/src/tools/opt-dist/src/main.rs:245:15
   9: <opt_dist::timer::TimerSection>::section::<opt_dist::execute_pipeline::{closure#1}, opt_dist::training::RustcPGOProfile>
             at /rustc/1aa8c32ff86f5485a9f278e8c377b1493819def8/src/tools/opt-dist/src/timer.rs:111:22
  10: opt_dist::execute_pipeline
             at /rustc/1aa8c32ff86f5485a9f278e8c377b1493819def8/src/tools/opt-dist/src/main.rs:242:35
  11: opt_dist::main
             at /rustc/1aa8c32ff86f5485a9f278e8c377b1493819def8/src/tools/opt-dist/src/main.rs:469:18
  12: <fn() -> core::result::Result<(), anyhow::Error> as core::ops::function::FnOnce<()>>::call_once
             at /rustc/ef0fb8a2563200e322fa4419f09f65a63742038c/library/core/src/ops/function.rs:250:5
  13: std::sys::backtrace::__rust_begin_short_backtrace::<fn() -> core::result::Result<(), anyhow::Error>, core::result::Result<(), anyhow::Error>>
             at /rustc/ef0fb8a2563200e322fa4419f09f65a63742038c/library/std/src/sys/backtrace.rs:166:18
  14: std::rt::lang_start::<core::result::Result<(), anyhow::Error>>::{closure#0}
             at /rustc/ef0fb8a2563200e322fa4419f09f65a63742038c/library/std/src/rt.rs:206:18
  15: <&dyn core::ops::function::Fn<(), Output = i32> + core::panic::unwind_safe::RefUnwindSafe + core::marker::Sync as core::ops::function::FnOnce<()>>::call_once
             at /rustc/ef0fb8a2563200e322fa4419f09f65a63742038c/library/core/src/ops/function.rs:287:21
  16: std::panicking::catch_unwind::do_call::<&dyn core::ops::function::Fn<(), Output = i32> + core::panic::unwind_safe::RefUnwindSafe + core::marker::Sync, i32>
             at /rustc/ef0fb8a2563200e322fa4419f09f65a63742038c/library/std/src/panicking.rs:581:40
  17: std::panicking::catch_unwind::<i32, &dyn core::ops::function::Fn<(), Output = i32> + core::panic::unwind_safe::RefUnwindSafe + core::marker::Sync>
             at /rustc/ef0fb8a2563200e322fa4419f09f65a63742038c/library/std/src/panicking.rs:544:19
  18: std::panic::catch_unwind::<&dyn core::ops::function::Fn<(), Output = i32> + core::panic::unwind_safe::RefUnwindSafe + core::marker::Sync, i32>
             at /rustc/ef0fb8a2563200e322fa4419f09f65a63742038c/library/std/src/panic.rs:359:14
  19: std::rt::lang_start_internal::{closure#0}
             at /rustc/ef0fb8a2563200e322fa4419f09f65a63742038c/library/std/src/rt.rs:175:24
  20: std::panicking::catch_unwind::do_call::<std::rt::lang_start_internal::{closure#0}, isize>
             at /rustc/ef0fb8a2563200e322fa4419f09f65a63742038c/library/std/src/panicking.rs:581:40

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-attributes Area: Attributes (`#[…]`, `#![…]`) A-compiletest Area: The compiletest test runner A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-rustc-dev-guide Area: rustc-dev-guide A-testsuite Area: The testsuite used to check the correctness of rustc A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic rollup A PR which is a rollup T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.