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.

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

Handle rustc_metadata cases of rustc::potential_query_instability lint #131145

Conversation

ismailarilik
Copy link
Contributor

This PR removes #![allow(rustc::potential_query_instability)] line from compiler/rustc_metadata/src/lib.rs and converts FxHash{Map,Set} types into FxIndex{Map,Set} to suppress lint errors.

A somewhat tracking issue: #84447

@rustbot
Copy link
Collaborator

rustbot commented Oct 2, 2024

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @lcnr (or someone else) some time within the next two weeks.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@rustbot 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 2, 2024
@ismailarilik ismailarilik marked this pull request as ready for review October 2, 2024 06:42
@jieyouxu
Copy link
Member

jieyouxu commented Oct 2, 2024

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Oct 2, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 2, 2024
…instability_lint_for_rustc_metadata, r=<try>

Handle `rustc_metadata` cases of `rustc::potential_query_instability` lint

This PR removes `#![allow(rustc::potential_query_instability)]` line from [`compiler/rustc_metadata/src/lib.rs`](https://github.com/rust-lang/rust/blob/master/compiler/rustc_metadata/src/lib.rs#L3) and converts `FxHash{Map,Set}` types into `FxIndex{Map,Set}` to suppress lint errors.

A somewhat tracking issue: rust-lang#84447
@bors
Copy link
Contributor

bors commented Oct 2, 2024

⌛ Trying commit 1b8d81f with merge c27d1bd...

@bors
Copy link
Contributor

bors commented Oct 2, 2024

☀️ Try build successful - checks-actions
Build commit: c27d1bd (c27d1bd50a3d95971590d5c00927d509fd67c5c8)

@rust-timer

This comment has been minimized.

@compiler-errors
Copy link
Member

Using the insertion order is no worse than using the totally unstable hashing ordering, so this looks fine to me too.

r=me (i.e. I will approve) when perf returns.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (c27d1bd): comparison URL.

Overall result: ❌ regressions - 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 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.3% [0.3%, 0.3%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.3% [0.3%, 0.3%] 1

Max RSS (memory usage)

Results (primary -0.6%, secondary -1.1%)

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.9% [0.5%, 1.2%] 2
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-3.5% [-3.5%, -3.5%] 1
Improvements ✅
(secondary)
-1.1% [-1.1%, -1.1%] 1
All ❌✅ (primary) -0.6% [-3.5%, 1.2%] 3

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: 770.256s -> 770.149s (-0.01%)
Artifact size: 341.54 MiB -> 341.54 MiB (-0.00%)

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Oct 2, 2024
@compiler-errors
Copy link
Member

Noise.

@bors r+

@bors
Copy link
Contributor

bors commented Oct 3, 2024

📌 Commit 1b8d81f has been approved by compiler-errors

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 Oct 3, 2024
@bors
Copy link
Contributor

bors commented Oct 3, 2024

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

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 3, 2024
@rustbot rustbot added the has-merge-commits PR has merge commits, merge with caution. label Oct 3, 2024
@rustbot
Copy link
Collaborator

rustbot commented Oct 3, 2024

There are merge commits (commits with multiple parents) in your changes. We have a no merge policy so these commits will need to be removed for this pull request to be merged.

You can start a rebase with the following commands:

$ # rebase
$ git pull --rebase https://github.com/rust-lang/rust.git master
$ git push --force-with-lease

The following commits are merge commits:

@ismailarilik ismailarilik force-pushed the handle_potential_query_instability_lint_for_rustc_metadata branch from 6eba9da to a37edfc Compare October 3, 2024 05:27
@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc labels Oct 3, 2024
@ismailarilik ismailarilik force-pushed the handle_potential_query_instability_lint_for_rustc_metadata branch from a37edfc to 3d8bd6b Compare October 3, 2024 05:39
@ismailarilik ismailarilik marked this pull request as ready for review October 3, 2024 05:39
@ismailarilik
Copy link
Contributor Author

@bors r+

@bors
Copy link
Contributor

bors commented Oct 3, 2024

@ismailarilik: 🔑 Insufficient privileges: Not in reviewers

@ismailarilik
Copy link
Contributor Author

@bors rollup

@bors
Copy link
Contributor

bors commented Oct 3, 2024

@ismailarilik: 🔑 Insufficient privileges: not in try users

@ismailarilik
Copy link
Contributor Author

@rustbot label S-waiting-on-bors
@rustbot label -S-waiting-on-author

@rustbot rustbot 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 3, 2024
@ismailarilik
Copy link
Contributor Author

I guess it needs another review.
@rustbot review

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 3, 2024
@ismailarilik
Copy link
Contributor Author

@rustbot label -S-waiting-on-bors

@rustbot rustbot removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 3, 2024
@saethlin saethlin removed A-testsuite Area: The testsuite used to check the correctness of rustc T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. O-apple Operating system: Apple (macOS, iOS, tvOS, visionOS, watchOS) A-run-make Area: port run-make Makefiles to rmake.rs WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Oct 3, 2024
@saethlin
Copy link
Member

saethlin commented Oct 3, 2024

@bors r=compiler-errors

@bors
Copy link
Contributor

bors commented Oct 3, 2024

📌 Commit 3d8bd6b has been approved by compiler-errors

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 Oct 3, 2024
@bors
Copy link
Contributor

bors commented Oct 3, 2024

⌛ Testing commit 3d8bd6b with merge 9ff5fc4...

@bors
Copy link
Contributor

bors commented Oct 3, 2024

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 3, 2024
@bors bors merged commit 9ff5fc4 into rust-lang:master Oct 3, 2024
7 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Oct 3, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (9ff5fc4): 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 (primary 0.3%, secondary 2.2%)

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.2% [0.6%, 1.7%] 2
Regressions ❌
(secondary)
2.2% [2.2%, 2.2%] 2
Improvements ✅
(primary)
-1.5% [-1.5%, -1.5%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.3% [-1.5%, 1.7%] 3

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: 772.786s -> 773.326s (0.07%)
Artifact size: 342.00 MiB -> 342.03 MiB (0.01%)

@ismailarilik ismailarilik deleted the handle_potential_query_instability_lint_for_rustc_metadata branch October 4, 2024 08:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants