Rollup of 7 pull requests #116923

fmease · 2023-10-19T02:34:49Z

Successful merges:

Don't ICE when encountering unresolved regions in fully_resolve #116663 (Don't ICE when encountering unresolved regions in fully_resolve)
Fix podman detection in CI scripts #116761 (Fix podman detection in CI scripts)
Add #[track_caller] to Option::unwrap_or_else #116795 (Add #[track_caller] to Option::unwrap_or_else)
Make #[repr(Rust)] incompatible with other (non-modifier) representation hints like C and simd #116829 (Make #[repr(Rust)] incompatible with other (non-modifier) representation hints like C and simd)
Change my name in mailmap #116883 (Change my name in mailmap)
Tweak wording of type errors involving type params #116908 (Tweak wording of type errors involving type params)
Some renaming nits for rustc_type_ir #116912 (Some renaming nits for rustc_type_ir)

r? @ghost
@rustbot modify labels: rollup

When docker-podman compat was set up in a way that causes "docker" to be the argv[0] of podman, the previous detection did not work. This was for example the case in the compat package from nixpkgs. This checks the output and should work everywhere.

Fix rust-lang#78206.

…=lcnr Don't ICE when encountering unresolved regions in `fully_resolve` We can encounter unresolved regions due to unconstrained impl lifetime arguments because `collect_return_position_impl_trait_in_trait_tys` runs before WF actually checks that the impl is well-formed. Fixes rust-lang#116525

Fix podman detection in CI scripts When docker-podman compat was set up in a way that causes "docker" to be the argv[0] of podman, the previous detection did not work. This was for example the case in the compat package from nixpkgs. This checks the output and should work everywhere. I tested it locally by executing ```sh if [[ "$id" != 0 && "$(docker version)" =~ Podman ]]; then echo yes else echo no fi ``` which printed `no` before, and `yes` now. fixes rust-lang#113129 r? cuviper

…uviper Add `#[track_caller]` to `Option::unwrap_or_else` Same as rust-lang#116317 but for `Option`. Closes rust-lang#115302

Make `#[repr(Rust)]` incompatible with other (non-modifier) representation hints like `C` and `simd` Read more about this change here: rust-lang#116829 (comment). Fixes [after backport] rust-lang#116825.

Change my name in mailmap I changed some things about my distro (my GPG key, along with the git username). This PR sets my committer name as `blyxyas` for those commits so that it is the same as my reviewer name in `thanks`.

…rrors Tweak wording of type errors involving type params Fix rust-lang#78206.

…shedding, r=jackh726 Some renaming nits for `rustc_type_ir` tl;dr: * `ListTy` -> `Tys` * `PlaceholderType` -> `PlaceholderTy` * `RegionVid` -> `InferRegion` * `ListBinderExistentialPredicate` -> `BoundExistentialPredicates` * `GenericArgsRef` -> `GenericArgs` r? jackh726

fmease · 2023-10-19T02:35:24Z

@bors r+ rollup=never p=7

bors · 2023-10-19T02:35:27Z

📌 Commit 8aa1d71 has been approved by fmease

It is now in the queue for this repository.

bors · 2023-10-19T03:52:35Z

⌛ Testing commit 8aa1d71 with merge 36b61e5...

bors · 2023-10-19T05:45:46Z

☀️ Test successful - checks-actions
Approved by: fmease
Pushing 36b61e5 to master...

rust-timer · 2023-10-19T05:47:44Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#116663	Don't ICE when encountering unresolved regions in `fully_re…	`4c53b9895f6aa1d145794e325a14600ce800602b` (link)
#116761	Fix podman detection in CI scripts	`bfaf7f2418a3f502a9dd3019447b148c88b248e4` (link)
#116795	Add `#[track_caller]` to `Option::unwrap_or_else`	`2085e5d18625312aa897e021958a2fed28634cdf` (link)
#116829	Make `#[repr(Rust)]` incompatible with other (non-modifier)…	`3fa0308c5df5b24e3e96a96b82883cda3f065efe` (link)
#116883	Change my name in mailmap	`835975d427c373e01766f307cd20e5e94957da99` (link)
#116908	Tweak wording of type errors involving type params	`c9ea1ff36bebe7ff0da14a43222ff7d03c1831fd` (link)
#116912	Some renaming nits for `rustc_type_ir`	`236443c0d49c5bcb1b7d0c8fab5faa1410b2c682` (link)

previous master: 020d00867a

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 · 2023-10-19T07:53:35Z

Finished benchmarking commit (36b61e5): comparison URL.

Overall result: ❌ regressions - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	0.3%	[0.2%, 0.4%]	9
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results

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)	-3.2%	[-3.8%, -2.5%]	2
All ❌✅ (primary)	-	-	0

Cycles

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

Binary size

Results

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

Bootstrap: 628.239s -> 630.37s (0.34%)
Artifact size: 303.97 MiB -> 303.99 MiB (0.01%)

fmease · 2023-10-19T12:41:57Z

Hmm, wild guess: #116795: Add #[track_caller] to Option::unwrap_or_else?

lqd · 2023-10-19T13:15:53Z

We can sure try: @rust-timer build 2085e5d

rust-timer · 2023-10-19T14:37:05Z

Finished benchmarking commit (2085e5d): comparison URL.

Overall result: no relevant changes - no action needed

Instruction count

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

Max RSS (memory usage)

Results

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)	2.0%	[2.0%, 2.0%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.6%	[-3.9%, -3.2%]	3
All ❌✅ (primary)	-	-	0

Cycles

Results

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

Binary size

Results

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

Bootstrap: 628.239s -> 629.743s (0.24%)
Artifact size: 303.97 MiB -> 303.99 MiB (0.01%)

rylev · 2023-10-27T09:12:32Z

While this very much does not look like noise, the regressions are small enough that I don't think this is really worth any investigation.

@rustbot label: +perf-regression-triaged

Noratrieb and others added 15 commits October 15, 2023 13:27

Fix podman detection in CI scripts

6ab84b5

When docker-podman compat was set up in a way that causes "docker" to be the argv[0] of podman, the previous detection did not work. This was for example the case in the compat package from nixpkgs. This checks the output and should work everywhere.

Add #[track_caller] to Option::unwrap_or_else

0df670f

Change my name in mailmap

54eef16

Make #[repr(Rust)] and #[repr(C)] incompatible with one another

d0b99e3

Don't ICE when encountering unresolved regions in fully_resolve

ea73f10

Remove unused variant BinderListTy

8d20182

Some renaming nits for rustc_type_ir

189e6a8

Tweak wording of type errors involving type params

bd8b468

Fix rust-lang#78206.

Rollup merge of rust-lang#116795 - DaniPopes:track-caller-option, r=c…

80c9588

…uviper Add `#[track_caller]` to `Option::unwrap_or_else` Same as rust-lang#116317 but for `Option`. Closes rust-lang#115302

Rollup merge of rust-lang#116829 - fmease:rust-aint-c, r=compiler-errors

2eb6e5f

Make `#[repr(Rust)]` incompatible with other (non-modifier) representation hints like `C` and `simd` Read more about this change here: rust-lang#116829 (comment). Fixes [after backport] rust-lang#116825.

Rollup merge of rust-lang#116908 - estebank:issue-78206, r=compiler-e…

64ed233

…rrors Tweak wording of type errors involving type params Fix rust-lang#78206.

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 Oct 19, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 19, 2023

bors merged commit 36b61e5 into rust-lang:master Oct 19, 2023

rustbot added this to the 1.75.0 milestone Oct 19, 2023

This was referenced Oct 19, 2023

Uplift generator movability to rustc_type_ir #116918

Closed

Uplift mutability to rustc_type_ir #116919

Closed

rustbot added the perf-regression Performance regression. label Oct 19, 2023

This comment has been minimized.

Sign in to view

rustbot added the perf-regression-triaged The performance regression has been triaged. label Oct 27, 2023

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

fmease deleted the rollup-ev7q387 branch January 26, 2025 01:28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 7 pull requests #116923

Rollup of 7 pull requests #116923

Uh oh!

fmease commented Oct 19, 2023

Uh oh!

fmease commented Oct 19, 2023

Uh oh!

bors commented Oct 19, 2023

Uh oh!

bors commented Oct 19, 2023

Uh oh!

bors commented Oct 19, 2023

Uh oh!

rust-timer commented Oct 19, 2023

Uh oh!

rust-timer commented Oct 19, 2023

Uh oh!

fmease commented Oct 19, 2023

Uh oh!

lqd commented Oct 19, 2023

Uh oh!

This comment has been minimized.

rust-timer commented Oct 19, 2023

Uh oh!

rylev commented Oct 27, 2023

Uh oh!

Uh oh!

Rollup of 7 pull requests #116923

Rollup of 7 pull requests #116923

Uh oh!

Conversation

fmease commented Oct 19, 2023

Uh oh!

fmease commented Oct 19, 2023

Uh oh!

bors commented Oct 19, 2023

Uh oh!

bors commented Oct 19, 2023

Uh oh!

bors commented Oct 19, 2023

Uh oh!

rust-timer commented Oct 19, 2023

Uh oh!

rust-timer commented Oct 19, 2023

Overall result: ❌ regressions - ACTION NEEDED

Uh oh!

fmease commented Oct 19, 2023

Uh oh!

lqd commented Oct 19, 2023

Uh oh!

This comment has been minimized.

rust-timer commented Oct 19, 2023

Overall result: no relevant changes - no action needed

Uh oh!

rylev commented Oct 27, 2023

Uh oh!

Uh oh!