Deduplication: Pulled common logic out from lower_const_arg_struct#154460
Merged
rust-bors[bot] merged 1 commit intorust-lang:mainfrom Apr 8, 2026
Merged
Deduplication: Pulled common logic out from lower_const_arg_struct#154460rust-bors[bot] merged 1 commit intorust-lang:mainfrom
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
Conversation
Collaborator
|
HIR ty lowering was modified cc @fmease |
Collaborator
|
r? @chenyukang rustbot has assigned @chenyukang. Use Why was this reviewer chosen?The reviewer was selected based on:
|
Collaborator
|
Contributor
|
cc @BoxyUwU |
Member
|
r? BoxyUwU |
Member
|
thx, sorry for taking so long to review this. @bors r+ rollup=iffy |
Contributor
rust-bors bot
pushed a commit
that referenced
this pull request
Apr 8, 2026
Rollup of 4 pull requests Successful merges: - #154460 (Deduplication: Pulled common logic out from lower_const_arg_struct) - #154609 (Enable `#[diagnostic::on_const]` for local impls) - #154678 (Introduce #[diagnostic::on_move] on `Rc`) - #154902 (rustdoc: Inherit inline attributes for declarative macros)
rust-timer
added a commit
that referenced
this pull request
Apr 8, 2026
Rollup merge of #154460 - LaneAsade:lower-path-for-struct-expr, r=BoxyUwU Deduplication: Pulled common logic out from lower_const_arg_struct This PR aims to deduplicate the logic in the function `lower_const_arg_struct` by creating a helper function `lower_path_for_struct_expr` which is shared between `rustc_hir_ty_lowering `and `rustc_hir_typeck`. Related: #150621 Helper function code: ``` pub struct ResolvedStructPath<'tcx> { pub res: Result<Res, ErrorGuaranteed>, pub ty: Ty<'tcx>, } pub fn lower_path_for_struct_expr( &self, qpath: hir::QPath<'tcx>, path_span: Span, hir_id: HirId, ) -> ResolvedStructPath<'tcx> { match qpath { hir::QPath::Resolved(ref maybe_qself, path) => { let self_ty = maybe_qself.as_ref().map(|qself| self.lower_ty(qself)); let ty = self.lower_resolved_ty_path(self_ty, path, hir_id, PermitVariants::Yes); ResolvedStructPath { res: Ok(path.res), ty } } hir::QPath::TypeRelative(hir_self_ty, segment) => { let self_ty = self.lower_ty(hir_self_ty); let result = self.lower_type_relative_ty_path( self_ty, hir_self_ty, segment, hir_id, path_span, PermitVariants::Yes, ); let ty = result .map(|(ty, _, _)| ty) .unwrap_or_else(|guar| Ty::new_error(self.tcx(), guar)); ResolvedStructPath { res: result.map(|(_, kind, def_id)| Res::Def(kind, def_id)), ty, } } } } ``` Thanks to @BoxyUwU for the guidance on this issue.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR aims to deduplicate the logic in the function
lower_const_arg_structby creating a helper functionlower_path_for_struct_exprwhich is shared betweenrustc_hir_ty_loweringandrustc_hir_typeck.Related: #150621
Helper function code:
Thanks to @BoxyUwU for the guidance on this issue.