bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove thread-local IGNORED_ATTRIBUTES.

Browse source 
It's just a copy of the read-only global `ich::IGNORED_ATTRIBUTES`, and
can be removed without any effect.
This commit is contained in:
Nicholas Nethercote 2022-06-14 15:20:54 +10:00
parent ca122c7ebb
commit a2801625cd
1 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/rustc_query_system/src/ich/hcx.rs
View file

@ -1,6 +1,5 @@
use crate::ich; use crate::ich;
use rustc_ast as ast; use rustc_ast as ast;
use rustc_data_structures::fx::FxHashSet;
use rustc_data_structures::sorted_map::SortedMap; use rustc_data_structures::sorted_map::SortedMap;
use rustc_data_structures::stable_hasher::{HashStable, HashingControls, StableHasher}; use rustc_data_structures::stable_hasher::{HashStable, HashingControls, StableHasher};
use rustc_data_structures::sync::Lrc; use rustc_data_structures::sync::Lrc;
@ -13,11 +12,6 @@ use rustc_span::source_map::SourceMap;
use rustc_span::symbol::Symbol; use rustc_span::symbol::Symbol;
use rustc_span::{BytePos, CachingSourceMapView, SourceFile, Span, SpanData}; use rustc_span::{BytePos, CachingSourceMapView, SourceFile, Span, SpanData};
fn compute_ignored_attr_names() -> FxHashSet<Symbol> {
debug_assert!(!ich::IGNORED_ATTRIBUTES.is_empty());
ich::IGNORED_ATTRIBUTES.iter().copied().collect()
}
/// This is the context state available during incr. comp. hashing. It contains /// This is the context state available during incr. comp. hashing. It contains
/// enough information to transform `DefId`s and `HirId`s into stable `DefPath`s (i.e., /// enough information to transform `DefId`s and `HirId`s into stable `DefPath`s (i.e.,
/// a reference to the `TyCtxt`) and it holds a few caches for speeding up various /// a reference to the `TyCtxt`) and it holds a few caches for speeding up various
@ -161,10 +155,7 @@ impl<'a> StableHashingContext<'a> {
#[inline] #[inline]
pub fn is_ignored_attr(&self, name: Symbol) -> bool { pub fn is_ignored_attr(&self, name: Symbol) -> bool {
thread_local! { ich::IGNORED_ATTRIBUTES.contains(&name)
static IGNORED_ATTRIBUTES: FxHashSet<Symbol> = compute_ignored_attr_names();
}
IGNORED_ATTRIBUTES.with(|attrs| attrs.contains(&name))
} }
#[inline] #[inline]