Skip to content

Rollup of 11 pull requests #140528

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 447 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

snprajwal and others added 30 commits April 3, 2025 14:58
Signed-off-by: Prajwal S N <prajwalnadig21@gmail.com>
fix(ide-assists): remove `AssistKind::None`
…s-string

Fix color brackets in string context
Signed-off-by: Prajwal S N <prajwalnadig21@gmail.com>
A Cargo project can now be built without any dependency metadata being fetched.

Signed-off-by: Prajwal S N <prajwalnadig21@gmail.com>
Implicit field references during struct initialization were
being dropped because get_definition was returning None because
there were multiple definitions.

This adds a new helper, `get_defintions`, that supports returning
more than one definition for a given token and hooks it up.

Fixes rust-lang#19393
Align usage of `default` and `new` with style guide
fix: don't drop references with more than one definition.
…anic-in-view-crate-graph

internal: fix panic in `view_crate_graph`
…alsafied-crate-graph-with-lazy-project-discovery

internal: ensure a Salsa-ified crate graph works with project discovery
…deps

feat(project-model): provide flag for no deps
The rustdoc file prefix for constants is "constant" not "const"
fix: Fix a bug in MBE expansion that arose from incorrect fixing of an older bug in MBE
fix: Fix `format_args` lowering for >=1.87
chore: Set up a proper job matrix for rust-cross
fix: Yet another false positive invalid cast diagnostic
Don't FCW assoc consts in patterns

Fixes rust-lang#140447

See comment in added test. We could also check that the anon const is a const arg by looking at the HIR. I'm not sure that's necessary though 🤔 The only consts that are evaluated "for the type system" are const args (which *should* get FCWs) and const patterns (which cant be anon consts afaik).
… r=lcnr

Minor tweaks to make some normalization (adjacent) code less confusing

r? lcnr

sorry for double ping lol
CI: rfl: move job forward to Linux v6.15-rc4

A hopefully routine upgrade to Linux v6.15-rc4!

r? ````@lqd```` ````@Kobzol````
try-job: x86_64-rust-for-linux
````@rustbot```` label A-rust-for-linux
````@bors```` try
chore: delete unused ui/auxiliary crates

It appears that all the tests that used it have been moved to tests/ui/editions/ (or elsewhere) already.

r? ````@jieyouxu````
Require sanitizers be enabled for asan_odr_windows.rs

Issue Details:
The `asan_odr_windows.rs` test is failing on AArch64 Windows, as sanitizers aren't supported on that platform.

Fix Details:
Apply the correct "need sanitizer" requirements to the test.
…bool-lit, r=calebcartwright

rustfmt: Also allow bool literals as first item of let chain

This is a functional cherry-pick of rust-lang/rustfmt#6492

I'm bringing this change over directly as the subtree sync is taking more effort than anticipated (some unrelated r-l/rustfmt changes need to be reverted before we perform the full sync) and we need to ensure that rustfmt behavior accounts with the final style guide rules as part of let chain stabilization.

r? ```@ghost```
…viscross,SparrowLii

Parser: Document restrictions

I had trouble easily understanding what these various flags do. This is my attempt to try to explain what these do.
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc A-tidy Area: The tidy tool PG-exploit-mitigations Project group: Exploit mitigations S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Apr 30, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Apr 30, 2025

📌 Commit be42937 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 Apr 30, 2025
@bors
Copy link
Collaborator

bors commented Apr 30, 2025

⌛ Testing commit be42937 with merge 466106f...

bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 30, 2025
…iaskrgr

Rollup of 11 pull requests

Successful merges:

 - rust-lang#140380 (transmutability: uninit transition matches unit byte only)
 - rust-lang#140385 (Subtree update of `rust-analyzer`)
 - rust-lang#140458 (Fix for async drop ice with partly dropped tuple)
 - rust-lang#140465 (chore: edit and move tests)
 - rust-lang#140467 (Don't FCW assoc consts in patterns)
 - rust-lang#140468 (Minor tweaks to make some normalization (adjacent) code less confusing)
 - rust-lang#140470 (CI: rfl: move job forward to Linux v6.15-rc4)
 - rust-lang#140476 (chore: delete unused ui/auxiliary crates)
 - rust-lang#140481 (Require sanitizers be enabled for asan_odr_windows.rs)
 - rust-lang#140486 (rustfmt: Also allow bool literals as first item of let chain)
 - rust-lang#140494 (Parser: Document restrictions)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr
Copy link
Member Author

@bors r-

@matthiaskrgr matthiaskrgr reopened this Apr 30, 2025
@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 Apr 30, 2025
@bors
Copy link
Collaborator

bors commented Apr 30, 2025

☔ The latest upstream changes (presumably #140520) made this pull request unmergeable. Please resolve the merge conflicts.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc A-tidy Area: The tidy tool PG-exploit-mitigations Project group: Exploit mitigations rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. 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-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Development

Successfully merging this pull request may close these issues.