Skip to content

Rollup of 8 pull requests #140040

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

Merged
merged 18 commits into from
Apr 19, 2025
Merged

Rollup of 8 pull requests #140040

merged 18 commits into from
Apr 19, 2025

Conversation

ChrisDenton
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

mu001999 and others added 18 commits February 23, 2025 11:29
Restoring what it said prior to commit 67065fe in which it was changed
incorrectly with no supporting explanation.

Closes rust-lang#139835.
And clean it up a little.
On Windows 7 32-bit, the alignment characteristic of the TLS Directory
don't appear to be respected by the PE Loader, leading to crashes. As
a result, let's disable has_thread_local to make sure TLS goes through
the emulation layer.
…leywiser

not lint break with label and unsafe block

fixes rust-lang#137414

we can't label unsafe blocks, so that we can do not lint them
Deduplicate & clean up Nix shell

1. Deduplicate the flake and shell files
2. Remove flake-utils
3. Remove `with` statements
They are considered bad practice nowadays because the slow down the evalulator and have weird shadowing rules.
4. Use `env`
:3
5. use `callPackage`
It's the recommended way for derivations like these.
6. Use `packages` in the shell
There is no reason to use `buildInputs` for a mkShell (except in funny cases that will not be seen here), so the  `packages` attr is recommended now days.

r? WaffleLapkin
Implement `Default` for raw pointers

ACP: rust-lang/libs-team#571

This is instantly stable so we will need an FCP here.

Closes rust-lang/rfcs#2464
…xed, r=aDotInTheVoid

Make rustdoc JSON Span column 1-based, just like line numbers

Fixes rust-lang#139906.

This PR does two things:
 1. It makes column 1-indexed as well, just like lines.
 2. It updates documentation about them to mention that they are 1-indexed.

I think it's better for coherency to have them both 1-indexed instead of the weird mix we used to have. Docs for `line` and `col` fields can be found [here](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_span/struct.Loc.html#structfield.line).

And finally: it adds a regression test to ensure they are indeed 1-indexed.

r? `@aDotInTheVoid`
fix incorrect type in cstr `to_string_lossy()` docs

Restoring what it said prior to commit 67065fe in which it was changed incorrectly with no supporting explanation.

Closes rust-lang#139835.
Disable has_thread_local on i686-win7-windows-msvc

On Windows 7 32-bit, the alignment characteristic of the TLS Directory don't appear to be respected by the PE Loader, leading to crashes. As a result, let's disable has_thread_local to make sure TLS goes through the emulation layer.

Fixes rust-lang#138903
…ompiler-errors

Re-remove `AdtFlags::IS_ANONYMOUS`

Removed in rust-lang#138296.
I accidentally re-added it in rust-lang#137043 while resolving merge conflicts. This PR re-removes it.

r? ``@compiler-errors`` (sorry)
@rustbot rustbot added A-rustdoc-json Area: Rustdoc JSON backend S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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. rollup A PR which is a rollup labels Apr 19, 2025
@ChrisDenton
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Apr 19, 2025

📌 Commit 9ebc73e has been approved by ChrisDenton

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

bors commented Apr 19, 2025

⌛ Testing commit 9ebc73e with merge 077cedc2afa8ac0b727b7a6cbe012940ba228deb...

@bors
Copy link
Collaborator

bors commented Apr 19, 2025

☀️ Test successful - checks-actions
Approved by: ChrisDenton
Pushing 077cedc to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 19, 2025
@bors bors merged commit 077cedc into rust-lang:master Apr 19, 2025
7 checks passed
@rustbot rustbot added this to the 1.88.0 milestone Apr 19, 2025
Copy link

What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing a7c39b6 (parent) -> 077cedc (this PR)

Test differences

Show 12 test diffs

Stage 0

  • ptr::test_ptr_default: [missing] -> pass (J4)

Stage 1

  • ptr::test_ptr_default: [missing] -> pass (J0)
  • [rustdoc-json] tests/rustdoc-json/span.rs: [missing] -> pass (J2)
  • [ui] tests/ui/lint/break-with-label-and-unsafe-block.rs: [missing] -> pass (J2)

Stage 2

  • [rustdoc-json] tests/rustdoc-json/span.rs: [missing] -> pass (J1)
  • [ui] tests/ui/lint/break-with-label-and-unsafe-block.rs: [missing] -> pass (J3)

Additionally, 6 doctest diffs were found. These are ignored, as they are noisy.

Job group index

Job duration changes

  1. dist-aarch64-linux: 7591.8s -> 5425.3s (-28.5%)
  2. x86_64-apple-1: 6235.6s -> 7940.6s (27.3%)
  3. dist-x86_64-apple: 8293.5s -> 9172.6s (10.6%)
  4. x86_64-msvc-ext1: 7267.7s -> 7699.7s (5.9%)
  5. i686-msvc-2: 7329.1s -> 6902.0s (-5.8%)
  6. x86_64-msvc-1: 8563.8s -> 8977.6s (4.8%)
  7. x86_64-mingw-1: 9108.3s -> 8680.9s (-4.7%)
  8. dist-x86_64-illumos: 5642.6s -> 5417.7s (-4.0%)
  9. dist-x86_64-netbsd: 5024.2s -> 5197.3s (3.4%)
  10. dist-s390x-linux: 5187.2s -> 5358.5s (3.3%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#137454 not lint break with label and unsafe block 8d0a365327aacccc4e9301a1f1b5900cecd4cdd1 (link)
#139297 Deduplicate & clean up Nix shell 7c44ea15142adbc0c874758e16e3d0ae3b5e4af1 (link)
#139535 Implement Default for raw pointers de789b1a0ca1c92e53fa893f929a79bbcc99ca26 (link)
#139919 Make rustdoc JSON Span column 1-based, just like line numbe… b6685c91eca193c8ed12acbf9f104cfd1100496c (link)
#139922 fix incorrect type in cstr to_string_lossy() docs 9b85658375720901b19e250112e2776de5466a51 (link)
#140007 Disable has_thread_local on i686-win7-windows-msvc 4c5bccc9423d2b08608e5d037209d6bd3f1856e6 (link)
#140016 std: Use fstatat() on illumos 35172e35dd40e3e6f6ff966648ab17c9502ffd53 (link)
#140025 Re-remove AdtFlags::IS_ANONYMOUS 34ce63d9792534de60fd554228ecb4d4a3557aff (link)

previous master: a7c39b6861

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

@ChrisDenton ChrisDenton deleted the rollup-56bzfuq branch April 19, 2025 19:28
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (077cedc): 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 (primary -0.3%, secondary -0.7%)

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.6%, 1.0%] 3
Regressions ❌
(secondary)
3.2% [3.2%, 3.2%] 1
Improvements ✅
(primary)
-0.8% [-1.9%, -0.4%] 8
Improvements ✅
(secondary)
-2.0% [-2.3%, -1.6%] 3
All ❌✅ (primary) -0.3% [-1.9%, 1.0%] 11

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

Binary size

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

Bootstrap: 772.535s -> 771.827s (-0.09%)
Artifact size: 364.98 MiB -> 365.08 MiB (0.03%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-rustdoc-json Area: Rustdoc JSON backend 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-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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.