Skip to content
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

Rollup of 9 pull requests #136203

Merged
merged 19 commits into from
Jan 28, 2025
Merged

Rollup of 9 pull requests #136203

merged 19 commits into from
Jan 28, 2025

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

compiler-errors and others added 19 commits January 25, 2025 20:53
The purpose of this test wasn't obvious. Add a comment.
[`rustc-rayon v0.5.1`](rust-lang/rustc-rayon#14)
added `indexmap` implementations that will allow `indexmap` to drop its
own "internal-only" implementations.

(This is separate from `indexmap`'s implementation for normal `rayon`.)
Make docs for AtomicUsize::from_mut platform-independent

fixes rust-lang#133342
…malized, r=lcnr

-Znext-solver: "normalize" signature before checking it mentions self in `deduce_closure_signature`

Fixes rust-lang/trait-system-refactor-initiative#138

r? ``@lcnr``

Tbh I wrote so much comments I don't feel like writing it all again but as a description.
…k, r=RalfJung

Implement MIR const trait stability checks

Addresses rust-lang/project-const-traits#16

cc ``@rust-lang/project-const-traits``
r? ``@RalfJung``
Pass spans to `perform_locally_in_new_solver`

Nothing changes yet, but we may be able to use these spans in the future once we start dealing w the response region constraints better.

r? lcnr
…tems, r=flip1995

[Clippy] Add vec_reserve & vecdeque_reserve diagnostic items

I’m currently working on reviving this lint (rust-lang/rust-clippy#10157), and there was [a comment](rust-lang/rust-clippy#10157 (comment)) from ``@flip1995`` regarding the necessity of adding new diagnostic items.
…-errors

Arbitrary self types v2: explain test.

The purpose of this test wasn't obvious, as ```@traviscross``` noted. Add a comment.

Confession: although this test was added to demonstrate this particular corner-case, I can no longer reproduce the original problem, even if I adjust `rustc` to do the "wrong" thing. I have spent several hours trying to adjust the case to trigger the "faulty" behavior with no success. This test may therefore not be as useful as it originally was. But it still seems worthwhile retaining as a regression test that we don't break things in these quirky circumstances. Ideally we'd find a new test which tests this behavior but I've failed to come up with one.

r? ```@traviscross```
…mpiler-errors

Flip the `rustc-rayon`/`indexmap` dependency order

[`rustc-rayon v0.5.1`](rust-lang/rustc-rayon#14) added `indexmap` implementations that will allow `indexmap` to drop its own "internal-only" implementations.

(This is separate from `indexmap`'s implementation for normal `rayon`.)
Update comments and sort target_arch in c_char_definition

Follow-up to rust-lang#132975.

- Clang's wrong default on MSP430 has been fixed in llvm/llvm-project#115964, and will be included in LLVM 20, which will be used soon.
- Add a reference on Xtensa's default (from rust-lang#132975 (comment)).
- Fix link for Windows's default.
- Add a link to the discussion on L4Re (rust-lang#132975 (comment))
- Sort `target_arch`. (now match with `target_arch`s in comments)

r? `@tgross35`
Update username in build helper example

no typos have been made in the process of creating this pull request

r? pietroalbini
@rustbot rustbot added 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-libs Relevant to the library 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 Jan 28, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Jan 28, 2025

📌 Commit 9715fea 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 Jan 28, 2025
@bors
Copy link
Contributor

bors commented Jan 28, 2025

⌛ Testing commit 9715fea with merge bf1b174...

@bors
Copy link
Contributor

bors commented Jan 28, 2025

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing bf1b174 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 28, 2025
@bors bors merged commit bf1b174 into rust-lang:master Jan 28, 2025
7 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Jan 28, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#135869 Make docs for AtomicUsize::from_mut platform-independent 8cb07e6db3c76497e7a13cd6bcd2d8aa7889453c (link)
#135892 -Znext-solver: "normalize" signature before checking it men… 781f3a844f9e4782731d94d1b75a2ac8b51658d5 (link)
#136055 Implement MIR const trait stability checks ebb14e8f2ad5431fcc62039fa4c2ce0ebab470f5 (link)
#136066 Pass spans to perform_locally_in_new_solver 26c899322116d73c92c13754e7d9f8a5bc3de133 (link)
#136071 [Clippy] Add vec_reserve & vecdeque_reserve diagnostic items 145896484c1cc1da5fcdb087bfc0c1303235dd2e (link)
#136124 Arbitrary self types v2: explain test. 84c9af00b7323a53acd91324db334c1cbd004302 (link)
#136149 Flip the rustc-rayon/indexmap dependency order 133dba69a87384166fc6fe67b2830e8fd7c893de (link)
#136173 Update comments and sort target_arch in c_char_definition 275c4c4cfcaf0193b2c897708c066d287286d9fb (link)
#136178 Update username in build helper example 2ef100c7f1444d79ee80f36706f9f3d3299bdd5d (link)

previous master: 77a455303b

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (bf1b174): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
0.2% [0.2%, 0.2%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary 2.7%, secondary 0.9%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
2.7% [2.7%, 2.7%] 1
Regressions ❌
(secondary)
4.9% [4.9%, 4.9%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.2% [-3.2%, -3.2%] 1
All ❌✅ (primary) 2.7% [2.7%, 2.7%] 1

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 771.05s -> 770.985s (-0.01%)
Artifact size: 328.24 MiB -> 328.20 MiB (-0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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. 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.