Skip to content

Rollup of 5 pull requests #130688

New issue

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

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

Already on GitHub? # to your account

Merged
merged 13 commits into from
Sep 22, 2024
Merged

Rollup of 5 pull requests #130688

merged 13 commits into from
Sep 22, 2024

Conversation

workingjubilee
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

onur-ozkan and others added 13 commits September 21, 2024 07:35
Signed-off-by: onur-ozkan <work@onurozkan.dev>
move enzyme flags from general cargo to rustc-specific cargo

Resolves rust-lang#130637.
…sistency, r=jieyouxu

Fixup Apple target's description strings

Noticed this inconsistency in how the Apple target's had their new descriptions written while looking at rust-lang#130614, and figured it was easy enough to fixup shortly. I think prefixing every OS with `Apple` is clearer, especially for less known ones like `visionOS` and `watchOS`; so that's what was done here along with making the architecture names more consistent and then some other small tweaks.

~~r​? `@thomcc~~`

cc `@madsmtm`
…rs-on-non-rust, r=notriddle

Generate line numbers for non-rust code examples as well

Currently, the "enable line numbers" setting only generated it for rust code examples. Found this limitation a bit strange so I decided to remove it.

You can test it [here](https://rustdoc.crud.net/imperio/generate-line-number-non-rust/doc/lib2/sub_mod/struct.Foo.html).

r? ``@notriddle``
…iler-errors

Prevent Deduplication of `LongRunningWarn`

Fixes rust-lang#118612

As mention in the issue, `LongRunningWarn` is meant to be repeated multiple times.

Therefore, this PR stores a unique number in every instance of `LongRunningWarn` so that it's not hashed into the same value and omitted by the deduplication mechanism.
…-finely, r=compiler-errors

tests: Test that `extern "C" fn` ptrs lint on slices

This seems to have slipped past the `improper_ctypes_definitions` lint at some point. I found similar tests but not one with this exact combination, so test the semi-unique combination.
@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-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Sep 22, 2024
@workingjubilee
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Sep 22, 2024

📌 Commit f314db6 has been approved by workingjubilee

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 Sep 22, 2024
@bors
Copy link
Collaborator

bors commented Sep 22, 2024

⌛ Testing commit f314db6 with merge 80aa6fa...

@bors
Copy link
Collaborator

bors commented Sep 22, 2024

☀️ Test successful - checks-actions
Approved by: workingjubilee
Pushing 80aa6fa to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 22, 2024
@bors bors merged commit 80aa6fa into rust-lang:master Sep 22, 2024
7 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Sep 22, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#130648 move enzyme flags from general cargo to rustc-specific cargo fef3b6cfc78c4d900e2c043c1c183b948bea339e (link)
#130650 Fixup Apple target's description strings 1b94e68277d8a90a1a6124a70ef6d826f6fe1441 (link)
#130664 Generate line numbers for non-rust code examples as well d4b266f8c93f5cb40f5f8ef04671da6db5acb32c (link)
#130665 Prevent Deduplication of LongRunningWarn 78af392f5ed20b69cdb5183c279eaf67bf6a74ca (link)
#130669 tests: Test that extern "C" fn ptrs lint on slices 1be27949e685ee87aca7564503c39170643647cd (link)

previous master: 1f9a018fa3

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

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

Results (secondary -2.6%)

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)
-2.6% [-3.3%, -2.0%] 3
All ❌✅ (primary) - - 0

Cycles

Results (primary 0.2%)

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.8% [0.8%, 0.8%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.5% [-0.5%, -0.5%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.2% [-0.5%, 0.8%] 2

Binary size

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

Bootstrap: 770.432s -> 769.195s (-0.16%)
Artifact size: 341.54 MiB -> 341.55 MiB (0.00%)

@workingjubilee workingjubilee deleted the rollup-ovre6p7 branch September 22, 2024 17:11
# for free to join this conversation on GitHub. Already have an account? # 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-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants