`tests/ui`: A New Order [21/N] #143296

Kivooeo · 2025-07-01T19:43:04Z

Note

Intermediate commits are intended to help review, but will be squashed prior to merge.

Some tests/ui/ housekeeping, to trim down number of tests directly under tests/ui/. Part of #133895.

tests/ui/closures/closure-no-copy-mut-env.rs

tgross35 · 2025-07-04T03:52:03Z

tests/ui/layout/nullable-pointer-size-optimization.rs

+//! Verifies that Option<T> has the same size as T for nullable pointer types,
+//! and that custom enums get the same optimization.


Slight correction

Suggested change

//! Verifies that Option<T> has the same size as T for nullable pointer types,

//! and that custom enums get the same optimization.

//! Verifies that Option<T> has the same size as T for non-nullable pointer types,

//! and for custom enums that have a niche.

tgross35 · 2025-07-04T03:54:52Z

tests/ui/layout/nullable-pointer-optimization.rs

@@ -1,27 +1,34 @@
-//@ run-pass
+//! Nullable pointer optimization with iota-reduction for enums.


The term should be "null pointer optimization", not "nullable"; because types like &T and Box<T> are not nullable.

Also for the file name

tgross35 · 2025-07-04T03:55:07Z

tests/ui/layout/nullable-pointer-size-optimization.rs

@@ -1,31 +1,41 @@
+//! Nullable pointer optimization preserves type sizes.


Nullable -> Null (also the file name)

tgross35

Few small comments, please also squash!

Kivooeo · 2025-07-04T19:42:07Z

@rustbot ready

tgross35 · 2025-07-04T19:50:38Z

tests/ui/layout/null-pointer-size-optimization.rs

@@ -1,31 +1,41 @@
+//! null pointer optimization preserves type sizes.
+//!
+//! Verifies that Option<T> has the same size as T for null pointer types,


"null" -> "non-nullable" (A strictly-null pointer type would be a ZST :D )

names also should be non-null in both tests?

nvm, just hopes that not, pushed as it replaced null with non-null

So for some context here: NPO (null pointer optimization) is an optimization on non-nullable pointer types (&T, Box<T>, etc) using the null representation. (I know, a bit confusing). Basically it knows that &T has an identical layout to *T; but &T can never be 0x0, because that it's a non-nullable type. So that is what's known as a "niche", and it can use that to store something; e.g. for Option<&T>, 0x0 means None (since it can't be &T) and any other value is Some(&T).

All that to say that comment should be "...same size as T for non-nullable pointer types", since the type has to be non-nullable for NPO to mean anything (so what you have is 👍). And then the test could be named null-pointer-optimization-sizes.rs or npo-sizes.rs (keeping null-pointer-optimization together rather than putting size in the middle)

so last changes should be fine, thanks for detailed explanation!

oh, wait need some adjustments

now i believe should be fine

Sorry, I was asking for one last thing 😄 null-pointer-size-optimization.rs -> null-pointer-optimization-sizes.rs since "null pointer optimization" is a phrase

Looks like it's still at tests/ui/layout/null-pointer-size-optimization.rs?

oh wait again then! for some reasons this message didnt rendered on my side 0_0

ready, also recheck comments in those tests

tgross35 · 2025-07-04T20:58:04Z

Thank you!
@bors r+ rollup

bors · 2025-07-04T20:58:07Z

📌 Commit 62ada47 has been approved by tgross35

It is now in the queue for this repository.

Rollup of 11 pull requests Successful merges: - #142440 (`tests/ui`: A New Order [14/N]) - #143040 (Add `const Rem`) - #143086 (Update poison.rs to fix the typo (sys->sync)) - #143202 (`tests/ui`: A New Order [18/N]) - #143296 (`tests/ui`: A New Order [21/N]) - #143297 (`tests/ui`: A New Order [22/N]) - #143299 (`tests/ui`: A New Order [24/N]) - #143300 (`tests/ui`: A New Order [25/N]) - #143397 (test passing a `VaList` from rust to C) - #143410 (Block SIMD in transmute_immediate; delete `OperandValueKind`) - #143452 (Fix CLI completion check in `tidy`) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #143296 - Kivooeo:tf21, r=tgross35 `tests/ui`: A New Order [21/N] > [!NOTE] > > Intermediate commits are intended to help review, but will be squashed prior to merge. Some `tests/ui/` housekeeping, to trim down number of tests directly under `tests/ui/`. Part of #133895. r? `@tgross35`

rustbot assigned tgross35 Jul 1, 2025

rustbot added 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. labels Jul 1, 2025

samueltardieu reviewed Jul 1, 2025

View reviewed changes

tests/ui/closures/closure-no-copy-mut-env.rs Outdated Show resolved Hide resolved

Kivooeo force-pushed the tf21 branch from ec5dfec to 796fcf8 Compare July 1, 2025 23:08

tgross35 reviewed Jul 4, 2025

View reviewed changes

tgross35 requested changes Jul 4, 2025

View reviewed changes

rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 4, 2025

moved tests

9ad98f7

Kivooeo force-pushed the tf21 branch from 796fcf8 to de1d76b Compare July 4, 2025 19:41

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 4, 2025

tgross35 reviewed Jul 4, 2025

View reviewed changes

Kivooeo force-pushed the tf21 branch 2 times, most recently from 50f65e8 to 1778762 Compare July 4, 2025 20:21

cleaned up some tests

62ada47

Kivooeo force-pushed the tf21 branch from 1778762 to 62ada47 Compare July 4, 2025 20:26

tgross35 approved these changes Jul 4, 2025

View reviewed changes

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 Jul 4, 2025

workingjubilee mentioned this pull request Jul 5, 2025

Rollup of 11 pull requests #143473

Merged

bors merged commit 19a7f0f into rust-lang:master Jul 5, 2025
11 checks passed

rustbot added this to the 1.90.0 milestone Jul 5, 2025

		//! Verifies that Option<T> has the same size as T for nullable pointer types,
		//! and that custom enums get the same optimization.

		@@ -1,27 +1,34 @@
		//@ run-pass
		//! Nullable pointer optimization with iota-reduction for enums.

		@@ -1,31 +1,41 @@
		//! Nullable pointer optimization preserves type sizes.

tests/ui: A New Order [21/N] #143296

tests/ui: A New Order [21/N] #143296

Uh oh!

Conversation

Kivooeo commented Jul 1, 2025

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tgross35 left a comment

Choose a reason for hiding this comment

Uh oh!

Kivooeo commented Jul 4, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tgross35 Jul 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tgross35 commented Jul 4, 2025

Uh oh!

bors commented Jul 4, 2025

Uh oh!

Uh oh!

Uh oh!

`tests/ui`: A New Order [21/N] #143296

`tests/ui`: A New Order [21/N] #143296

tgross35 Jul 4, 2025 •

edited

Loading