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

Invert infer error_reporting mod struture #127501

Merged

Conversation

compiler-errors
Copy link
Member

Parallel change to #127493, which moves rustc_infer::infer::error_reporting to rustc_infer::error_reporting::infer. After this, we should just be able to merge this into rustc_trait_selection::error_reporting::infer, and pull down TypeErrCtxt into that crate. 👍

r? lcnr

@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 Jul 9, 2024
@@ -1,8 +1,8 @@
use crate::error_reporting::infer::TypeErrCtxt;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't actually move need_type_info, bc it has some code that accesses private InferCtxt fields, so I'll need to split it up more carefully later...

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Jul 9, 2024

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

@compiler-errors compiler-errors force-pushed the invert-infer-error-mod-struture branch from 729cd16 to 9f76567 Compare July 15, 2024 22:58
@compiler-errors compiler-errors marked this pull request as ready for review July 15, 2024 22:58
@rust-log-analyzer

This comment has been minimized.

@compiler-errors compiler-errors force-pushed the invert-infer-error-mod-struture branch from 9f76567 to e86fbcf Compare July 16, 2024 00:16
@rustbot
Copy link
Collaborator

rustbot commented Jul 16, 2024

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

@@ -1,21 +1,20 @@
//! Error Reporting for Anonymous Region Lifetime Errors
//! where both the regions are anonymous.

use crate::error_reporting::infer::nice_region_error::find_anon_type::find_anon_type;
use crate::error_reporting::infer::nice_region_error::util::AnonymousParamInfo;
use crate::error_reporting::infer::nice_region_error::NiceRegionError;
use crate::errors::AddLifetimeParamsSuggestion;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should crate::errors be moved into error_reporting?

@lcnr
Copy link
Contributor

lcnr commented Jul 16, 2024

@bors r+ rollup=iffy

@bors
Copy link
Contributor

bors commented Jul 16, 2024

📌 Commit e86fbcf has been approved by lcnr

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 Jul 16, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 16, 2024
Rollup of 7 pull requests

Successful merges:

 - rust-lang#124033 (Sync ar_archive_writer to LLVM 18.1.3)
 - rust-lang#126699 (Delegation: support coercion for target expression)
 - rust-lang#126762 (Deny keyword lifetimes pre-expansion)
 - rust-lang#126967 (Promote the `wasm32-wasip2` target to Tier 2)
 - rust-lang#127390 (Migrate `raw-dylib-inline-cross-dylib` and `raw-dylib-custom-dlltool` `run-make` tests to rmake)
 - rust-lang#127501 (Invert infer `error_reporting` mod struture)
 - rust-lang#127816 (Update method name to reflect changes to its internals)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 059222d into rust-lang:master Jul 17, 2024
6 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jul 17, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jul 17, 2024
Rollup merge of rust-lang#127501 - compiler-errors:invert-infer-error-mod-struture, r=lcnr

Invert infer `error_reporting` mod struture

Parallel change to rust-lang#127493, which moves `rustc_infer::infer::error_reporting` to `rustc_infer::error_reporting::infer`. After this, we should just be able to merge this into `rustc_trait_selection::error_reporting::infer`, and pull down `TypeErrCtxt` into that crate. 👍

r? lcnr
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 9, 2024
…iler-errors

Fix some triagebot mentions paths

This fixes some mentions paths in `triagebot.toml` that are no longer valid.

* rustdoc themes were merged into rustdoc.css (which already has a mention, and unfortunately can't independently mention the ayu theme). rust-lang#115829 cc `@GuillaumeGomez` `@Cldfire`
* The entry for `inspect_obligations.rs` was never correct, from rust-lang#122385. cc `@lcnr` `@compiler-errors`
* The entry for `need_type_info.rs` was moved in rust-lang#127501
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 9, 2024
Rollup merge of rust-lang#134045 - ehuss:triagebot-path-fixes, r=compiler-errors

Fix some triagebot mentions paths

This fixes some mentions paths in `triagebot.toml` that are no longer valid.

* rustdoc themes were merged into rustdoc.css (which already has a mention, and unfortunately can't independently mention the ayu theme). rust-lang#115829 cc `@GuillaumeGomez` `@Cldfire`
* The entry for `inspect_obligations.rs` was never correct, from rust-lang#122385. cc `@lcnr` `@compiler-errors`
* The entry for `need_type_info.rs` was moved in rust-lang#127501
RalfJung pushed a commit to RalfJung/miri that referenced this pull request Dec 9, 2024
Fix some triagebot mentions paths

This fixes some mentions paths in `triagebot.toml` that are no longer valid.

* rustdoc themes were merged into rustdoc.css (which already has a mention, and unfortunately can't independently mention the ayu theme). rust-lang/rust#115829 cc `@GuillaumeGomez` `@Cldfire`
* The entry for `inspect_obligations.rs` was never correct, from rust-lang/rust#122385. cc `@lcnr` `@compiler-errors`
* The entry for `need_type_info.rs` was moved in rust-lang/rust#127501
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

5 participants