Auto merge of #113961 - fmease:fewer-features_untracked, r=compiler-errors

Use `features()` over `features_untracked()` where possible

`Resolver` has a `TyCtxt` nowadays.

`@rustbot` label C-cleanup
This commit is contained in:
bors 2023-07-23 02:03:21 +00:00
commit cec34a43b1
2 changed files with 2 additions and 5 deletions

View file

@ -2569,7 +2569,7 @@ fn with_generic_param_rib<'c, F>(
let res = match kind {
RibKind::Item(..) | RibKind::AssocItem => Res::Def(def_kind, def_id.to_def_id()),
RibKind::Normal => {
if self.r.tcx.sess.features_untracked().non_lifetime_binders {
if self.r.tcx.features().non_lifetime_binders {
Res::Def(def_kind, def_id.to_def_id())
} else {
Res::Err

View file

@ -576,10 +576,7 @@ fn smart_resolve_macro_path(
}
// We are trying to avoid reporting this error if other related errors were reported.
if res != Res::Err
&& inner_attr
&& !self.tcx.sess.features_untracked().custom_inner_attributes
{
if res != Res::Err && inner_attr && !self.tcx.features().custom_inner_attributes {
let msg = match res {
Res::Def(..) => "inner macro attributes are unstable",
Res::NonMacroAttr(..) => "custom inner attributes are unstable",