Rollup of 8 pull requests #140040

ChrisDenton · 2025-04-19T14:01:41Z

Successful merges:

not lint break with label and unsafe block #137454 (not lint break with label and unsafe block)
Deduplicate & clean up Nix shell #139297 (Deduplicate & clean up Nix shell)
Implement Default for raw pointers #139535 (Implement Default for raw pointers)
Make rustdoc JSON Span column 1-based, just like line numbers #139919 (Make rustdoc JSON Span column 1-based, just like line numbers)
fix incorrect type in cstr to_string_lossy() docs #139922 (fix incorrect type in cstr to_string_lossy() docs)
Disable has_thread_local on i686-win7-windows-msvc #140007 (Disable has_thread_local on i686-win7-windows-msvc)
std: Use fstatat() on illumos #140016 (std: Use fstatat() on illumos)
Re-remove AdtFlags::IS_ANONYMOUS #140025 (Re-remove AdtFlags::IS_ANONYMOUS)

r? @ghost
@rustbot modify labels: rollup

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

std: Use fstatat() on illumos

…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)

ChrisDenton · 2025-04-19T14:03:12Z

@bors r+ rollup=never p=5

bors · 2025-04-19T14:03:15Z

📌 Commit 9ebc73e has been approved by ChrisDenton

It is now in the queue for this repository.

bors · 2025-04-19T16:03:37Z

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

bors · 2025-04-19T19:11:09Z

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

github-actions · 2025-04-19T19:12:32Z

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

dist-aarch64-linux: 7591.8s -> 5425.3s (-28.5%)
x86_64-apple-1: 6235.6s -> 7940.6s (27.3%)
dist-x86_64-apple: 8293.5s -> 9172.6s (10.6%)
x86_64-msvc-ext1: 7267.7s -> 7699.7s (5.9%)
i686-msvc-2: 7329.1s -> 6902.0s (-5.8%)
x86_64-msvc-1: 8563.8s -> 8977.6s (4.8%)
x86_64-mingw-1: 9108.3s -> 8680.9s (-4.7%)
dist-x86_64-illumos: 5642.6s -> 5417.7s (-4.0%)
dist-x86_64-netbsd: 5024.2s -> 5197.3s (3.4%)
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 · 2025-04-19T19:13:27Z

📌 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

rust-timer · 2025-04-19T20:38:41Z

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%)

mu001999 and others added 18 commits February 23, 2025 11:29

not lint break with label and unsafe block

3fe0b3d

Implement Default for raw pointers

830bd8b

fix incorrect type in cstr to_string_lossy() docs

2f0ba67

Restoring what it said prior to commit 67065fe in which it was changed incorrectly with no supporting explanation. Closes rust-lang#139835.

Deduplicate nix code

5a38550

And clean it up a little.

Disable has_thread_local on i686-win7-windows-msvc

1b39302

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.

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

59477a8

Add regression test for span 1-indexed check

ba9a008

Update rustdoc-json-types FORMAT_VERSION to 45

076016d

std: Use fstatat() on illumos

fb3cae0

Re-remove AdtFlags::IS_ANONYMOUS

d863f81

Rollup merge of rust-lang#137454 - mu001999-contrib:fix-137414, r=wes…

db98b72

…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

Rollup merge of rust-lang#139535 - ChrisDenton:default-ptr, r=tgross35

dff14f0

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

Rollup merge of rust-lang#139922 - jnqnfe:cstr_doc_fix, r=jhpratt

3c5aef3

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.

Rollup merge of rust-lang#140016 - pfmooney:illumos-fstatat, r=jhpratt

9951149

std: Use fstatat() on illumos

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 added the merged-by-bors This PR was explicitly merged by bors. label Apr 19, 2025

bors merged commit 077cedc into rust-lang:master Apr 19, 2025
7 checks passed

rustbot added this to the 1.88.0 milestone Apr 19, 2025

ChrisDenton deleted the rollup-56bzfuq branch April 19, 2025 19:28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 8 pull requests #140040

Rollup of 8 pull requests #140040

Uh oh!

ChrisDenton commented Apr 19, 2025

Uh oh!

ChrisDenton commented Apr 19, 2025

Uh oh!

bors commented Apr 19, 2025

Uh oh!

bors commented Apr 19, 2025

Uh oh!

bors commented Apr 19, 2025

Uh oh!

Uh oh!

github-actions bot commented Apr 19, 2025

Stage 0

Stage 1

Stage 2

Uh oh!

rust-timer commented Apr 19, 2025

Uh oh!

rust-timer commented Apr 19, 2025

Uh oh!

Uh oh!

Rollup of 8 pull requests #140040

Rollup of 8 pull requests #140040

Uh oh!

Conversation

ChrisDenton commented Apr 19, 2025

Uh oh!

ChrisDenton commented Apr 19, 2025

Uh oh!

bors commented Apr 19, 2025

Uh oh!

bors commented Apr 19, 2025

Uh oh!

bors commented Apr 19, 2025

Uh oh!

Uh oh!

github-actions bot commented Apr 19, 2025

Test differences

Stage 0

Stage 1

Stage 2

Job duration changes

Uh oh!

rust-timer commented Apr 19, 2025

Uh oh!

rust-timer commented Apr 19, 2025

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Uh oh!