Move methods from `Map` to `TyCtxt`, part 2. #137162

nnethercote · 2025-02-17T05:28:31Z

Continuing the work started in #136466.

Every method gains a hir_ prefix, though for the ones that already have a par_ or try_par_ prefix I added the hir_ after that.

r? Zalathar

rustbot · 2025-02-17T05:28:42Z

Some changes occurred in need_type_info.rs

cc @lcnr

Some changes occurred in match checking

cc @Nadrieril

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

changes to the core type system

cc @compiler-errors, @lcnr

Some changes occurred to the CTFE machinery

cc @rust-lang/wg-const-eval

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

HIR ty lowering was modified

cc @fmease

The rustc-dev-guide subtree was changed. If this PR only touches the dev guide consider submitting a PR directly to rust-lang/rustc-dev-guide otherwise thank you for updating the dev guide with your changes.

cc @BoxyUwU, @jieyouxu, @Kobzol

Some changes occurred in coverage instrumentation.

cc @Zalathar

Some changes occurred in compiler/rustc_passes/src/check_attr.rs

cc @jdonszelmann

nnethercote · 2025-02-17T05:29:14Z

Only the final commit here is new, everything else is from #136466 and can be ignored.

cc @cjgillot

compiler/rustc_hir/src/intravisit.rs

rustbot · 2025-02-17T06:17:27Z

changes to the core type system

cc @compiler-errors, @lcnr

Some changes occurred in match checking

cc @Nadrieril

Some changes occurred in compiler/rustc_passes/src/check_attr.rs

cc @jdonszelmann

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

HIR ty lowering was modified

cc @fmease

Some changes occurred in coverage instrumentation.

cc @Zalathar

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred to the CTFE machinery

cc @rust-lang/wg-const-eval

Some changes occurred in need_type_info.rs

cc @lcnr

The rustc-dev-guide subtree was changed. If this PR only touches the dev guide consider submitting a PR directly to rust-lang/rustc-dev-guide otherwise thank you for updating the dev guide with your changes.

cc @BoxyUwU, @jieyouxu, @Kobzol

Zalathar · 2025-02-17T06:56:57Z

LGTM; I'll come back to this after #136466 lands.

bors · 2025-02-17T12:19:26Z

☔ The latest upstream changes (presumably #137163) made this pull request unmergeable. Please resolve the merge conflicts.

Continuing the work started in rust-lang#136466. Every method gains a `hir_` prefix, though for the ones that already have a `par_` or `try_par_` prefix I added the `hir_` after that.

nnethercote · 2025-02-17T23:21:59Z

@Zalathar: I updated, there's just the single relevant commit now.

@bors p=1 (conflict-prone)

Zalathar · 2025-02-18T01:00:16Z

@bors r+

bors · 2025-02-18T01:00:20Z

📌 Commit fd7b4bf has been approved by Zalathar

It is now in the queue for this repository.

Move methods from `Map` to `TyCtxt`, part 2. Continuing the work started in rust-lang#136466. Every method gains a `hir_` prefix, though for the ones that already have a `par_` or `try_par_` prefix I added the `hir_` after that. r? Zalathar

Rollup of 8 pull requests Successful merges: - rust-lang#135767 (Future incompatibility warning `unsupported_fn_ptr_calling_conventions`: Also warn in dependencies) - rust-lang#136457 (Expose algebraic floating point intrinsics) - rust-lang#136985 (Do not ignore uninhabited types for function-call ABI purposes. (Remove BackendRepr::Uninhabited)) - rust-lang#137000 (Deeply normalize item bounds in new solver) - rust-lang#137151 (Install more signal stack trace handlers) - rust-lang#137155 (Organize `OsString`/`OsStr` shims) - rust-lang#137161 (Pattern Migration 2024: fix incorrect messages/suggestions when errors arise in macro expansions) - rust-lang#137162 (Move methods from `Map` to `TyCtxt`, part 2.) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2025-02-18T04:26:33Z

⌛ Testing commit fd7b4bf with merge aaa8614...

bors · 2025-02-18T07:41:36Z

☀️ Test successful - checks-actions
Approved by: Zalathar
Pushing aaa8614 to master...

rust-timer · 2025-02-18T08:59:20Z

Finished benchmarking commit (aaa8614): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

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

Max RSS (memory usage)

Results (primary -2.4%)

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

Cycles

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

Binary size

Results (secondary -0.0%)

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

Bootstrap: 772.861s -> 774.633s (0.23%)
Artifact size: 362.36 MiB -> 362.36 MiB (0.00%)

Continuing the work from rust-lang#137162. Every method gains a `hir_` prefix.

Move methods from Map to TyCtxt, part 3. A follow-up to rust-lang#137162. r? `@Zalathar`

Rollup merge of rust-lang#137350 - nnethercote:remove-Map-3, r=Zalathar Move methods from Map to TyCtxt, part 3. A follow-up to rust-lang#137162. r? `@Zalathar`

Changes to attribute parsing and representation rust-lang/rust#135726 Map methods moved to `TyCtx` rust-lang/rust#137162 rust-lang/rust#137397 Remove `BackendRepr::Unihabited` rust-lang/rust#136985

Continuing the work from rust-lang#137162. Every method gains a `hir_` prefix.

Changes to attribute parsing and representation rust-lang/rust#135726 Map methods moved to `TyCtx` rust-lang/rust#137162 rust-lang/rust#137397 Remove `BackendRepr::Unihabited` rust-lang/rust#136985 Intrinsics rint, roundeven, nearbyint replaced by `round_ties_even`. rust-lang/rust#136543. Use `__sort_of_CPROVER_round_to_integral` to model `round_ties_even`. Rename `sub_ptr` to `offset_from_unsigned`. The feature gate is still `ptr_sub_ptr`. rust-lang/rust#137483. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses. --------- Co-authored-by: Remi Delmas <delmasrd@amazon.com>

rustbot assigned Zalathar Feb 17, 2025

This comment has been minimized.

# to view

Zalathar reviewed Feb 17, 2025

View reviewed changes

compiler/rustc_hir/src/intravisit.rs Show resolved Hide resolved

nnethercote force-pushed the remove-Map-2 branch from ed74d07 to 8e61194 Compare February 17, 2025 06:17

Move methods from Map to TyCtxt, part 2.

fd7b4bf

Continuing the work started in rust-lang#136466. Every method gains a `hir_` prefix, though for the ones that already have a `par_` or `try_par_` prefix I added the `hir_` after that.

nnethercote force-pushed the remove-Map-2 branch from 8e61194 to fd7b4bf Compare February 17, 2025 23:20

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 Feb 18, 2025

Zalathar mentioned this pull request Feb 18, 2025

Rollup of 8 pull requests #137199

Closed

bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 18, 2025

bors merged commit aaa8614 into rust-lang:master Feb 18, 2025
7 checks passed

rustbot added this to the 1.87.0 milestone Feb 18, 2025

nnethercote deleted the remove-Map-2 branch February 18, 2025 08:47

nnethercote added a commit to nnethercote/rust that referenced this pull request Feb 20, 2025

Move methods from Map to TyCtxt, part 3.

1445974

Continuing the work from rust-lang#137162. Every method gains a `hir_` prefix.

nnethercote mentioned this pull request Feb 20, 2025

Move methods from Map to TyCtxt, part 3. #137350

Merged

nnethercote added a commit to nnethercote/rust that referenced this pull request Feb 21, 2025

Move methods from Map to TyCtxt, part 3.

8f926cf

Continuing the work from rust-lang#137162. Every method gains a `hir_` prefix.

nnethercote added a commit to nnethercote/rust that referenced this pull request Feb 21, 2025

Move methods from Map to TyCtxt, part 3.

806be25

Continuing the work from rust-lang#137162. Every method gains a `hir_` prefix.

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 21, 2025

Rollup merge of rust-lang#137350 - nnethercote:remove-Map-3, r=Zalathar

a24eb0b

Move methods from Map to TyCtxt, part 3. A follow-up to rust-lang#137162. r? `@Zalathar`

remi-delmas-3000 mentioned this pull request Feb 26, 2025

Update toolchain to 2025-03-02 model-checking/kani#3911

Merged

flip1995 pushed a commit to flip1995/rust that referenced this pull request Feb 27, 2025

Move methods from Map to TyCtxt, part 3.

c2d75cf

Continuing the work from rust-lang#137162. Every method gains a `hir_` prefix.

nnethercote mentioned this pull request Apr 3, 2025

Move methods from Map to TyCtxt, part 5. #139232

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Move methods from `Map` to `TyCtxt`, part 2. #137162

Move methods from `Map` to `TyCtxt`, part 2. #137162

Uh oh!

nnethercote commented Feb 17, 2025

Uh oh!

rustbot commented Feb 17, 2025

Uh oh!

nnethercote commented Feb 17, 2025 •

edited

Loading

Uh oh!

This comment has been minimized.

Uh oh!

rustbot commented Feb 17, 2025

Uh oh!

Zalathar commented Feb 17, 2025

Uh oh!

bors commented Feb 17, 2025

Uh oh!

nnethercote commented Feb 17, 2025

Uh oh!

Zalathar commented Feb 18, 2025

Uh oh!

bors commented Feb 18, 2025

Uh oh!

bors commented Feb 18, 2025

Uh oh!

bors commented Feb 18, 2025

Uh oh!

Uh oh!

rust-timer commented Feb 18, 2025

Uh oh!

Uh oh!

Move methods from Map to TyCtxt, part 2. #137162

Move methods from Map to TyCtxt, part 2. #137162

Uh oh!

Conversation

nnethercote commented Feb 17, 2025

Uh oh!

rustbot commented Feb 17, 2025

Uh oh!

nnethercote commented Feb 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

Uh oh!

rustbot commented Feb 17, 2025

Uh oh!

Zalathar commented Feb 17, 2025

Uh oh!

bors commented Feb 17, 2025

Uh oh!

nnethercote commented Feb 17, 2025

Uh oh!

Zalathar commented Feb 18, 2025

Uh oh!

bors commented Feb 18, 2025

Uh oh!

bors commented Feb 18, 2025

Uh oh!

bors commented Feb 18, 2025

Uh oh!

Uh oh!

rust-timer commented Feb 18, 2025

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Uh oh!

Move methods from `Map` to `TyCtxt`, part 2. #137162

Move methods from `Map` to `TyCtxt`, part 2. #137162

nnethercote commented Feb 17, 2025 •

edited

Loading