bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rm declared_features field in resolver

Browse source
This commit is contained in:
bohan 2024-08-08 20:30:20 +08:00
parent 9337f7afa6
commit 9c29e0b818
2 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_resolve/src/lib.rs
View file

@ -1129,9 +1129,6 @@ pub struct Resolver<'a, 'tcx> {
/// Also includes of list of each fields visibility /// Also includes of list of each fields visibility
struct_constructors: LocalDefIdMap<(Res, ty::Visibility<DefId>, Vec<ty::Visibility<DefId>>)>, struct_constructors: LocalDefIdMap<(Res, ty::Visibility<DefId>, Vec<ty::Visibility<DefId>>)>,
/// Features declared for this crate.
declared_features: FxHashSet<Symbol>,
lint_buffer: LintBuffer, lint_buffer: LintBuffer,
next_node_id: NodeId, next_node_id: NodeId,
@ -1402,7 +1399,6 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
let registered_tools = tcx.registered_tools(()); let registered_tools = tcx.registered_tools(());
let features = tcx.features();
let pub_vis = ty::Visibility::<DefId>::Public; let pub_vis = ty::Visibility::<DefId>::Public;
let edition = tcx.sess.edition(); let edition = tcx.sess.edition();
@ -1506,7 +1502,6 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
multi_segment_macro_resolutions: Default::default(), multi_segment_macro_resolutions: Default::default(),
builtin_attrs: Default::default(), builtin_attrs: Default::default(),
containers_deriving_copy: Default::default(), containers_deriving_copy: Default::default(),
declared_features: features.declared_features.clone(),
lint_buffer: LintBuffer::default(), lint_buffer: LintBuffer::default(),
next_node_id: CRATE_NODE_ID, next_node_id: CRATE_NODE_ID,
node_id_to_def_id, node_id_to_def_id,

3
compiler/rustc_resolve/src/macros.rs
View file

@ -1001,7 +1001,8 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
let feature = stability.feature; let feature = stability.feature;
let is_allowed = |feature| { let is_allowed = |feature| {
self.declared_features.contains(&feature) || span.allows_unstable(feature) self.tcx.features().declared_features.contains(&feature)
|| span.allows_unstable(feature)
}; };
let allowed_by_implication = implied_by.is_some_and(|feature| is_allowed(feature)); let allowed_by_implication = implied_by.is_some_and(|feature| is_allowed(feature));
if !is_allowed(feature) && !allowed_by_implication { if !is_allowed(feature) && !allowed_by_implication {