Handle rustc_middle cases of rustc::potential_query_instability lint#131160
Handle rustc_middle cases of rustc::potential_query_instability lint#131160bors merged 1 commit intorust-lang:masterfrom ismailarilik:handle-potential-query-instability-lint-for-rustc-middle
rustc_middle cases of rustc::potential_query_instability lint#131160Conversation
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @compiler-errors (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 (
|
|
These commits modify the If this was unintentional then you should revert the changes before this PR is merged. Some changes occurred in src/tools/clippy cc @rust-lang/clippy |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
☔ The latest upstream changes (presumably #131263) made this pull request unmergeable. Please resolve the merge conflicts. |
|
☔ The latest upstream changes (presumably #132282) made this pull request unmergeable. Please resolve the merge conflicts. |
|
I'm gonna re-roll this so this PR gets more attention, sorry for my inactivity. r? compiler But also reassigning to author sicne I think this PR still needs updating. @rustbot author |
|
@ismailarilik Can you rebase the PR today? I'm in holiday tomorrow so I"d like to have a review before that :) |
|
r? compiler cause I'm going to the holidays in the next few days. And I suggest to run a rustc perf when it's ready since this PR change the cache struct |
|
@ismailarilik any updates on this? thanks |
This comment has been minimized.
This comment has been minimized.
Sorry, I missed the previous comment. I've just fixed conflicts. But since I have no access to the git tool in a machine nowadays, I had to do it using the web UI so there is a merge commit now. I can fix it later or feel free to fix. |
|
☔ The latest upstream changes (presumably #137752) made this pull request unmergeable. Please resolve the merge conflicts. |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
Could you update the outputs and then rebase? Nowadays I don't have access
neither Git nor Rust.
2 Mar 2025 Paz 08:23 tarihinde Rust Log Analyzer ***@***.***>
şunu yazdı:
… The job *x86_64-gnu-tools* failed! Check out the build log: (web)
<https://github.com/rust-lang/rust/actions/runs/13612225803/job/38050862251>
(plain)
<https://github.com/rust-lang/rust/commit/b2dd7bd0d15f098c8d112c4e881a47dd489234cb/checks/38050862251/logs>
*Click to see the possible cause of the failure (guessed by this bot)*
+++ <fixed output>
***@***.***:2015
... 14 lines skipped ...
use crate::mod_mod::inner_mod;
//~^ wildcard_imports
-use crate::multi_fn_mod::{multi_bar, multi_foo, multi_inner_mod};
+use crate::multi_fn_mod::{multi_foo, multi_bar, multi_inner_mod};
//~^ wildcard_imports
... 5 lines skipped ...
use wildcard_imports_helper::inner::inner_for_self_import::inner_extern_bar;
//~^ wildcard_imports
//~^ wildcard_imports
-use wildcard_imports_helper::{ExternA, extern_foo};
+use wildcard_imports_helper::{extern_foo, ExternA};
//~^ wildcard_imports
... 107 lines skipped ...
use wildcard_imports_helper::inner::inner_for_self_import::{self, inner_extern_foo};
//~^ wildcard_imports
//~^ wildcard_imports
- use wildcard_imports_helper::{ExternA, extern_foo};
+ use wildcard_imports_helper::{extern_foo, ExternA};
//~^ wildcard_imports
... 17 lines skipped ...
fn test_extern_reexported() {
fn test_extern_reexported() {
- use wildcard_imports_helper::{ExternExportedEnum, ExternExportedStruct, extern_exported};
+ use wildcard_imports_helper::{extern_exported, ExternExportedStruct, ExternExportedEnum};
//~^ wildcard_imports
... 25 lines skipped ...
fn test_reexported() {
fn test_reexported() {
- use crate::in_fn_test::{ExportedEnum, ExportedStruct, exported};
+ use crate::in_fn_test::{exported, ExportedStruct, ExportedEnum};
//~^ wildcard_imports
... 102 lines skipped ...
}
}
---
error: actual output differed from expected
Execute `cargo uibless` to update `tests/ui/wildcard_imports_2021.edition2018.fixed` to the actual output
--- tests/ui/wildcard_imports_2021.edition2018.fixed
+++ <fixed output>
***@***.***: edition2018 edition2021
***@***.*** edition:2018
... 12 lines skipped ...
use crate::mod_mod::inner_mod;
//~^ wildcard_imports
-use crate::multi_fn_mod::{multi_bar, multi_foo, multi_inner_mod};
+use crate::multi_fn_mod::{multi_foo, multi_bar, multi_inner_mod};
//~^ wildcard_imports
use crate::struct_mod::{A, inner_struct_mod};
//~^ wildcard_imports
use wildcard_imports_helper::prelude::v1::*;
use wildcard_imports_helper::prelude::v1::*;
-use wildcard_imports_helper::{ExternA, extern_foo};
+use wildcard_imports_helper::{extern_foo, ExternA};
//~^ wildcard_imports
... 104 lines skipped ...
use wildcard_imports_helper::inner::inner_for_self_import::{self, inner_extern_foo};
//~^ wildcard_imports
//~^ wildcard_imports
- use wildcard_imports_helper::{ExternA, extern_foo};
+ use wildcard_imports_helper::{extern_foo, ExternA};
//~^ wildcard_imports
... 17 lines skipped ...
fn test_extern_reexported() {
fn test_extern_reexported() {
- use wildcard_imports_helper::{ExternExportedEnum, ExternExportedStruct, extern_exported};
+ use wildcard_imports_helper::{extern_exported, ExternExportedStruct, ExternExportedEnum};
//~^ wildcard_imports
... 25 lines skipped ...
fn test_reexported() {
fn test_reexported() {
- use crate::in_fn_test::{ExportedEnum, ExportedStruct, exported};
+ use crate::in_fn_test::{exported, ExportedStruct, ExportedEnum};
//~^ wildcard_imports
... 102 lines skipped ...
}
}
---
error: actual output differed from expected
Execute `cargo uibless` to update `tests/ui/wildcard_imports_2021.edition2021.fixed` to the actual output
--- tests/ui/wildcard_imports_2021.edition2021.fixed
+++ <fixed output>
***@***.***: edition2018 edition2021
***@***.*** edition:2018
... 12 lines skipped ...
use crate::mod_mod::inner_mod;
//~^ wildcard_imports
-use crate::multi_fn_mod::{multi_bar, multi_foo, multi_inner_mod};
+use crate::multi_fn_mod::{multi_foo, multi_bar, multi_inner_mod};
//~^ wildcard_imports
use crate::struct_mod::{A, inner_struct_mod};
//~^ wildcard_imports
use wildcard_imports_helper::prelude::v1::*;
use wildcard_imports_helper::prelude::v1::*;
-use wildcard_imports_helper::{ExternA, extern_foo};
+use wildcard_imports_helper::{extern_foo, ExternA};
//~^ wildcard_imports
... 104 lines skipped ...
use wildcard_imports_helper::inner::inner_for_self_import::{self, inner_extern_foo};
//~^ wildcard_imports
//~^ wildcard_imports
- use wildcard_imports_helper::{ExternA, extern_foo};
+ use wildcard_imports_helper::{extern_foo, ExternA};
//~^ wildcard_imports
... 17 lines skipped ...
fn test_extern_reexported() {
fn test_extern_reexported() {
- use wildcard_imports_helper::{ExternExportedEnum, ExternExportedStruct, extern_exported};
+ use wildcard_imports_helper::{extern_exported, ExternExportedStruct, ExternExportedEnum};
//~^ wildcard_imports
... 25 lines skipped ...
fn test_reexported() {
fn test_reexported() {
- use crate::in_fn_test::{ExportedEnum, ExportedStruct, exported};
+ use crate::in_fn_test::{exported, ExportedStruct, ExportedEnum};
//~^ wildcard_imports
... 102 lines skipped ...
}
}
—
Reply to this email directly, view it on GitHub
<#131160 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AEGFHYPVGPHC2QPC4PMXSBD2SKIWRAVCNFSM6AAAAABPIAPP7WVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDMOJSGU3DIOBZGA>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
[image: rust-log-analyzer]*rust-log-analyzer* left a comment
(rust-lang/rust#131160)
<#131160 (comment)>
The job *x86_64-gnu-tools* failed! Check out the build log: (web)
<https://github.com/rust-lang/rust/actions/runs/13612225803/job/38050862251>
(plain)
<https://github.com/rust-lang/rust/commit/b2dd7bd0d15f098c8d112c4e881a47dd489234cb/checks/38050862251/logs>
*Click to see the possible cause of the failure (guessed by this bot)*
+++ <fixed output>
***@***.***:2015
... 14 lines skipped ...
use crate::mod_mod::inner_mod;
//~^ wildcard_imports
-use crate::multi_fn_mod::{multi_bar, multi_foo, multi_inner_mod};
+use crate::multi_fn_mod::{multi_foo, multi_bar, multi_inner_mod};
//~^ wildcard_imports
... 5 lines skipped ...
use wildcard_imports_helper::inner::inner_for_self_import::inner_extern_bar;
//~^ wildcard_imports
//~^ wildcard_imports
-use wildcard_imports_helper::{ExternA, extern_foo};
+use wildcard_imports_helper::{extern_foo, ExternA};
//~^ wildcard_imports
... 107 lines skipped ...
use wildcard_imports_helper::inner::inner_for_self_import::{self, inner_extern_foo};
//~^ wildcard_imports
//~^ wildcard_imports
- use wildcard_imports_helper::{ExternA, extern_foo};
+ use wildcard_imports_helper::{extern_foo, ExternA};
//~^ wildcard_imports
... 17 lines skipped ...
fn test_extern_reexported() {
fn test_extern_reexported() {
- use wildcard_imports_helper::{ExternExportedEnum, ExternExportedStruct, extern_exported};
+ use wildcard_imports_helper::{extern_exported, ExternExportedStruct, ExternExportedEnum};
//~^ wildcard_imports
... 25 lines skipped ...
fn test_reexported() {
fn test_reexported() {
- use crate::in_fn_test::{ExportedEnum, ExportedStruct, exported};
+ use crate::in_fn_test::{exported, ExportedStruct, ExportedEnum};
//~^ wildcard_imports
... 102 lines skipped ...
}
}
---
error: actual output differed from expected
Execute `cargo uibless` to update `tests/ui/wildcard_imports_2021.edition2018.fixed` to the actual output
--- tests/ui/wildcard_imports_2021.edition2018.fixed
+++ <fixed output>
***@***.***: edition2018 edition2021
***@***.*** edition:2018
... 12 lines skipped ...
use crate::mod_mod::inner_mod;
//~^ wildcard_imports
-use crate::multi_fn_mod::{multi_bar, multi_foo, multi_inner_mod};
+use crate::multi_fn_mod::{multi_foo, multi_bar, multi_inner_mod};
//~^ wildcard_imports
use crate::struct_mod::{A, inner_struct_mod};
//~^ wildcard_imports
use wildcard_imports_helper::prelude::v1::*;
use wildcard_imports_helper::prelude::v1::*;
-use wildcard_imports_helper::{ExternA, extern_foo};
+use wildcard_imports_helper::{extern_foo, ExternA};
//~^ wildcard_imports
... 104 lines skipped ...
use wildcard_imports_helper::inner::inner_for_self_import::{self, inner_extern_foo};
//~^ wildcard_imports
//~^ wildcard_imports
- use wildcard_imports_helper::{ExternA, extern_foo};
+ use wildcard_imports_helper::{extern_foo, ExternA};
//~^ wildcard_imports
... 17 lines skipped ...
fn test_extern_reexported() {
fn test_extern_reexported() {
- use wildcard_imports_helper::{ExternExportedEnum, ExternExportedStruct, extern_exported};
+ use wildcard_imports_helper::{extern_exported, ExternExportedStruct, ExternExportedEnum};
//~^ wildcard_imports
... 25 lines skipped ...
fn test_reexported() {
fn test_reexported() {
- use crate::in_fn_test::{ExportedEnum, ExportedStruct, exported};
+ use crate::in_fn_test::{exported, ExportedStruct, ExportedEnum};
//~^ wildcard_imports
... 102 lines skipped ...
}
}
---
error: actual output differed from expected
Execute `cargo uibless` to update `tests/ui/wildcard_imports_2021.edition2021.fixed` to the actual output
--- tests/ui/wildcard_imports_2021.edition2021.fixed
+++ <fixed output>
***@***.***: edition2018 edition2021
***@***.*** edition:2018
... 12 lines skipped ...
use crate::mod_mod::inner_mod;
//~^ wildcard_imports
-use crate::multi_fn_mod::{multi_bar, multi_foo, multi_inner_mod};
+use crate::multi_fn_mod::{multi_foo, multi_bar, multi_inner_mod};
//~^ wildcard_imports
use crate::struct_mod::{A, inner_struct_mod};
//~^ wildcard_imports
use wildcard_imports_helper::prelude::v1::*;
use wildcard_imports_helper::prelude::v1::*;
-use wildcard_imports_helper::{ExternA, extern_foo};
+use wildcard_imports_helper::{extern_foo, ExternA};
//~^ wildcard_imports
... 104 lines skipped ...
use wildcard_imports_helper::inner::inner_for_self_import::{self, inner_extern_foo};
//~^ wildcard_imports
//~^ wildcard_imports
- use wildcard_imports_helper::{ExternA, extern_foo};
+ use wildcard_imports_helper::{extern_foo, ExternA};
//~^ wildcard_imports
... 17 lines skipped ...
fn test_extern_reexported() {
fn test_extern_reexported() {
- use wildcard_imports_helper::{ExternExportedEnum, ExternExportedStruct, extern_exported};
+ use wildcard_imports_helper::{extern_exported, ExternExportedStruct, ExternExportedEnum};
//~^ wildcard_imports
... 25 lines skipped ...
fn test_reexported() {
fn test_reexported() {
- use crate::in_fn_test::{ExportedEnum, ExportedStruct, exported};
+ use crate::in_fn_test::{exported, ExportedStruct, ExportedEnum};
//~^ wildcard_imports
... 102 lines skipped ...
}
}
—
Reply to this email directly, view it on GitHub
<#131160 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AEGFHYPVGPHC2QPC4PMXSBD2SKIWRAVCNFSM6AAAAABPIAPP7WVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDMOJSGU3DIOBZGA>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
|
@bors try @rust-timer queue |
This comment has been minimized.
This comment has been minimized.
…instability-lint-for-rustc-middle, r=<try> Handle `rustc_middle` cases of `rustc::potential_query_instability` lint This PR removes `#![allow(rustc::potential_query_instability)]` line from [`compiler/rustc_middle/src/lib.rs`](https://github.com/rust-lang/rust/blob/master/compiler/rustc_middle/src/lib.rs#L29) and converts `FxHash{Map,Set}` types into `FxIndex{Map,Set}` to suppress lint errors. A somewhat tracking issue: rust-lang#84447 r? `@compiler-errors`
|
☀️ Try build successful - checks-actions |
This comment has been minimized.
This comment has been minimized.
|
Finished benchmarking commit (9d711dc): comparison URL. Overall result: ❌✅ regressions and improvements - no action neededBenchmarking 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 Instruction countThis 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.
Max RSS (memory usage)Results (primary -0.1%, secondary -0.8%)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.
CyclesResults (primary -0.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.
Binary sizeThis benchmark run did not return any relevant results for this metric. Bootstrap: 768.358s -> 769.173s (0.11%) |
|
@bors r+ |
|
☀️ Test successful - checks-actions |
What is this?This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.Comparing 4a0969e (parent) -> 7295b08 (this PR) Test differencesNo test diffs found Test dashboardRun cargo run --manifest-path src/ci/citool/Cargo.toml -- \
test-dashboard 7295b08a17d1107155acd4b552069e3705b0ab1f --output-dir test-dashboardAnd then open Job duration changes
How to interpret the job duration changes?Job durations can vary a lot, based on the actual runner instance |
|
Finished benchmarking commit (7295b08): comparison URL. Overall result: no relevant changes - no action needed@rustbot label: -perf-regression Instruction countThis benchmark run did not return any relevant results for this metric. Max RSS (memory usage)Results (primary -0.2%, secondary 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.
CyclesResults (primary -0.6%, 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.
Binary sizeThis benchmark run did not return any relevant results for this metric. Bootstrap: 770.615s -> 771.005s (0.05%) |
…instability-lint-for-rustc-middle, r=oli-obk Handle `rustc_middle` cases of `rustc::potential_query_instability` lint This PR removes `#![allow(rustc::potential_query_instability)]` line from [`compiler/rustc_middle/src/lib.rs`](https://github.com/rust-lang/rust/blob/master/compiler/rustc_middle/src/lib.rs#L29) and converts `FxHash{Map,Set}` types into `FxIndex{Map,Set}` to suppress lint errors. A somewhat tracking issue: rust-lang#84447 r? `@compiler-errors`
This PR removes
#![allow(rustc::potential_query_instability)]line fromcompiler/rustc_middle/src/lib.rsand convertsFxHash{Map,Set}types intoFxIndex{Map,Set}to suppress lint errors.A somewhat tracking issue: #84447
r? @compiler-errors