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 10 pull requests #136135

Merged
merged 23 commits into from
Jan 27, 2025
Merged

Rollup of 10 pull requests #136135

merged 23 commits into from
Jan 27, 2025

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

bjorn3 and others added 23 commits January 24, 2025 12:15
This doesn't fix the root cause of this crash, but at least stops it
from happening for the time being.
This assumes that the set of valid node IDs is exactly `0..num_nodes`.

In practice, we have a lot of graph-algorithm code that already assumes that
nodes are densely numbered, by using `num_nodes` to allocate per-node indexed
data structures.
fix doc for std::sync::mpmc

fix document of `std::sync::mpmc` (tracked in rust-lang#126840)
…rash, r=lqd

Add a workaround for parallel rustc crashing when there are delayed bugs

This doesn't fix the root cause of this crash, but at least stops it from happening for the time being.

Workaround for rust-lang#135870
Mark all NuttX targets as tier 3 target and support the standard library

The support for standard library added by rust-lang#130595.
Add a suggestion to cast target_feature fn items to fn pointers.

See rust-lang#134090 (comment) for the motivation behind this suggestion.

r? oli-obk
Incorporate `iter_nodes` into `graph::DirectedGraph`

This helper method iterates over all node IDs in the dense range `0..num_nodes`.

In practice, we have a lot of graph-algorithm code that already assumes that nodes are densely numbered, by using `num_nodes` to allocate per-node indexed data structures. So I don't think this is actually a substantial change to the de-facto semantics of `graph::DirectedGraph`.

---

Resolves a FIXME from rust-lang#135481.
…ui-tests, r=compiler-errors

Clean up all dead files inside `tests/ui/`

While rebasing rust-lang#135860 I noticed that there are several dead `*.stderr` files inside `tests/ui/`.

When I checked thoroughly, I found 69 dead `*.$revision.stderr` files, 3 other dead `*.stderr` files and one dead `*.rs` file.

Prior to rust-lang#134808, compiletest's `--bless` didn't remove dead `*.stderr` files when the set of revisions changed in any way (renamings, removals, additions, …) which explains their existence.

Regarding the dead `*.rs` file, that one was located inside an `auxiliary/` directory (together with a `*.stderr` file) despite not being meant to be an auxiliary file (it's not referenced by any `//@ aux-*`, it has an accompanying `*.stderr` file and it's obvious from looking at rust-lang#111056 which added it). Ideally compiletest or tidy would forbid `*.std{out,err}` files inside `auxiliary/` dirs, that would've caught it. I moved it, updated it and turned it into a proper UI test.

---

How to reproduce:

1. Run `rm tests/ui/**/*.stderr`
2. Run `./x test tests/ui --bless` (or similar)
3. Manually / semi-automatically go through all tests that were ignored (likely due to your OS etc. not matching) and restore any stderr files that were overzealously removed

---

r? compiler
…youxu

Use identifiers more in diagnostics code

This should make the diagnostics code slightly more correct when rendering idents in mixed crate edition situations. Kinda a no-op, but a cleanup regardless.

r? oli-obk or reassign
Change `collect_and_partition_mono_items` tuple return type to a struct

rust-lang#133429 will add a new field to this tuple, so it seems prudent to turn it into a struct first to avoid confusion about what the tuple elements mean.
@rustbot rustbot added A-tidy Area: The tidy tool 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) labels Jan 27, 2025
@GuillaumeGomez
Copy link
Member Author

@bors r+ p=8 rollup=never

@rustbot rustbot added the rollup A PR which is a rollup label Jan 27, 2025
@bors
Copy link
Contributor

bors commented Jan 27, 2025

📌 Commit 3d02ce7 has been approved by GuillaumeGomez

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 27, 2025
@bors
Copy link
Contributor

bors commented Jan 27, 2025

⌛ Testing commit 3d02ce7 with merge ebcf860...

@bors
Copy link
Contributor

bors commented Jan 27, 2025

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing ebcf860 to master...

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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#135773 Clarify WindowsMut (Lending)Iterator 682cc5de600577ff41c069cd0904069809cc8fac (link)
#135807 Implement phantom variance markers 692dbd412e42d128c02e442d22aff8fd670017f5 (link)
#135876 fix doc for std::sync::mpmc dd9e55fcfdff7bbac405bf8ece66ad0da7688b66 (link)
#135988 Add a workaround for parallel rustc crashing when there are… d60268f053045a325594c05cc691d3ef1920793e (link)
#136037 Mark all NuttX targets as tier 3 target and support the sta… 26d9f8ce793c4e6fc5df8e1297be4584ce897230 (link)
#136064 Add a suggestion to cast target_feature fn items to fn poin… 264512f027bb2e85fec0002b7c4b80b47df6e602 (link)
#136082 Incorporate iter_nodes into graph::DirectedGraph 39f103e26264cba15c48b10d0f9900d58b3f1e9b (link)
#136112 Clean up all dead files inside tests/ui/ 0f7e546cb1a5bee0ef15d6d469ebf2a16eebd500 (link)
#136114 Use identifiers more in diagnostics code 89ab7b76c4676ed702a8cb1b4f39293b1992c4b4 (link)
#136118 Change collect_and_partition_mono_items tuple return type… 35da286c415695b024f70ef68b385583d08c7a9d (link)

previous master: 0cffe5cb95

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 (ebcf860): comparison URL.

Overall result: ❌ regressions - please read the text below

Our benchmarks found a performance regression caused by this PR.
This might be an actual regression, but it can also be just noise.

Next Steps:

  • If the regression was expected or you think it can be justified,
    please write a comment with sufficient written justification, and add
    @rustbot label: +perf-regression-triaged to it, to mark the regression as triaged.
  • If you think that you know of a way to resolve the regression, try to create
    a new PR with a fix for the regression.
  • If you do not understand the regression or you think that it is just noise,
    you can ask the @rust-lang/wg-compiler-performance working group for help (members of this group
    were already notified of this PR).

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

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.3% [0.2%, 0.3%] 2
Regressions ❌
(secondary)
0.2% [0.2%, 0.3%] 9
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.3% [0.2%, 0.3%] 2

Max RSS (memory usage)

Results (primary -0.1%, secondary 4.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)
0.9% [0.9%, 0.9%] 1
Regressions ❌
(secondary)
4.9% [4.9%, 4.9%] 1
Improvements ✅
(primary)
-1.1% [-1.1%, -1.1%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.1% [-1.1%, 0.9%] 2

Cycles

Results (secondary 1.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)
- - 0
Regressions ❌
(secondary)
1.9% [1.9%, 1.9%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 772.206s -> 774.391s (0.28%)
Artifact size: 328.24 MiB -> 328.16 MiB (-0.03%)

@rustbot rustbot added the perf-regression Performance regression. label Jan 27, 2025
@rylev
Copy link
Member

rylev commented Feb 5, 2025

@rustbot build 89ab7b7

@Kobzol
Copy link
Contributor

Kobzol commented Feb 5, 2025

@rust-timer build 89ab7b7

@rust-timer

This comment has been minimized.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (89ab7b7): comparison URL.

Overall result: no relevant changes - no action needed

Instruction count

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

Max RSS (memory usage)

Results (secondary -3.4%)

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)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.4% [-3.4%, -3.4%] 1
All ❌✅ (primary) - - 0

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: 772.206s -> 771.24s (-0.13%)
Artifact size: 328.24 MiB -> 328.24 MiB (0.00%)

@lqd
Copy link
Member

lqd commented Feb 5, 2025

@rust-timer build 692dbd4

@rust-timer

This comment has been minimized.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (692dbd4): comparison URL.

Overall result: ❌ regressions - please read the text below

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.3% [0.3%, 0.3%] 2
Regressions ❌
(secondary)
0.3% [0.2%, 0.3%] 10
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.3% [0.3%, 0.3%] 2

Max RSS (memory usage)

Results (primary -0.5%, secondary 4.3%)

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)
1.0% [1.0%, 1.0%] 1
Regressions ❌
(secondary)
4.3% [4.3%, 4.3%] 1
Improvements ✅
(primary)
-2.0% [-2.0%, -2.0%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.5% [-2.0%, 1.0%] 2

Cycles

Results (secondary 4.1%)

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)
- - 0
Regressions ❌
(secondary)
4.1% [2.6%, 4.9%] 4
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 772.206s -> 772.753s (0.07%)
Artifact size: 328.24 MiB -> 328.24 MiB (0.00%)

@lqd
Copy link
Member

lqd commented Feb 5, 2025

Feels like the usual, changes to libstd/libcore => doc regressions

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 merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. 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.