finish `RegionKind` renaming by lcnr · Pull Request #117908 · rust-lang/rust

lcnr · 2023-11-14T12:44:23Z

continues the work from #117876. While working on this and I encountered a bunch of further cleanup which I'll either open a tracking issue for or will do in a separate PR:

rewrite the RegionKind docs, they still talk about ReEmpty and are generally out of date
rename DescriptionCtx to DescriptionCtxt (already inconsistent)
what is CheckRegions::Bound?
collect_late_bound_regions et al
erase_late_bound_regions -> instantiate_bound_regions_with_erased?
EraseEarlyRegions visitor should be removed, feels duplicate

r? @BoxyUwU

rustbot · 2023-11-14T12:44:35Z

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

This PR changes Stable MIR

cc @oli-obk, @celinval, @spastorino, @ouz-a

rustbot · 2023-11-14T12:51:10Z

This PR changes Stable MIR

cc @oli-obk, @celinval, @spastorino, @ouz-a

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

- `ReFree` -> `ReLateParam` - `ReEarlyBound` -> `ReEarlyParam`

BoxyUwU · 2023-11-14T13:25:30Z

compiler/rustc_infer/src/infer/free_regions.rs

-        assert!(r_a.is_free());
-        assert!(r_b.is_free());
+        debug!("lub_param_regions(r_a={:?}, r_b={:?})", r_a, r_b);
+        assert!(r_a.is_late_or_early_param());


would it be reasonable to just call this is_param() I feel like that wouldn't be a confusing name

BoxyUwU · 2023-11-14T13:27:08Z

compiler/rustc_infer/src/infer/mod.rs

+    ///
+    /// FIXME(@lcnr): This can also store a `DefId`, similar to
+    /// `TypeVariableOriginKind::TypeParameterDefinition`.
+    RegionParameterDefinition(Span, Symbol),


is this used for late and early bound parameters?

only early bound, copied he name from TypeVariableOriginKind

lcnr · 2023-11-14T13:42:01Z

@bors r=BoxyUwU rollup=never p=1

bors · 2023-11-14T13:42:04Z

📌 Commit 8fcbd19 has been approved by BoxyUwU

It is now in the queue for this repository.

bors · 2023-11-14T15:07:17Z

⌛ Testing commit 8fcbd19 with merge 3da0593...

finish `RegionKind` renaming second step of rust-lang/types-team#95 continues the work from rust-lang#117876. While working on this and I encountered a bunch of further cleanup which I'll either open a tracking issue for or will do in a separate PR: - rewrite the `RegionKind` docs, they still talk about `ReEmpty` and are generally out of date - rename `DescriptionCtx` to `DescriptionCtxt` - what is `CheckRegions::Bound`? - `collect_late_bound_regions` et al - `erase_late_bound_regions` -> `instantiate_bound_regions_with_erased`? - `EraseEarlyRegions` visitor should be removed, feels duplicate r? `@BoxyUwU`

bors · 2023-11-14T15:24:28Z

💔 Test failed - checks-actions

lcnr · 2023-11-15T01:25:17Z

@bors p=1 r=BoxyUwU

bors · 2023-11-15T01:25:20Z

📌 Commit 18281d3 has been approved by BoxyUwU

It is now in the queue for this repository.

bors · 2023-11-15T01:26:32Z

⌛ Testing commit 18281d3 with merge 316629e...

finish `RegionKind` renaming second step of rust-lang/types-team#95 continues the work from rust-lang#117876. While working on this and I encountered a bunch of further cleanup which I'll either open a tracking issue for or will do in a separate PR: - rewrite the `RegionKind` docs, they still talk about `ReEmpty` and are generally out of date - rename `DescriptionCtx` to `DescriptionCtxt` - what is `CheckRegions::Bound`? - `collect_late_bound_regions` et al - `erase_late_bound_regions` -> `instantiate_bound_regions_with_erased`? - `EraseEarlyRegions` visitor should be removed, feels duplicate r? `@BoxyUwU`

bors · 2023-11-15T01:30:40Z

💔 Test failed - checks-actions

rust-log-analyzer · 2023-11-15T01:34:12Z

A job failed! Check out the build log: (web) (plain)

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

BoxyUwU · 2023-11-15T11:48:34Z

@bors retry

bors · 2023-11-15T12:55:46Z

⌛ Testing commit 18281d3 with merge 1500db7...

bors · 2023-11-15T14:54:26Z

☀️ Test successful - checks-actions
Approved by: BoxyUwU
Pushing 1500db7 to master...

rust-timer · 2023-11-15T16:17:48Z

Finished benchmarking commit (1500db7): 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

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.7%	[0.6%, 0.8%]	2
Regressions ❌ (secondary)	3.8%	[3.8%, 3.8%]	1
Improvements ✅ (primary)	-0.4%	[-0.4%, -0.4%]	2
Improvements ✅ (secondary)	-2.4%	[-2.4%, -2.4%]	1
All ❌✅ (primary)	0.1%	[-0.4%, 0.8%]	4

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: 673.093s -> 674.821s (0.26%)
Artifact size: 311.10 MiB -> 311.10 MiB (0.00%)

rustbot assigned BoxyUwU Nov 14, 2023

finish RegionKind rename

15f2156

- `ReFree` -> `ReLateParam` - `ReEarlyBound` -> `ReEarlyParam`

rust-cloud-vms bot force-pushed the region-kind-rename branch from 1215a28 to 15f2156 Compare November 14, 2023 13:13

This comment has been minimized.

Sign in to view

BoxyUwU reviewed Nov 14, 2023

View reviewed changes

review + fix CI

8fcbd19

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 Nov 14, 2023

This comment has been minimized.

Sign in to view

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 Nov 14, 2023

fix doc link

18281d3

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 Nov 15, 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 Nov 15, 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 Nov 15, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 15, 2023

bors merged commit 1500db7 into rust-lang:master Nov 15, 2023

rustbot added this to the 1.76.0 milestone Nov 15, 2023

bors mentioned this pull request Nov 15, 2023

Uplift InferConst to rustc_type_ir #117851

Merged

lcnr deleted the region-kind-rename branch November 15, 2023 16:44

fmease mentioned this pull request Mar 11, 2024

Treat weak alias types more like ADTs when computing implied bounds #122340

Closed

Uh oh!

Conversation

lcnr commented Nov 14, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Nov 14, 2023

Uh oh!

rustbot commented Nov 14, 2023

Uh oh!

This comment has been minimized.

BoxyUwU Nov 14, 2023

Choose a reason for hiding this comment

Uh oh!

BoxyUwU Nov 14, 2023

Choose a reason for hiding this comment

Uh oh!

lcnr Nov 14, 2023

Choose a reason for hiding this comment

Uh oh!

lcnr commented Nov 14, 2023

Uh oh!

bors commented Nov 14, 2023

Uh oh!

This comment has been minimized.

bors commented Nov 14, 2023

Uh oh!

This comment has been minimized.

bors commented Nov 14, 2023

Uh oh!

lcnr commented Nov 15, 2023

Uh oh!

bors commented Nov 15, 2023

Uh oh!

bors commented Nov 15, 2023

Uh oh!

bors commented Nov 15, 2023

Uh oh!

rust-log-analyzer commented Nov 15, 2023

Uh oh!

BoxyUwU commented Nov 15, 2023

Uh oh!

bors commented Nov 15, 2023

Uh oh!

bors commented Nov 15, 2023

Uh oh!

rust-timer commented Nov 15, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

lcnr commented Nov 14, 2023 •

edited

Loading