Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Feb 18, 2025
Merged

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

merged 1 commit into from
Feb 18, 2025

Conversation

nnethercote
Copy link
Contributor

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 rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-rustc-dev-guide Area: rustc-dev-guide A-rustdoc-json Area: Rustdoc JSON backend 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. labels Feb 17, 2025
@rustbot
Copy link
Collaborator

rustbot commented Feb 17, 2025

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
Copy link
Contributor Author

nnethercote commented Feb 17, 2025 •
edited
Loading

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

cc @cjgillot

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rustbot
Copy link
Collaborator

rustbot commented Feb 17, 2025

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
Copy link
Contributor

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

@bors
Copy link
Contributor

bors commented Feb 17, 2025

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

@nnethercote
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
Copy link
Contributor Author

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

@bors p=1 (conflict-prone)

@Zalathar
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Feb 18, 2025

📌 Commit fd7b4bf has been approved by Zalathar

It is now in the queue for this repository.

@bors 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 added a commit to Zalathar/rust that referenced this pull request Feb 18, 2025
@Zalathar
Rollup merge of rust-lang#137162 - nnethercote:remove-Map-2, r=Zalathar
2807d0a 
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
@Zalathar Zalathar mentioned this pull request Feb 18, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 18, 2025
@bors
Auto merge of rust-lang#137199 - Zalathar:rollup-18ux22s, r=Zalathar
54f47f8 
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
Copy link
Contributor

bors commented Feb 18, 2025

⌛ Testing commit fd7b4bf with merge aaa8614...

@bors
Copy link
Contributor

bors commented Feb 18, 2025

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 18, 2025
@bors bors merged commit aaa8614 into rust-lang:master Feb 18, 2025
7 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Feb 18, 2025
This was referenced Feb 18, 2025
Open
Draft
Draft
Draft
Open
Open
Closed
@nnethercote nnethercote deleted the remove-Map-2 branch February 18, 2025 08:47
@rust-timer
Copy link
Collaborator

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%)

nnethercote added a commit to nnethercote/rust that referenced this pull request Feb 20, 2025
@nnethercote
Move methods from Map to TyCtxt, part 3.
1445974 
Continuing the work from rust-lang#137162.

Every method gains a `hir_` prefix.
@nnethercote nnethercote mentioned this pull request Feb 20, 2025
Merged
nnethercote added a commit to nnethercote/rust that referenced this pull request Feb 21, 2025
@nnethercote
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
@nnethercote
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
@matthiaskrgr
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`
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 21, 2025
@rust-timer
Unrolled build for rust-lang#137350
e3b7a84 
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`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Zalathar Zalathar Zalathar left review comments

Assignees

@Zalathar Zalathar

Labels
A-attributes Area: Attributes (`#[…]`, `#![…]`) A-rustc-dev-guide Area: rustc-dev-guide A-rustdoc-json Area: Rustdoc JSON backend merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.
Projects
None yet
Milestone
1.87.0
Development

Successfully merging this pull request may close these issues.
6 participants
@nnethercote @rustbot @rust-log-analyzer @Zalathar @bors @rust-timer