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

Use features() over features_untracked() where possible

Browse Source
This commit is contained in:
León Orell Valerian Liehr 2023-07-22 15:33:51 +02:00
parent c3c5a5c5f7
commit 2a75a0f724
No known key found for this signature in database
GPG Key ID: D17A07215F68E713
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_resolve/src/late.rs
View File

@ -2569,7 +2569,7 @@ impl<'a: 'ast, 'b, 'ast, 'tcx> LateResolutionVisitor<'a, 'b, 'ast, 'tcx> {
let res = match kind { let res = match kind {
RibKind::Item(..) | RibKind::AssocItem => Res::Def(def_kind, def_id.to_def_id()), RibKind::Item(..) | RibKind::AssocItem => Res::Def(def_kind, def_id.to_def_id()),
RibKind::Normal => { 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()) Res::Def(def_kind, def_id.to_def_id())
} else { } else {
Res::Err Res::Err

5
compiler/rustc_resolve/src/macros.rs
View File

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