Skip to content

Conversation

@matthiaskrgr
Copy link
Member

@matthiaskrgr matthiaskrgr commented Dec 3, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

lcnr and others added 30 commits December 1, 2025 13:00
This slightly changes alphabetical lint semantics...
specifically if an "item" is multiline (when the next line
does not have the same indentation) we now consider all lines (ignoring
starting whitespace) for ordering, not just the first one.
…ed_to_constitute_read_for_never` to more accessible locations
...wrt `type_ascribe`/unsafe binders -- the check was infinitely
recursive before.
... since unreachable-code only has a few tests while
`reachable` is the more popular directory...
[PR 148765](rust-lang#148765) changed
the expected signature of Thread::new(), which broke Motor OS target.

Also set thread name.
tests/ui/issues/issue-4935 is duplicated of
tests/ui/argument-suggestions/suggest-better-removing-issue-126246.rs
`tests/ui/type-inference/ambiguous-num-type-method-call.rs`
`tests/ui/mismatched_types/assignment-mismatch-various-types.rs`

merge `tests/ui/mismatched_types/main.rs`
…flelapkin

Fix ICE when applying test macro to crate root

This PR does a couple of things. First of all, I found [an ICE](https://play.rust-lang.org/?version=stable&mode=debug&edition=2024&gist=a733a7f3d223e1a9712e44b571f3e5cf) that happens when applying `#![core::prelude::v1::test]` to the crate root. This is caused by the test macro not expanding to an item when `--test` isn't applied. For the crate root, that means it deletes the crate....

The fix now first does target checking, and only if the target is valid discards the item when `--test` isn't applied. The discarding is, I think, important for perf.

The problem with this PR is that it means that `#[test]` applied to structs previously would give no errors unless `--test` is applied! That sounds like a bug to me, but maybe we should crater run it just in case, since technically that's a breaking change. Errors in such items wouldn't be reported previously.

 Also fixed a smol diagnostics bug with `#[bench]`'s error messages refering to `#[test]` accidentally.

r? noratrieb (since I already explained you a bunch, feel free to re-assign)

Fixes rust-lang#114920
@rustbot rustbot added 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. rollup A PR which is a rollup labels Dec 3, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Dec 3, 2025

📌 Commit cd923ac has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors 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 Dec 3, 2025
@bors
Copy link
Collaborator

bors commented Dec 3, 2025

⌛ Testing commit cd923ac with merge 3b19ef9...

bors added a commit that referenced this pull request Dec 3, 2025
Rollup of 9 pull requests

Successful merges:

 - #147841 (Fix ICE when applying test macro to crate root)
 - #149501 (CTFE: avoid emitting a hard error on generic normalization failures)
 - #149517 (Implement blessing for tidy alphabetical check)
 - #149521 (Improve `io::Error::downcast`)
 - #149545 (fix the check for which expressions read never type)
 - #149549 (Regression test for system register `ttbr0_el2`)
 - #149579 (Motor OS: fix compile error)
 - #149595 (Tidying up `tests/ui/issues` tests [2/N])
 - #149597 (Revert "implement and test `Iterator::{exactly_one, collect_array}`")

r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
Command `git clone --depth=1 https://github.com/rust-lang-nursery/rust-toolstate rust-toolstate` failed with exit code 128
Created at: src/bootstrap/src/core/build_steps/toolstate.rs:314:5
Executed at: src/bootstrap/src/core/build_steps/toolstate.rs:319:10

Command has failed. Rerun with -v to see more details.
Bootstrap failed while executing `test --stage 2 check-tools`
Build completed unsuccessfully in 0:00:08
  local time: Wed Dec  3 19:17:16 UTC 2025
  network time: Wed, 03 Dec 2025 19:17:16 GMT
##[error]Process completed with exit code 1.

@matthiaskrgr
Copy link
Member Author

@bors retry

Cloning into 'rust-toolstate'...

remote: Internal Server Error
fatal: unable to access 'https://github.com/rust-lang-nursery/rust-toolstate/': The requested URL returned error: 500<

@matthiaskrgr
Copy link
Member Author

@bors retry

@matthiaskrgr
Copy link
Member Author

@bors retry r-

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 3, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+

@bors
Copy link
Collaborator

bors commented Dec 3, 2025

📌 Commit cd923ac has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 3, 2025
@bors
Copy link
Collaborator

bors commented Dec 4, 2025

⌛ Testing commit cd923ac with merge 0325719...

bors added a commit that referenced this pull request Dec 4, 2025
Rollup of 9 pull requests

Successful merges:

 - #147841 (Fix ICE when applying test macro to crate root)
 - #149501 (CTFE: avoid emitting a hard error on generic normalization failures)
 - #149517 (Implement blessing for tidy alphabetical check)
 - #149521 (Improve `io::Error::downcast`)
 - #149545 (fix the check for which expressions read never type)
 - #149549 (Regression test for system register `ttbr0_el2`)
 - #149579 (Motor OS: fix compile error)
 - #149595 (Tidying up `tests/ui/issues` tests [2/N])
 - #149597 (Revert "implement and test `Iterator::{exactly_one, collect_array}`")

r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer
Copy link
Collaborator

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

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

---- alphabetical::tests::bless_smoke stdout ----

thread 'alphabetical::tests::bless_smoke' (6236) panicked at src\tools\tidy\src\alphabetical.rs:245:48:
called `Result::unwrap()` on an `Err` value: PersistError(Os { code: 5, kind: PermissionDenied, message: "Access is denied." })
stack backtrace:
note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.
---- alphabetical::tests::bless_smoke stdout end ----
---- alphabetical::tests::bless_funny_numbers stdout ----

---

error: test failed, to rerun pass `--lib`
Bootstrap failed while executing `test --stage 2 --skip=compiler --skip=src`
Build completed unsuccessfully in 1:28:15
make: *** [Makefile:112: ci-msvc-py] Error 1
  local time: Thu Dec  4 05:01:00 CUT 2025
  network time: Thu, 04 Dec 2025 05:01:00 GMT
##[error]Process completed with exit code 2.
##[group]Run echo "disk usage:"
echo "disk usage:"

@bors
Copy link
Collaborator

bors commented Dec 4, 2025

💔 Test failed - checks-actions

@bors 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 Dec 4, 2025
@Zalathar Zalathar closed this Dec 4, 2025
@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 4, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-tidy Area: The tidy tool rollup A PR which is a rollup T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-clippy Relevant to the Clippy team. 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.

Projects

None yet

Development

Successfully merging this pull request may close these issues.