Rollup of 8 pull requests by JonathanBrouwer · Pull Request #152352 · rust-lang/rust

JonathanBrouwer · 2026-02-08T15:56:20Z

Successful merges:

Fix SourceFile::normalized_byte_pos #151455 (Fix SourceFile::normalized_byte_pos)
Remove support for slugs in diagnostic messages #152250 (Remove support for slugs in diagnostic messages)
Replace some feature(core_intrinsics) with stable hints #152322 (Replace some feature(core_intrinsics) with stable hints)
Cleanup offload datatransfer #151640 (Cleanup offload datatransfer)
Port some attributes to the attr parser #152212 (Port some attributes to the attr parser)
Fix bound var resolution for trait aliases #152309 (Fix bound var resolution for trait aliases)
diagnostics: fix ICE in closure signature mismatch #152339 (diagnostics: fix ICE in closure signature mismatch)
cfg_select!: allow optional comma after { /* ... */ } #152341 (cfg_select!: allow optional comma after { /* ... */ })

This method was broken by 258ace6, which changed `self.normalized_pos` to use relative offsets however this method continued to compare against an absolute offset. Also adds a regression test for the issue that this method was originally introduced to fix.

…t_all_rtls into global ctor

Handle DefKind::TraitAlias in resolve_bound_vars so that associated item constraints and return type notation work through trait aliases.

…macro

This fixes the ICE by renaming conflicting arguments in the diagnostic.

…llot Fix `SourceFile::normalized_byte_pos` This method was broken by 258ace6, which changed `self.normalized_pos` to use relative offsets however this method continued to compare against an absolute offset. Also adds a regression test for the issue that this method was originally introduced to fix. Closes rust-lang#149568 Fixes regression of rust-lang#110885 r? cjgillot (as author of the breaking commit)

…jdonszelmann Remove support for slugs in diagnostic messages This PR contains 5 commits, and is best reviewed commit-by-commit: - rust-lang@ea87331 Removes support from slugs from `rustc_errors` - rust-lang@62dd371 Removes support from slugs from `rustc_macros` (which declares `derive(Diagnostic)`) - rust-lang@2289e6c Adjuist the `ui-fulldeps` testsuite to match the changes in `rustc_macros` - rust-lang@0db0acd Removes support for the fallback bundle (which previously contained all messages, but is now empty) from `rustc_driver_impl` and `rustc_session` - rust-lang@81d4214 Removes an integration test that tested the translation system using fluent

Replace some `feature(core_intrinsics)` with stable hints I noticed that some compiler crates use `feature(core_intrinsics)` for optimization hints, when they could potentially be using stable `std::hint` functions instead. This PR replaces the occurrences in `rustc_arena` and `rustc_data_structures`.

@jdoerfert

…thercote Cleanup offload datatransfer There are 3 steps to run code on a GPU: Copy data from the host to the device, launch the kernel, and move it back. At the moment, we have a single variable describing the memory handling to do in each step, but that makes it hard for LLVM's opt pass to understand what's going on. We therefore split it into three variables, each only including the bits relevant for the corresponding stage. cc @jdoerfert @kevinsala r? compiler

@JonathanBrouwer

…ouwer Port some attributes to the attr parser Tracking issue: rust-lang#131229 r? @JonathanBrouwer

…alias, r=fmease Fix bound var resolution for trait aliases Fixes rust-lang#152158 Fixes rust-lang#152244

…rgau diagnostics: fix ICE in closure signature mismatch Fixes rust-lang#152331 Fixes an ICE where `AdjustSignatureBorrow` caused a panic because it attempted to set the `len` argument which was already defined by the parent diagnostic. Both variants used `len` as argument name, but can both be present in a diagnostic. They now use different names for the argument.

…ma, r=JonathanBrouwer `cfg_select!`: allow optional comma after `{ /* ... */ }`

JonathanBrouwer · 2026-02-08T15:56:26Z

@bors r+ rollup=never p=5

rust-bors · 2026-02-08T15:56:29Z

📌 Commit 80898ff has been approved by JonathanBrouwer

It is now in the queue for this repository.

…uwer Rollup of 8 pull requests Successful merges: - #151455 (Fix `SourceFile::normalized_byte_pos`) - #152250 (Remove support for slugs in diagnostic messages) - #152322 (Replace some `feature(core_intrinsics)` with stable hints) - #151640 (Cleanup offload datatransfer) - #152212 (Port some attributes to the attr parser) - #152309 (Fix bound var resolution for trait aliases) - #152339 (diagnostics: fix ICE in closure signature mismatch) - #152341 (`cfg_select!`: allow optional comma after `{ /* ... */ }`)

rust-log-analyzer · 2026-02-08T18:11:40Z

The job x86_64-gnu-aux failed! Check out the build log: (web) (plain enhanced) (plain)

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

REPOSITORY                                   TAG       IMAGE ID       CREATED      SIZE
ghcr.io/dependabot/dependabot-updater-core   latest    b72a662c47e3   8 days ago   790MB
=> Removing docker images...
Deleted Images:
untagged: ghcr.io/dependabot/dependabot-updater-core:latest
untagged: ghcr.io/dependabot/dependabot-updater-core@sha256:57ef9cc45f72cc4258ee1baa8243bc3cd55c0a0e570b6768c37346247be35f0d
deleted: sha256:b72a662c47e31df2e7bf59368b2b83be239f02a1baa721393717711a1a719df9
deleted: sha256:3e13ccd80f19769f39008cfc6549938e1ea4905f47b028c1df2dd6085191386c
deleted: sha256:842807995a512b2c5a9b241a3aecdbe79af6b0642d96fa5460cfcf0c9d8be295
deleted: sha256:0f9074b9f46f4570eb7cb4b65fcb3c3d909f9b1d14ca66b30508117b6deda303
deleted: sha256:2ca99cb9251d19157c56b5d91c8961bb4b35196a5ca9b4ffdccbf24abbfe2a5f
---
Initialized empty Git repository in /checkout/obj/build/ct/diesel/.git/
fatal: Could not parse object '3db7c17c5b069656ed22750e84d6498c8ab5b81d'.
From https://github.com/diesel-rs/diesel
 * branch            3db7c17c5b069656ed22750e84d6498c8ab5b81d -> FETCH_HEAD
HEAD is now at 3db7c17 Merge pull request #4917 from LucaCappelletti94/allow_tables_to_appear_in_same_query-modules
    Updating crates.io index
     Locking 261 packages to latest compatible versions
      Adding cargo_metadata v0.19.2 (available: v0.23.1)
      Adding darling v0.21.3 (available: v0.23.0)
      Adding generic-array v0.14.7 (available: v0.14.9)
      Adding getrandom v0.2.17 (available: v0.4.1)
      Adding getrandom v0.3.4 (available: v0.4.1)
      Adding libsqlite3-sys v0.35.0 (available: v0.36.0)
      Adding rand v0.9.2 (available: v0.10.0)
      Adding sqlite-wasm-vfs v0.1.1 (available: v0.2.0)
      Adding sqlparser v0.59.0 (available: v0.60.0)
---
test query_builder::sql_query::tests::check_boxed_sql_query_is_send ... ok
test sqlite::connection::tests::correctly_handle_empty_query ... ok
test sqlite::connection::stmt::tests::check_out_of_bounds_bind_does_not_panic_on_drop ... ok
test sqlite::connection::sqlite_value::tests::can_convert_all_values ... ok
test sqlite::connection::row::tests::fun_with_row_iters ... ok
test sqlite::connection::tests::register_aggregate_function ... ok
test sqlite::connection::tests::register_aggregate_function_returns_finalize_default_on_empty_set ... ok
test sqlite::connection::tests::register_custom_function ... ok
test sqlite::connection::tests::database_serializes_and_deserializes_successfully ... ok
test sqlite::connection::tests::register_aggregate_multiarg_function ... ok
---
test diesel/src/expression_methods/global_expression_methods.rs - expression_methods::global_expression_methods::ExpressionMethods::not_between (line 422) ... ok
test diesel/src/expression_methods/global_expression_methods.rs - expression_methods::global_expression_methods::ExpressionMethods::ne_all (line 169) ... ok
test diesel/src/expression_methods/global_expression_methods.rs - expression_methods::global_expression_methods::NullableExpressionMethods::assume_not_null (line 644) ... ok
test diesel/src/expression_methods/global_expression_methods.rs - expression_methods::global_expression_methods::NullableExpressionMethods::nullable (line 599) - compile ... ok
test diesel/src/expression_methods/global_expression_methods.rs - expression_methods::global_expression_methods::NullableExpressionMethods::assume_not_null (line 671) ... ok
test diesel/src/expression_methods/global_expression_methods.rs - expression_methods::global_expression_methods::NullableExpressionMethods::assume_not_null (line 706) ... ok
test diesel/src/expression_methods/json_expression_methods.rs - expression_methods::json_expression_methods::AnyJsonExpressionMethods::retrieve_as_text (line 18) ... ok
test diesel/src/expression_methods/text_expression_methods.rs - expression_methods::text_expression_methods::TextExpressionMethods::like (line 74) ... ok
test diesel/src/expression_methods/text_expression_methods.rs - expression_methods::text_expression_methods::TextExpressionMethods::concat (line 14) ... ok
test diesel/src/expression_methods/text_expression_methods.rs - expression_methods::text_expression_methods::TextExpressionMethods::not_like (line 110) ... ok
test diesel/src/insertable.rs - insertable::Insertable::insert_into (line 41) ... ok
test diesel/src/lib.rs - helper_types::InnerJoinQuerySource (line 571) ... ok
---
test diesel/src/query_builder/functions.rs - query_builder::functions::update (line 25) ... ok
test diesel/src/query_builder/functions.rs - query_builder::functions::replace_into (line 497) ... ok
test diesel/src/query_builder/functions.rs - query_builder::functions::sql_query (line 551) ... ok
test diesel/src/query_builder/functions.rs - query_builder::functions::update (line 49) ... ok
test diesel/src/query_builder/has_query.rs - query_builder::has_query::HasQuery (line 56) ... ok
test diesel/src/query_builder/has_query.rs - query_builder::has_query::HasQuery (line 27) ... ok
test diesel/src/query_builder/insert_statement/mod.rs - query_builder::insert_statement::InsertStatement<T,U,Op>::returning (line 282) ... ok
test diesel/src/query_builder/insert_statement/mod.rs - query_builder::insert_statement::IncompleteInsertStatement<T,Op>::default_values (line 68) ... ok
test diesel/src/query_builder/mod.rs - query_builder::debug_query (line 394) ... ok
test diesel/src/query_builder/sql_query.rs - query_builder::sql_query::SqlQuery<Inner>::bind (line 47) ... ok
test diesel/src/query_builder/sql_query.rs - query_builder::sql_query::SqlQuery<Inner>::into_boxed (line 91) ... ok
---
test diesel/src/sqlite/connection/mod.rs - sqlite::connection::SqliteConnection (line 96) - compile fail ... ok
test diesel/src/sqlite/connection/mod.rs - sqlite::connection::SqliteConnection::exclusive_transaction (line 354) ... ok
test diesel/src/sqlite/connection/mod.rs - sqlite::connection::SqliteConnection::immediate_transaction (line 325) ... ok
test diesel/src/sqlite/connection/mod.rs - sqlite::connection::SqliteConnection::register_collation (line 500) ... ok
test diesel/src/sqlite/expression/expression_methods.rs - sqlite::expression::expression_methods::SqliteAnyJsonExpressionMethods::retrieve_as_object_sqlite (line 107) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::json (line 24) ... ok
test diesel/src/sqlite/expression/expression_methods.rs - sqlite::expression::expression_methods::SqliteExpressionMethods::is (line 27) ... ok
test diesel/src/sqlite/expression/expression_methods.rs - sqlite::expression::expression_methods::SqliteExpressionMethods::is_not (line 62) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::json_array_0 (line 1385) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::json_array_1 (line 1385) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::json_array_2 (line 1385) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::json_array_length (line 109) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::json_array_length_with_path (line 176) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::json_error_position (line 253) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::json_group_array (line 967) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::json_group_array (line 931) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::json_group_object (line 1203) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::json_group_object (line 1230) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::json_object_1 (line 1094) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::json_object_0 (line 1094) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::json_object_2 (line 1094) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::json_pretty (line 342) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::json_patch (line 1627) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::json_pretty_with_indentation (line 472) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::json_quote (line 872) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::json_remove_0 (line 1489) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::json_remove_1 (line 1489) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::json_remove_2 (line 1489) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::json_type (line 755) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::json_type_with_path (line 802) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::json_valid (line 633) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::json_valid_with_flags (line 693) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::jsonb (line 65) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::jsonb_array_0 (line 1437) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::jsonb_array_2 (line 1437) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::jsonb_array_1 (line 1437) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::jsonb_group_array (line 1010) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::jsonb_group_object (line 1323) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::jsonb_object_0 (line 1146) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::jsonb_group_array (line 1047) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::jsonb_group_object (line 1296) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::jsonb_object_1 (line 1146) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::jsonb_object_2 (line 1146) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::jsonb_patch (line 1707) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::jsonb_remove_0 (line 1563) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::jsonb_remove_1 (line 1563) ... ok
test diesel/src/sqlite/expression/functions.rs - sqlite::expression::functions::jsonb_remove_2 (line 1563) ... ok
test diesel/src/upsert/on_conflict_extension.rs - upsert::on_conflict_extension::IncompleteOnConflict<Stmt,Target>::do_update (line 431) ... ok
test diesel/src/upsert/on_conflict_extension.rs - upsert::on_conflict_extension::IncompleteOnConflict<Stmt,Target>::do_update (line 383) ... ok
test diesel/src/upsert/on_conflict_extension.rs - upsert::on_conflict_extension::IncompleteOnConflict<Stmt,Target>::do_update (line 517) ... ok
test diesel/src/upsert/on_conflict_extension.rs - upsert::on_conflict_extension::IncompleteOnConflict<Stmt,Target>::do_update (line 557) ... ok
test diesel/src/upsert/on_conflict_extension.rs - upsert::on_conflict_extension::IncompleteOnConflict<Stmt,Target>::do_update (line 475) ... ok
---
    SUCCESS for generator 'f64 subnormal'. 4194305/4194305 passed in 87.266187662s
30/30 tests succeeded in 114.014385444s (30 passed, 0 failed, 0 stopped)
[TIMING:end] test::TestFloatParse { build_compiler: Compiler { stage: 2, host: x86_64-unknown-linux-gnu, forced_compiler: false }, target: x86_64-unknown-linux-gnu } -- 147.015
Build completed successfully in 1:00:18
# The build-std suite is off by default because it is uncommonly slow
# and memory-hungry.
##[group]Building bootstrap
    Finished `dev` profile [unoptimized] target(s) in 0.13s
##[endgroup]
warning: failed to connect to jobserver from environment variable `MAKEFLAGS=" -j4 --jobserver-auth=3,4"`: cannot open file descriptor 3 from the jobserver environment variable value: Bad file descriptor (os error 9)
  |
---
failures:

---- oneshot::send_before_recv_timeout stdout ----

thread 'oneshot::send_before_recv_timeout' (275121) panicked at library/std/tests/sync/oneshot.rs:100:5:
assertion failed: start.elapsed() < timeout
stack backtrace:
   0: std::panicking::panic_handler
             at /checkout/library/std/src/panicking.rs:689:5
   1: core::panicking::panic_fmt
             at /checkout/library/core/src/panicking.rs:80:14
   2: core::panicking::panic
             at /checkout/library/core/src/panicking.rs:150:5
   3: oneshot::send_before_recv_timeout
             at library/std/tests/sync/oneshot.rs:100:5
   4: oneshot::send_before_recv_timeout::{closure#0}
             at library/std/tests/sync/oneshot.rs:87:30
   5: <{closure@library/std/tests/sync/oneshot.rs:87:1: 101:2} as std::ops::FnOnce<()>>::call_once - shim
             at /checkout/library/core/src/ops/function.rs:250:5
   6: <fn() -> std::result::Result<(), std::string::String> as std::ops::FnOnce<()>>::call_once - shim(fn() -> std::result::Result<(), std::string::String>)
             at /checkout/library/core/src/ops/function.rs:250:5
note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.
---- oneshot::send_before_recv_timeout stdout end ----
---

error: test failed, to rerun pass `-p std --test sync`
Bootstrap failed while executing `miri --stage 2 library/std -- --skip fs:: --skip net:: --skip process:: --skip sys::`
Build completed unsuccessfully in 0:14:49
make: *** [Makefile:61: check-aux] Error 1
  local time: Sun Feb  8 18:11:22 UTC 2026
  network time: Sun, 08 Feb 2026 18:11:22 GMT
##[error]Process completed with exit code 2.
##[group]Run echo "disk usage:"
echo "disk usage:"

rust-bors · 2026-02-08T18:11:56Z

💔 Test for 28fa721 failed: CI. Failed job:

auto - x86_64-gnu-aux (web logs, enhanced plaintext logs)

eggyal and others added 23 commits January 21, 2026 18:40

Fix @needs-backends compiletest directive

7e39015

Split ol mapper into more specific to/kernel/from mapper and move ini…

6de0591

…t_all_rtls into global ctor

Fix bound var resolution for trait aliases

7c5ea7f

Handle DefKind::TraitAlias in resolve_bound_vars so that associated item constraints and return type notation work through trait aliases.

Replace some feature(core_intrinsics) with stable hints

118372e

Remove DiagMessage::FluentIdentifier

ea87331

Remove slugs from the #[derive(Diagnostic)] macro

62dd371

Adjust expected uitests results for the updated derive(Diagnostic) …

2289e6c

…macro

Remove the fallback bundle

0db0acd

Remove fluent tests in rustc_error

81d4214

Parse #[rustc_delayed_bug_from_inside_query]

842bed6

Parse #[rustc_evaluate_where_clauses]

7668496

Parse #[rustc_outlives]

6361d5f

diagnostics: fix ICE in closure signature mismatch

fb55b5d

This fixes the ICE by renaming conflicting arguments in the diagnostic.

cfg_select!: allow optional comma after { /* ... */ }

053f76e

Rollup merge of rust-lang#152212 - Ozzy1423:three-attrs, r=JonathanBr…

5f8f66e

…ouwer Port some attributes to the attr parser Tracking issue: rust-lang#131229 r? @JonathanBrouwer

Rollup merge of rust-lang#152309 - rynewang:fix/ice-152158-rtn-trait-…

f602fc8

…alias, r=fmease Fix bound var resolution for trait aliases Fixes rust-lang#152158 Fixes rust-lang#152244

Rollup merge of rust-lang#152341 - folkertdev:cfg-select-optional-com…

80898ff

…ma, r=JonathanBrouwer `cfg_select!`: allow optional comma after `{ /* ... */ }`

rust-bors bot added the rollup A PR which is a rollup label Feb 8, 2026

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 Feb 8, 2026

This comment has been minimized.

Sign in to view

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 Feb 8, 2026

JonathanBrouwer closed this Feb 8, 2026

rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 8, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 8 pull requests#152352

Rollup of 8 pull requests#152352
JonathanBrouwer wants to merge 23 commits intorust-lang:mainfrom
JonathanBrouwer:rollup-dkxUlQ1

JonathanBrouwer commented Feb 8, 2026

Uh oh!

JonathanBrouwer commented Feb 8, 2026

Uh oh!

rust-bors bot commented Feb 8, 2026

Uh oh!

This comment has been minimized.

rust-log-analyzer commented Feb 8, 2026

Uh oh!

rust-bors bot commented Feb 8, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

Uh oh!

Conversation

JonathanBrouwer commented Feb 8, 2026

Uh oh!

JonathanBrouwer commented Feb 8, 2026

Uh oh!

rust-bors bot commented Feb 8, 2026

Uh oh!

This comment has been minimized.

rust-log-analyzer commented Feb 8, 2026

Uh oh!

rust-bors bot commented Feb 8, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants