mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add tcx::lower_impl_trait_in_trait_to_assoc_ty to avoid accessing through sess.opts.unstable_opts

Browse Source
This commit is contained in:
Santiago Pastorino 2023-03-03 18:27:25 -03:00
parent 7820b62d20
commit c2238527e6
No known key found for this signature in database
GPG Key ID: 8131A24E0C79EFAF
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_metadata/src/rmeta/encoder.rs
View File

@ -1104,7 +1104,7 @@ fn should_encode_const(def_kind: DefKind) -> bool {
// We only encode impl trait in trait when using `lower-impl-trait-in-trait-to-assoc-ty` unstable // We only encode impl trait in trait when using `lower-impl-trait-in-trait-to-assoc-ty` unstable
// option. // option.
fn should_encode_fn_impl_trait_in_trait<'tcx>(tcx: TyCtxt<'tcx>, def_id: DefId) -> bool { fn should_encode_fn_impl_trait_in_trait<'tcx>(tcx: TyCtxt<'tcx>, def_id: DefId) -> bool {
if tcx.sess.opts.unstable_opts.lower_impl_trait_in_trait_to_assoc_ty if tcx.lower_impl_trait_in_trait_to_assoc_ty()
&& let Some(assoc_item) = tcx.opt_associated_item(def_id) && let Some(assoc_item) = tcx.opt_associated_item(def_id)
&& assoc_item.container == ty::AssocItemContainer::TraitContainer && assoc_item.container == ty::AssocItemContainer::TraitContainer
&& assoc_item.kind == ty::AssocKind::Fn && assoc_item.kind == ty::AssocKind::Fn

4
compiler/rustc_middle/src/ty/context.rs
View File

@ -2439,6 +2439,10 @@ impl<'tcx> TyCtxt<'tcx> {
pub fn trait_solver_next(self) -> bool { pub fn trait_solver_next(self) -> bool {
self.sess.opts.unstable_opts.trait_solver == rustc_session::config::TraitSolver::Next self.sess.opts.unstable_opts.trait_solver == rustc_session::config::TraitSolver::Next
} }
pub fn lower_impl_trait_in_trait_to_assoc_ty(self) -> bool {
self.sess.opts.unstable_opts.lower_impl_trait_in_trait_to_assoc_ty
}
} }
impl<'tcx> TyCtxtAt<'tcx> { impl<'tcx> TyCtxtAt<'tcx> {

4
compiler/rustc_ty_utils/src/assoc.rs
View File

@ -23,7 +23,7 @@ fn associated_item_def_ids(tcx: TyCtxt<'_>, def_id: DefId) -> &[DefId] {
let item = tcx.hir().expect_item(def_id.expect_local()); let item = tcx.hir().expect_item(def_id.expect_local());
match item.kind { match item.kind {
hir::ItemKind::Trait(.., ref trait_item_refs) => { hir::ItemKind::Trait(.., ref trait_item_refs) => {
if tcx.sess.opts.unstable_opts.lower_impl_trait_in_trait_to_assoc_ty { if tcx.lower_impl_trait_in_trait_to_assoc_ty() {
// We collect RPITITs for each trait method's return type and create a // We collect RPITITs for each trait method's return type and create a
// corresponding associated item using associated_items_for_impl_trait_in_trait // corresponding associated item using associated_items_for_impl_trait_in_trait
// query. // query.
@ -54,7 +54,7 @@ fn associated_item_def_ids(tcx: TyCtxt<'_>, def_id: DefId) -> &[DefId] {
} }
} }
hir::ItemKind::Impl(ref impl_) => { hir::ItemKind::Impl(ref impl_) => {
if tcx.sess.opts.unstable_opts.lower_impl_trait_in_trait_to_assoc_ty { if tcx.lower_impl_trait_in_trait_to_assoc_ty() {
// We collect RPITITs for each trait method's return type, on the impl side too and // We collect RPITITs for each trait method's return type, on the impl side too and
// create a corresponding associated item using // create a corresponding associated item using
// associated_items_for_impl_trait_in_trait query. // associated_items_for_impl_trait_in_trait query.