-
Notifications
You must be signed in to change notification settings - Fork 13.4k
Invert infer error_reporting
mod struture
#127501
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
Invert infer error_reporting
mod struture
#127501
Conversation
@@ -1,8 +1,8 @@ | |||
use crate::error_reporting::infer::TypeErrCtxt; |
There was a problem hiding this comment.
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...
This comment has been minimized.
This comment has been minimized.
☔ The latest upstream changes (presumably #127493) made this pull request unmergeable. Please resolve the merge conflicts. |
729cd16
to
9f76567
Compare
This comment has been minimized.
This comment has been minimized.
9f76567
to
e86fbcf
Compare
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; |
There was a problem hiding this comment.
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
?
@bors r+ rollup=iffy |
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
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
…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
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
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
Parallel change to #127493, which moves
rustc_infer::infer::error_reporting
torustc_infer::error_reporting::infer
. After this, we should just be able to merge this intorustc_trait_selection::error_reporting::infer
, and pull downTypeErrCtxt
into that crate. 👍r? lcnr