Update deprecated rustc_hir imports 2 - #163207
Conversation
|
These commits modify the If this was unintentional then you should revert the changes before this PR is merged. HIR ty lowering was modified cc @fmease Some changes occurred to the CTFE / Miri interpreter cc @rust-lang/miri Some changes occurred to the core trait solver cc @rust-lang/initiative-trait-system-refactor Some changes occurred to constck cc @fee1-dead Some changes occurred to the CTFE machinery changes to the core type system cc @lcnr |
|
rustbot has assigned @dingxiangfei2009. Use Why was this reviewer chosen?The reviewer was selected based on:
|
This comment has been minimized.
This comment has been minimized.
|
r? me |
Rollup of 10 pull requests Successful merges: - #161988 (trait solver: Handle reflexive region constraints) - #162498 (Avoid ICEs when recovering malformed function parameters) - #163181 (revert #162715 due to #163149) - #163207 (Update deprecated rustc_hir imports 2) - #163216 (Add `inline` attribute to `NonZero::from_str`) - #120589 (std::thread::available_parallelism merging linux/android/freebsd version) - #162103 (fix(parser): emit targeted diagnostic for fields inside traits) - #162340 (When trying to recover from `for<…> dyn …` don't unconditionally treat `dyn` as a keyword) - #163094 (Add regression test for first token source file from TokenStream FromStr) - #163115 (Point at `'static` obligations from an fn being called) Failed merges: - #162942 (Remove `StashKey::AssociatedTypeSuggestion`)
Rollup merge of #163207 - mejrs:hir_imports2, r=BoxyUwU Update deprecated rustc_hir imports 2 Followup to #160336, see also #163170 and rust-lang/rust-clippy/pull/17714 There is one more PR after this, they're split up to hopefully not be too conflict-y.
Remove rustc_hir's attribute re-exports Followup to rust-lang#160336, see also rust-lang#163170, rust-lang#163207 and rust-lang/rust-clippy/pull/17714 Very minor touchups here and there, nothing involving code changes. r? @JonathanBrouwer
Rollup merge of #163250 - mejrs:hir_imports3, r=JonathanBrouwer Remove rustc_hir's attribute re-exports Followup to #160336, see also #163170, #163207 and rust-lang/rust-clippy/pull/17714 Very minor touchups here and there, nothing involving code changes. r? @JonathanBrouwer
Remove rustc_hir's attribute re-exports Followup to rust-lang/rust#160336, see also rust-lang/rust#163170, rust-lang/rust#163207 and rust-lang/rust-clippy/pull/17714 Very minor touchups here and there, nothing involving code changes. r? @JonathanBrouwer
Remove rustc_hir's attribute re-exports Followup to rust-lang/rust#160336, see also rust-lang/rust#163170, rust-lang/rust#163207 and rust-lang/rust-clippy/pull/17714 Very minor touchups here and there, nothing involving code changes. r? @JonathanBrouwer
One source change: `rustc_hir` stopped re-exporting `AttrArgs` at its root ([rust-lang/rust#163207](rust-lang/rust#163207)). The type lives in `rustc_attr_ir`, which `rustc_hir` re-exports as `attrs`, so the import becomes `rustc_hir::attrs::AttrArgs`. Worth knowing if you hit this elsewhere: rustc suggests `rustc_ast::AttrArgs` instead, and taking the suggestion compiles the import but then fails on the use site. They are different types — the AST one carries a full expression, the HIR one a lowered literal — and `Attribute::get_normal_item` returns the HIR one. Nothing else in the range touched us. I ran the full set locally on the new toolchain rather than leaning on CI: every compiletest suite (kani, expected, ui, cargo-kani, cargo-ui, script-based-pre, coverage, firecracker, prusti, smack, kani-fixme — 1510 passing, 0 failing), the unit tests for all five crates including `kani` with `concrete_playback`, fmt, clippy with `-D warnings`, and the LLBC build and its regression suite. The charon patch still applies unchanged. Resolves model-checking#4866
Remove rustc_hir's attribute re-exports Followup to rust-lang/rust#160336, see also rust-lang/rust#163170, rust-lang/rust#163207 and rust-lang/rust-clippy/pull/17714 Very minor touchups here and there, nothing involving code changes. r? @JonathanBrouwer
Remove rustc_hir's attribute re-exports Followup to rust-lang#160336, see also rust-lang#163170, rust-lang#163207 and rust-lang/rust-clippy/pull/17714 Very minor touchups here and there, nothing involving code changes. r? @JonathanBrouwer
Followup to #160336, see also #163170 and rust-lang/rust-clippy/pull/17714
There is one more PR after this, they're split up to hopefully not be too conflict-y.