Skip to content

Rollup of 8 pull requests #137497

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 21 commits into from
Feb 24, 2025
Merged

Rollup of 8 pull requests #137497

merged 21 commits into from
Feb 24, 2025

Conversation

tgross35
Copy link
Contributor

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

RalfJung and others added 21 commits February 4, 2025 16:27
replace "// @" with "//@ ", and fix the tests so they actually pass, after directives are checked
Removes an ABI hack that used `<2 x i64>` to return `i128` in `xmm0` on
Windows [1].

[1]: rust-lang/compiler-builtins#759
Link: rust-lang#116558
Link: rust-lang/compiler-builtins#758
…ng, r=Noratrieb

Misc. `rustc_codegen_ssa` cleanups 🧹

Just a bunch of stuff I found while reading the crate's code.
Each commit can stand on its own.
Maybe r? `@Noratrieb` because I saw you did some similar cleanups on these files a while ago? (feel free to re-assign, I'm just guessing)
intrinsics: unify rint, roundeven, nearbyint in a single round_ties_even intrinsic

LLVM has three intrinsics here that all do the same thing (when used in the default FP environment). There's no reason Rust needs to copy that historically-grown mess -- let's just have one intrinsic and leave it up to the LLVM backend to decide how to lower that.

Suggested by `@hanna-kruppe` in rust-lang#136459; Cc `@tgross35`

try-job: test-various
Add binary_format to rustc target specs

Added binary format field to `TargetOptions`

Fixes rust-lang#135724

r? `@Noratrieb`
…est-directives, r=fmease

Fix rustdoc test directives that were accidentally ignored 🧐

Replace "// `@"` with "//@ ", and fix the tests so they actually pass, after directives are checked.
~~Only the first commit is mandatory, other two are small drive-bys.~~
Update `compiler-builtins` to 0.1.147

Removes an ABI hack that used `<2 x i64>` to return `i128` in `xmm0` on Windows [1].

[1]: rust-lang/compiler-builtins#759
Link: rust-lang#116558
Link: rust-lang/compiler-builtins#758

try-job: x86_64-mingw-1
try-job: x86_64-mingw-2
FIx `sym` -> `syn` typo in tail-expr-drop-order type opt-out

The rust-lang#131326 PR attempts to reduce some false positives for the `tail_expr_drop_order` lint by hard-coding some common ecosystem crate names. Specifically, I believe it attempts to opt out the drop impls from `syn` which only exist as optimizations.

However, this was typo'd like "sym", which is a crate that has been [yanked](https://crates.io/crates/sym) (lol). This PR fixes that.

cc `@dingxiangfei2009` `@nikomatsakis` -- did I mistake this? Was this meant to be a different crate?

`@bors` rollup
…evel-doc-for-core-metadata, r=Kobzol

bootstrap: add module docs for core:metadata

Add module doc for bootstrap:core:metadata
rename sub_ptr to offset_from_unsigned

i also made `byte_sub_ptr` `byte_offset_from_unsigned`

fixes rust-lang#137121
tracking issue rust-lang#95892
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) O-apple Operating system: Apple (macOS, iOS, tvOS, visionOS, watchOS) 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. 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 Feb 23, 2025
@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 Feb 23, 2025
@bors
Copy link
Collaborator

bors commented Feb 23, 2025

⌛ Testing commit 18ffee2 with merge 246632c...

bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 23, 2025
Rollup of 8 pull requests

Successful merges:

 - rust-lang#136439 (Misc. `rustc_codegen_ssa` cleanups 🧹)
 - rust-lang#136543 (intrinsics: unify rint, roundeven, nearbyint in a single round_ties_even intrinsic)
 - rust-lang#136637 (Add binary_format to rustc target specs)
 - rust-lang#137099 (Fix rustdoc test directives that were accidentally ignored 🧐)
 - rust-lang#137297 (Update `compiler-builtins` to 0.1.147)
 - rust-lang#137451 (FIx `sym` -> `syn` typo in tail-expr-drop-order type opt-out)
 - rust-lang#137452 (bootstrap: add module docs for core:metadata)
 - rust-lang#137483 (rename sub_ptr to offset_from_unsigned)

r? `@ghost`
`@rustbot` modify labels: rollup
@onur-ozkan
Copy link
Member

Can we r- this for now? Otherwise we will have a broken nightly tomorrow... We need #137476 to avoid broken nightly.

@tgross35
Copy link
Contributor Author

Yeah sorry meant to do that but got distracted.

@bors r- retry

@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 Feb 23, 2025
@onur-ozkan

This comment was marked as duplicate.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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-author Status: This is awaiting some action (such as code changes or more information) from the author. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 23, 2025
@tgross35
Copy link
Contributor Author

@bors r+

@bors
Copy link
Collaborator

bors commented Feb 23, 2025

📌 Commit 18ffee2 has been approved by tgross35

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 Feb 23, 2025
@bors
Copy link
Collaborator

bors commented Feb 23, 2025

⌛ Testing commit 18ffee2 with merge 9af8985...

@bors
Copy link
Collaborator

bors commented Feb 24, 2025

☀️ Test successful - checks-actions
Approved by: tgross35
Pushing 9af8985 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 24, 2025
@bors bors merged commit 9af8985 into rust-lang:master Feb 24, 2025
7 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Feb 24, 2025
@tgross35 tgross35 deleted the rollup-1oeclrr branch February 24, 2025 03:06
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#136439 Misc. rustc_codegen_ssa cleanups 🧹 19da8a55e4275fdf36e2d69f8677f0ce64ff980d (link)
#136543 intrinsics: unify rint, roundeven, nearbyint in a single ro… 5eb48f9e5ea081af27945187b6a5fe53b91d0c68 (link)
#136637 Add binary_format to rustc target specs d1bc468921ba60d804f258620222d54ec5780f77 (link)
#137099 Fix rustdoc test directives that were accidentally ignored … 1aa7dbaaccc33dd77de515a928fcc8a29426d918 (link)
#137297 Update compiler-builtins to 0.1.147 bcaaa812d4318ef31f358481d355f019a7e8f7bf (link)
#137451 FIx sym -> syn typo in tail-expr-drop-order type opt-out 831d9c62d7c9c8b8a71eb444cfb05f27d078b313 (link)
#137452 bootstrap: add module docs for core:metadata 18ddf32ac996d6f67e18647c8b15c44e5afcd1e3 (link)
#137483 rename sub_ptr to offset_from_unsigned c29a608e539a0db66e0e9416cb37fcab7fa3a79b (link)

previous master: f8a913b138

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

Overall result: ❌✅ regressions and improvements - 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)
1.1% [1.0%, 1.3%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.3% [-0.3%, -0.3%] 1
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary -1.0%)

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

Cycles

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

Binary size

Results (primary 0.0%)

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

Bootstrap: 770.257s -> 769.943s (-0.04%)
Artifact size: 359.67 MiB -> 359.62 MiB (-0.01%)

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
A-attributes Area: Attributes (`#[…]`, `#![…]`) merged-by-bors This PR was explicitly merged by bors. O-apple Operating system: Apple (macOS, iOS, tvOS, visionOS, watchOS) 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. 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.