Remove `IdFunctor` trait. #116830

nnethercote · 2023-10-17T03:32:36Z

It's defined in rustc_data_structures but is only used in
rustc_type_ir. The code is shorter and easier to read if we remove
this layer of abstraction and just do the things directly where they are
needed.

r? @BoxyUwU

nnethercote · 2023-10-17T03:34:00Z

Best reviewed one commit at a time.

Shouldn't affect speed, but let's check because the type folding code is hot:

@bors try @rust-timer queue

bors · 2023-10-17T03:35:09Z

⌛ Trying commit fd35413 with merge ca181d6...

Remove `IdFunctor` trait. It's defined in `rustc_data_structures` but is only used in `rustc_type_ir`. The code is shorter and easier to read if we remove this layer of abstraction and just do the things directly where they are needed. r? `@BoxyUwU`

bors · 2023-10-17T04:57:58Z

☀️ Try build successful - checks-actions
Build commit: ca181d6 (ca181d6c8609d7961a9f334f83e0ab90e1c73bea)

It's defined in `rustc_data_structures` but is only used in `rustc_type_ir`. The code is shorter and easier to read if we remove this layer of abstraction and just do the things directly where they are needed.

It can be written more simply, without needing `unsafe`.

rust-timer · 2023-10-17T15:08:15Z

Finished benchmarking commit (ca181d6): comparison URL.

Overall result: no relevant changes - no action needed

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

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

Max RSS (memory usage)

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

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

Binary size

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

Bootstrap: 624.881s -> 626.035s (0.18%)
Artifact size: 305.58 MiB -> 305.54 MiB (-0.01%)

compiler-errors · 2023-10-17T17:02:24Z

pls fix CI by adding allocator_api back, then r=me

nnethercote · 2023-10-17T21:13:23Z

pls fix CI by adding allocator_api back, then r=me

Done.

@bors r=compiler-errors

bors · 2023-10-17T21:13:25Z

📌 Commit 178ba0e has been approved by compiler-errors

It is now in the queue for this repository.

bors · 2023-10-17T23:11:37Z

⌛ Testing commit 178ba0e with merge b534e74...

…r-errors Remove `IdFunctor` trait. It's defined in `rustc_data_structures` but is only used in `rustc_type_ir`. The code is shorter and easier to read if we remove this layer of abstraction and just do the things directly where they are needed. r? `@BoxyUwU`

rust-log-analyzer · 2023-10-18T00:02:02Z

The job aarch64-gnu failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

test [run-make] tests/run-make/thumb-none-cortex-m ... ignored, only executed when the architecture is part of the Thumb family
test [run-make] tests/run-make/thumb-none-qemu ... ignored, only executed when the architecture is part of the Thumb family
test [run-make] tests/run-make/symlinked-extern ... ok
test [run-make] tests/run-make/track-pgo-dep-info ... ok
##[error]The runner has received a shutdown signal. This can happen when the runner service is stopped, or a manually started runner is canceled.
test [run-make] tests/run-make/test-harness ... ok
test [run-make] tests/run-make/rustdoc-verify-output-files ... ok
test [run-make] tests/run-make/target-specs ... ok
test [run-make] tests/run-make/unstable-flag-required ... ok
test [run-make] tests/run-make/unstable-flag-required ... ok
test [run-make] tests/run-make/unknown-mod-stdin ... ok

##[group]Clock drift check
  local time: Wed Oct 18 00:01:47 UTC 2023
Session terminated, killing shell... ...killed.
##[error]The operation was canceled.
Cleaning up orphan processes

bors · 2023-10-18T00:03:37Z

💔 Test failed - checks-actions

compiler-errors · 2023-10-18T00:04:18Z

spurious?

@bors retry

bors · 2023-10-18T03:55:40Z

⌛ Testing commit 178ba0e with merge 862bba6...

bors · 2023-10-18T05:50:33Z

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing 862bba6 to master...

rust-timer · 2023-10-18T08:11:28Z

Finished benchmarking commit (862bba6): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

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.4%	[0.4%, 0.4%]	1
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)	3.6%	[3.6%, 3.6%]	1
Improvements ✅ (primary)	-1.2%	[-1.8%, -0.6%]	2
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-1.2%	[-1.8%, -0.6%]	2

Cycles

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

Binary size

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

Bootstrap: 631.742s -> 631.005s (-0.12%)
Artifact size: 304.01 MiB -> 304.02 MiB (0.01%)

rustbot assigned BoxyUwU Oct 17, 2023

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

This comment has been minimized.

Sign in to view

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Oct 17, 2023

This comment has been minimized.

Sign in to view

nnethercote added 3 commits October 17, 2023 16:26

Remove unused features from rustc_data_structures.

4175c9b

Remove IdFunctor trait.

847c8ba

It's defined in `rustc_data_structures` but is only used in `rustc_type_ir`. The code is shorter and easier to read if we remove this layer of abstraction and just do the things directly where they are needed.

Rewrite Box<T>::try_fold_with.

178ba0e

It can be written more simply, without needing `unsafe`.

rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Oct 17, 2023

compiler-errors assigned compiler-errors and unassigned BoxyUwU Oct 17, 2023

nnethercote force-pushed the rustc_type_ir branch from fd35413 to 178ba0e Compare October 17, 2023 21:12

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 17, 2023

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 18, 2023

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 18, 2023

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

bors merged commit 862bba6 into rust-lang:master Oct 18, 2023
12 checks passed

rustbot added this to the 1.75.0 milestone Oct 18, 2023

nnethercote deleted the rustc_type_ir branch October 18, 2023 06:08

compiler-errors mentioned this pull request Oct 18, 2023

Begin to abstract rustc_type_ir for rust-analyzer #116828

Merged

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

Automated pull from upstream master ferrocene/ferrocene#74

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove `IdFunctor` trait. #116830

Remove `IdFunctor` trait. #116830

nnethercote commented Oct 17, 2023

nnethercote commented Oct 17, 2023

This comment has been minimized.

bors commented Oct 17, 2023

This comment has been minimized.

bors commented Oct 17, 2023

This comment has been minimized.

rust-timer commented Oct 17, 2023

compiler-errors commented Oct 17, 2023

nnethercote commented Oct 17, 2023

bors commented Oct 17, 2023

bors commented Oct 17, 2023

rust-log-analyzer commented Oct 18, 2023

bors commented Oct 18, 2023

compiler-errors commented Oct 18, 2023

bors commented Oct 18, 2023

bors commented Oct 18, 2023

rust-timer commented Oct 18, 2023

Remove IdFunctor trait. #116830

Remove IdFunctor trait. #116830

Conversation

nnethercote commented Oct 17, 2023

nnethercote commented Oct 17, 2023

This comment has been minimized.

bors commented Oct 17, 2023

This comment has been minimized.

bors commented Oct 17, 2023

This comment has been minimized.

rust-timer commented Oct 17, 2023

Overall result: no relevant changes - no action needed

compiler-errors commented Oct 17, 2023

nnethercote commented Oct 17, 2023

bors commented Oct 17, 2023

bors commented Oct 17, 2023

rust-log-analyzer commented Oct 18, 2023

bors commented Oct 18, 2023

compiler-errors commented Oct 18, 2023

bors commented Oct 18, 2023

bors commented Oct 18, 2023

rust-timer commented Oct 18, 2023

Overall result: ❌ regressions - no action needed

Remove `IdFunctor` trait. #116830

Remove `IdFunctor` trait. #116830