Rename syntax::symbol::symbols as syntax::symbol::sym.

Because it's going to be used a lot.
This commit is contained in:
Nicholas Nethercote 2019-05-10 09:57:08 +10:00
parent a8245f5a38
commit 79602c87b5
4 changed files with 138 additions and 137 deletions

View file

@ -8,7 +8,7 @@ use crate::ty::TyCtxt;
use crate::hir::intravisit::{self, NestedVisitorMap, Visitor};
use syntax::symbol::Symbol;
use syntax::ast::{Attribute, MetaItem, MetaItemKind};
use syntax_pos::{Span, symbols};
use syntax_pos::{Span, sym};
use rustc_data_structures::fx::{FxHashSet, FxHashMap};
use rustc_macros::HashStable;
use errors::DiagnosticId;
@ -51,7 +51,7 @@ impl<'a, 'tcx> LibFeatureCollector<'a, 'tcx> {
}
fn extract(&self, attr: &Attribute) -> Option<(Symbol, Option<Symbol>, Span)> {
let stab_attrs = [symbols::stable, symbols::unstable, symbols::rustc_const_unstable];
let stab_attrs = [sym::stable, sym::unstable, sym::rustc_const_unstable];
// Find a stability attribute (i.e., `#[stable (..)]`, `#[unstable (..)]`,
// `#[rustc_const_unstable (..)]`).

View file

@ -28,7 +28,7 @@ use crate::tokenstream::TokenTree;
use errors::{DiagnosticBuilder, Handler};
use rustc_data_structures::fx::FxHashMap;
use rustc_target::spec::abi::Abi;
use syntax_pos::{Span, DUMMY_SP, symbols};
use syntax_pos::{Span, DUMMY_SP, sym};
use log::debug;
use lazy_static::lazy_static;
@ -962,108 +962,108 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
// Normal attributes
(
symbols::warn,
sym::warn,
Normal,
template!(List: r#"lint1, lint2, ..., /*opt*/ reason = "...""#),
Ungated
),
(
symbols::allow,
sym::allow,
Normal,
template!(List: r#"lint1, lint2, ..., /*opt*/ reason = "...""#),
Ungated
),
(
symbols::forbid,
sym::forbid,
Normal,
template!(List: r#"lint1, lint2, ..., /*opt*/ reason = "...""#),
Ungated
),
(
symbols::deny,
sym::deny,
Normal,
template!(List: r#"lint1, lint2, ..., /*opt*/ reason = "...""#),
Ungated
),
(symbols::macro_use, Normal, template!(Word, List: "name1, name2, ..."), Ungated),
(symbols::macro_export, Normal, template!(Word, List: "local_inner_macros"), Ungated),
(symbols::plugin_registrar, Normal, template!(Word), Ungated),
(sym::macro_use, Normal, template!(Word, List: "name1, name2, ..."), Ungated),
(sym::macro_export, Normal, template!(Word, List: "local_inner_macros"), Ungated),
(sym::plugin_registrar, Normal, template!(Word), Ungated),
(symbols::cfg, Normal, template!(List: "predicate"), Ungated),
(symbols::cfg_attr, Normal, template!(List: "predicate, attr1, attr2, ..."), Ungated),
(symbols::main, Normal, template!(Word), Ungated),
(symbols::start, Normal, template!(Word), Ungated),
(symbols::repr, Normal, template!(List: "C, packed, ..."), Ungated),
(symbols::path, Normal, template!(NameValueStr: "file"), Ungated),
(symbols::automatically_derived, Normal, template!(Word), Ungated),
(symbols::no_mangle, Normal, template!(Word), Ungated),
(symbols::no_link, Normal, template!(Word), Ungated),
(symbols::derive, Normal, template!(List: "Trait1, Trait2, ..."), Ungated),
(sym::cfg, Normal, template!(List: "predicate"), Ungated),
(sym::cfg_attr, Normal, template!(List: "predicate, attr1, attr2, ..."), Ungated),
(sym::main, Normal, template!(Word), Ungated),
(sym::start, Normal, template!(Word), Ungated),
(sym::repr, Normal, template!(List: "C, packed, ..."), Ungated),
(sym::path, Normal, template!(NameValueStr: "file"), Ungated),
(sym::automatically_derived, Normal, template!(Word), Ungated),
(sym::no_mangle, Normal, template!(Word), Ungated),
(sym::no_link, Normal, template!(Word), Ungated),
(sym::derive, Normal, template!(List: "Trait1, Trait2, ..."), Ungated),
(
symbols::should_panic,
sym::should_panic,
Normal,
template!(Word, List: r#"expected = "reason"#, NameValueStr: "reason"),
Ungated
),
(symbols::ignore, Normal, template!(Word, NameValueStr: "reason"), Ungated),
(symbols::no_implicit_prelude, Normal, template!(Word), Ungated),
(symbols::reexport_test_harness_main, Normal, template!(NameValueStr: "name"), Ungated),
(symbols::link_args, Normal, template!(NameValueStr: "args"), Gated(Stability::Unstable,
(sym::ignore, Normal, template!(Word, NameValueStr: "reason"), Ungated),
(sym::no_implicit_prelude, Normal, template!(Word), Ungated),
(sym::reexport_test_harness_main, Normal, template!(NameValueStr: "name"), Ungated),
(sym::link_args, Normal, template!(NameValueStr: "args"), Gated(Stability::Unstable,
"link_args",
"the `link_args` attribute is experimental and not \
portable across platforms, it is recommended to \
use `#[link(name = \"foo\")] instead",
cfg_fn!(link_args))),
(symbols::macro_escape, Normal, template!(Word), Ungated),
(sym::macro_escape, Normal, template!(Word), Ungated),
// RFC #1445.
(symbols::structural_match, Whitelisted, template!(Word), Gated(Stability::Unstable,
(sym::structural_match, Whitelisted, template!(Word), Gated(Stability::Unstable,
"structural_match",
"the semantics of constant patterns is \
not yet settled",
cfg_fn!(structural_match))),
// RFC #2008
(symbols::non_exhaustive, Whitelisted, template!(Word), Gated(Stability::Unstable,
(sym::non_exhaustive, Whitelisted, template!(Word), Gated(Stability::Unstable,
"non_exhaustive",
"non exhaustive is an experimental feature",
cfg_fn!(non_exhaustive))),
// RFC #1268
(symbols::marker, Normal, template!(Word), Gated(Stability::Unstable,
(sym::marker, Normal, template!(Word), Gated(Stability::Unstable,
"marker_trait_attr",
"marker traits is an experimental feature",
cfg_fn!(marker_trait_attr))),
(symbols::plugin, CrateLevel, template!(List: "name|name(args)"), Gated(Stability::Unstable,
(sym::plugin, CrateLevel, template!(List: "name|name(args)"), Gated(Stability::Unstable,
"plugin",
"compiler plugins are experimental \
and possibly buggy",
cfg_fn!(plugin))),
(symbols::no_std, CrateLevel, template!(Word), Ungated),
(symbols::no_core, CrateLevel, template!(Word), Gated(Stability::Unstable,
(sym::no_std, CrateLevel, template!(Word), Ungated),
(sym::no_core, CrateLevel, template!(Word), Gated(Stability::Unstable,
"no_core",
"no_core is experimental",
cfg_fn!(no_core))),
(symbols::lang, Normal, template!(NameValueStr: "name"), Gated(Stability::Unstable,
(sym::lang, Normal, template!(NameValueStr: "name"), Gated(Stability::Unstable,
"lang_items",
"language items are subject to change",
cfg_fn!(lang_items))),
(symbols::linkage, Whitelisted, template!(NameValueStr: "external|internal|..."),
(sym::linkage, Whitelisted, template!(NameValueStr: "external|internal|..."),
Gated(Stability::Unstable,
"linkage",
"the `linkage` attribute is experimental \
and not portable across platforms",
cfg_fn!(linkage))),
(symbols::thread_local, Whitelisted, template!(Word), Gated(Stability::Unstable,
(sym::thread_local, Whitelisted, template!(Word), Gated(Stability::Unstable,
"thread_local",
"`#[thread_local]` is an experimental feature, and does \
not currently handle destructors",
cfg_fn!(thread_local))),
(symbols::rustc_on_unimplemented, Whitelisted, template!(List:
(sym::rustc_on_unimplemented, Whitelisted, template!(List:
r#"/*opt*/ message = "...", /*opt*/ label = "...", /*opt*/ note = "...""#,
NameValueStr: "message"),
Gated(Stability::Unstable,
@ -1071,101 +1071,101 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
"the `#[rustc_on_unimplemented]` attribute \
is an experimental feature",
cfg_fn!(on_unimplemented))),
(symbols::rustc_const_unstable, Normal, template!(List: r#"feature = "name""#),
(sym::rustc_const_unstable, Normal, template!(List: r#"feature = "name""#),
Gated(Stability::Unstable,
"rustc_const_unstable",
"the `#[rustc_const_unstable]` attribute \
is an internal feature",
cfg_fn!(rustc_const_unstable))),
(symbols::global_allocator, Normal, template!(Word), Ungated),
(symbols::default_lib_allocator, Whitelisted, template!(Word), Gated(Stability::Unstable,
(sym::global_allocator, Normal, template!(Word), Ungated),
(sym::default_lib_allocator, Whitelisted, template!(Word), Gated(Stability::Unstable,
"allocator_internals",
"the `#[default_lib_allocator]` \
attribute is an experimental feature",
cfg_fn!(allocator_internals))),
(symbols::needs_allocator, Normal, template!(Word), Gated(Stability::Unstable,
(sym::needs_allocator, Normal, template!(Word), Gated(Stability::Unstable,
"allocator_internals",
"the `#[needs_allocator]` \
attribute is an experimental \
feature",
cfg_fn!(allocator_internals))),
(symbols::panic_runtime, Whitelisted, template!(Word), Gated(Stability::Unstable,
(sym::panic_runtime, Whitelisted, template!(Word), Gated(Stability::Unstable,
"panic_runtime",
"the `#[panic_runtime]` attribute is \
an experimental feature",
cfg_fn!(panic_runtime))),
(symbols::needs_panic_runtime, Whitelisted, template!(Word), Gated(Stability::Unstable,
(sym::needs_panic_runtime, Whitelisted, template!(Word), Gated(Stability::Unstable,
"needs_panic_runtime",
"the `#[needs_panic_runtime]` \
attribute is an experimental \
feature",
cfg_fn!(needs_panic_runtime))),
(symbols::rustc_outlives, Normal, template!(Word), Gated(Stability::Unstable,
(sym::rustc_outlives, Normal, template!(Word), Gated(Stability::Unstable,
"rustc_attrs",
"the `#[rustc_outlives]` attribute \
is just used for rustc unit tests \
and will never be stable",
cfg_fn!(rustc_attrs))),
(symbols::rustc_variance, Normal, template!(Word), Gated(Stability::Unstable,
(sym::rustc_variance, Normal, template!(Word), Gated(Stability::Unstable,
"rustc_attrs",
"the `#[rustc_variance]` attribute \
is just used for rustc unit tests \
and will never be stable",
cfg_fn!(rustc_attrs))),
(symbols::rustc_layout, Normal, template!(List: "field1, field2, ..."),
(sym::rustc_layout, Normal, template!(List: "field1, field2, ..."),
Gated(Stability::Unstable,
"rustc_attrs",
"the `#[rustc_layout]` attribute \
is just used for rustc unit tests \
and will never be stable",
cfg_fn!(rustc_attrs))),
(symbols::rustc_layout_scalar_valid_range_start, Whitelisted, template!(List: "value"),
(sym::rustc_layout_scalar_valid_range_start, Whitelisted, template!(List: "value"),
Gated(Stability::Unstable,
"rustc_attrs",
"the `#[rustc_layout_scalar_valid_range_start]` attribute \
is just used to enable niche optimizations in libcore \
and will never be stable",
cfg_fn!(rustc_attrs))),
(symbols::rustc_layout_scalar_valid_range_end, Whitelisted, template!(List: "value"),
(sym::rustc_layout_scalar_valid_range_end, Whitelisted, template!(List: "value"),
Gated(Stability::Unstable,
"rustc_attrs",
"the `#[rustc_layout_scalar_valid_range_end]` attribute \
is just used to enable niche optimizations in libcore \
and will never be stable",
cfg_fn!(rustc_attrs))),
(symbols::rustc_regions, Normal, template!(Word), Gated(Stability::Unstable,
(sym::rustc_regions, Normal, template!(Word), Gated(Stability::Unstable,
"rustc_attrs",
"the `#[rustc_regions]` attribute \
is just used for rustc unit tests \
and will never be stable",
cfg_fn!(rustc_attrs))),
(symbols::rustc_error, Whitelisted, template!(Word), Gated(Stability::Unstable,
(sym::rustc_error, Whitelisted, template!(Word), Gated(Stability::Unstable,
"rustc_attrs",
"the `#[rustc_error]` attribute \
is just used for rustc unit tests \
and will never be stable",
cfg_fn!(rustc_attrs))),
(symbols::rustc_dump_user_substs, Whitelisted, template!(Word), Gated(Stability::Unstable,
(sym::rustc_dump_user_substs, Whitelisted, template!(Word), Gated(Stability::Unstable,
"rustc_attrs",
"this attribute \
is just used for rustc unit tests \
and will never be stable",
cfg_fn!(rustc_attrs))),
(symbols::rustc_if_this_changed, Whitelisted, template!(Word, List: "DepNode"),
(sym::rustc_if_this_changed, Whitelisted, template!(Word, List: "DepNode"),
Gated(Stability::Unstable,
"rustc_attrs",
"the `#[rustc_if_this_changed]` attribute \
is just used for rustc unit tests \
and will never be stable",
cfg_fn!(rustc_attrs))),
(symbols::rustc_then_this_would_need, Whitelisted, template!(List: "DepNode"),
(sym::rustc_then_this_would_need, Whitelisted, template!(List: "DepNode"),
Gated(Stability::Unstable,
"rustc_attrs",
"the `#[rustc_if_this_changed]` attribute \
is just used for rustc unit tests \
and will never be stable",
cfg_fn!(rustc_attrs))),
(symbols::rustc_dirty, Whitelisted, template!(List: r#"cfg = "...", /*opt*/ label = "...",
(sym::rustc_dirty, Whitelisted, template!(List: r#"cfg = "...", /*opt*/ label = "...",
/*opt*/ except = "...""#),
Gated(Stability::Unstable,
"rustc_attrs",
@ -1173,7 +1173,7 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
is just used for rustc unit tests \
and will never be stable",
cfg_fn!(rustc_attrs))),
(symbols::rustc_clean, Whitelisted, template!(List: r#"cfg = "...", /*opt*/ label = "...",
(sym::rustc_clean, Whitelisted, template!(List: r#"cfg = "...", /*opt*/ label = "...",
/*opt*/ except = "...""#),
Gated(Stability::Unstable,
"rustc_attrs",
@ -1182,7 +1182,7 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
and will never be stable",
cfg_fn!(rustc_attrs))),
(
symbols::rustc_partition_reused,
sym::rustc_partition_reused,
Whitelisted,
template!(List: r#"cfg = "...", module = "...""#),
Gated(
@ -1195,7 +1195,7 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
)
),
(
symbols::rustc_partition_codegened,
sym::rustc_partition_codegened,
Whitelisted,
template!(List: r#"cfg = "...", module = "...""#),
Gated(
@ -1207,7 +1207,7 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
cfg_fn!(rustc_attrs),
)
),
(symbols::rustc_expected_cgu_reuse, Whitelisted, template!(List: r#"cfg = "...", module = "...",
(sym::rustc_expected_cgu_reuse, Whitelisted, template!(List: r#"cfg = "...", module = "...",
kind = "...""#),
Gated(Stability::Unstable,
"rustc_attrs",
@ -1215,28 +1215,28 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
is just used for rustc unit tests \
and will never be stable",
cfg_fn!(rustc_attrs))),
(symbols::rustc_synthetic, Whitelisted, template!(Word), Gated(Stability::Unstable,
(sym::rustc_synthetic, Whitelisted, template!(Word), Gated(Stability::Unstable,
"rustc_attrs",
"this attribute \
is just used for rustc unit tests \
and will never be stable",
cfg_fn!(rustc_attrs))),
(symbols::rustc_symbol_name, Whitelisted, template!(Word), Gated(Stability::Unstable,
(sym::rustc_symbol_name, Whitelisted, template!(Word), Gated(Stability::Unstable,
"rustc_attrs",
"internal rustc attributes will never be stable",
cfg_fn!(rustc_attrs))),
(symbols::rustc_def_path, Whitelisted, template!(Word), Gated(Stability::Unstable,
(sym::rustc_def_path, Whitelisted, template!(Word), Gated(Stability::Unstable,
"rustc_attrs",
"internal rustc attributes will never be stable",
cfg_fn!(rustc_attrs))),
(symbols::rustc_mir, Whitelisted, template!(List: "arg1, arg2, ..."), Gated(Stability::Unstable,
(sym::rustc_mir, Whitelisted, template!(List: "arg1, arg2, ..."), Gated(Stability::Unstable,
"rustc_attrs",
"the `#[rustc_mir]` attribute \
is just used for rustc unit tests \
and will never be stable",
cfg_fn!(rustc_attrs))),
(
symbols::rustc_inherit_overflow_checks,
sym::rustc_inherit_overflow_checks,
Whitelisted,
template!(Word),
Gated(
@ -1251,35 +1251,35 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
)
),
(symbols::rustc_dump_program_clauses, Whitelisted, template!(Word), Gated(Stability::Unstable,
(sym::rustc_dump_program_clauses, Whitelisted, template!(Word), Gated(Stability::Unstable,
"rustc_attrs",
"the `#[rustc_dump_program_clauses]` \
attribute is just used for rustc unit \
tests and will never be stable",
cfg_fn!(rustc_attrs))),
(symbols::rustc_test_marker, Normal, template!(Word), Gated(Stability::Unstable,
(sym::rustc_test_marker, Normal, template!(Word), Gated(Stability::Unstable,
"rustc_attrs",
"the `#[rustc_test_marker]` attribute \
is used internally to track tests",
cfg_fn!(rustc_attrs))),
(symbols::rustc_transparent_macro, Whitelisted, template!(Word), Gated(Stability::Unstable,
(sym::rustc_transparent_macro, Whitelisted, template!(Word), Gated(Stability::Unstable,
"rustc_attrs",
"used internally for testing macro hygiene",
cfg_fn!(rustc_attrs))),
(symbols::compiler_builtins, Whitelisted, template!(Word), Gated(Stability::Unstable,
(sym::compiler_builtins, Whitelisted, template!(Word), Gated(Stability::Unstable,
"compiler_builtins",
"the `#[compiler_builtins]` attribute is used to \
identify the `compiler_builtins` crate which \
contains compiler-rt intrinsics and will never be \
stable",
cfg_fn!(compiler_builtins))),
(symbols::sanitizer_runtime, Whitelisted, template!(Word), Gated(Stability::Unstable,
(sym::sanitizer_runtime, Whitelisted, template!(Word), Gated(Stability::Unstable,
"sanitizer_runtime",
"the `#[sanitizer_runtime]` attribute is used to \
identify crates that contain the runtime of a \
sanitizer and will never be stable",
cfg_fn!(sanitizer_runtime))),
(symbols::profiler_runtime, Whitelisted, template!(Word), Gated(Stability::Unstable,
(sym::profiler_runtime, Whitelisted, template!(Word), Gated(Stability::Unstable,
"profiler_runtime",
"the `#[profiler_runtime]` attribute is used to \
identify the `profiler_builtins` crate which \
@ -1287,35 +1287,35 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
stable",
cfg_fn!(profiler_runtime))),
(symbols::allow_internal_unstable, Normal, template!(Word, List: "feat1, feat2, ..."),
(sym::allow_internal_unstable, Normal, template!(Word, List: "feat1, feat2, ..."),
Gated(Stability::Unstable,
"allow_internal_unstable",
EXPLAIN_ALLOW_INTERNAL_UNSTABLE,
cfg_fn!(allow_internal_unstable))),
(symbols::allow_internal_unsafe, Normal, template!(Word), Gated(Stability::Unstable,
(sym::allow_internal_unsafe, Normal, template!(Word), Gated(Stability::Unstable,
"allow_internal_unsafe",
EXPLAIN_ALLOW_INTERNAL_UNSAFE,
cfg_fn!(allow_internal_unsafe))),
(symbols::fundamental, Whitelisted, template!(Word), Gated(Stability::Unstable,
(sym::fundamental, Whitelisted, template!(Word), Gated(Stability::Unstable,
"fundamental",
"the `#[fundamental]` attribute \
is an experimental feature",
cfg_fn!(fundamental))),
(symbols::proc_macro_derive, Normal, template!(List: "TraitName, \
(sym::proc_macro_derive, Normal, template!(List: "TraitName, \
/*opt*/ attributes(name1, name2, ...)"),
Ungated),
(symbols::rustc_copy_clone_marker, Whitelisted, template!(Word), Gated(Stability::Unstable,
(sym::rustc_copy_clone_marker, Whitelisted, template!(Word), Gated(Stability::Unstable,
"rustc_attrs",
"internal implementation detail",
cfg_fn!(rustc_attrs))),
// FIXME: #14408 whitelist docs since rustdoc looks at them
(
symbols::doc,
sym::doc,
Whitelisted,
template!(List: "hidden|inline|...", NameValueStr: "string"),
Ungated
@ -1323,33 +1323,33 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
// FIXME: #14406 these are processed in codegen, which happens after the
// lint pass
(symbols::cold, Whitelisted, template!(Word), Ungated),
(symbols::naked, Whitelisted, template!(Word), Gated(Stability::Unstable,
(sym::cold, Whitelisted, template!(Word), Ungated),
(sym::naked, Whitelisted, template!(Word), Gated(Stability::Unstable,
"naked_functions",
"the `#[naked]` attribute \
is an experimental feature",
cfg_fn!(naked_functions))),
(symbols::ffi_returns_twice, Whitelisted, template!(Word), Gated(Stability::Unstable,
(sym::ffi_returns_twice, Whitelisted, template!(Word), Gated(Stability::Unstable,
"ffi_returns_twice",
"the `#[ffi_returns_twice]` attribute \
is an experimental feature",
cfg_fn!(ffi_returns_twice))),
(symbols::target_feature, Whitelisted, template!(List: r#"enable = "name""#), Ungated),
(symbols::export_name, Whitelisted, template!(NameValueStr: "name"), Ungated),
(symbols::inline, Whitelisted, template!(Word, List: "always|never"), Ungated),
(symbols::link, Whitelisted, template!(List: r#"name = "...", /*opt*/ kind = "dylib|static|...",
(sym::target_feature, Whitelisted, template!(List: r#"enable = "name""#), Ungated),
(sym::export_name, Whitelisted, template!(NameValueStr: "name"), Ungated),
(sym::inline, Whitelisted, template!(Word, List: "always|never"), Ungated),
(sym::link, Whitelisted, template!(List: r#"name = "...", /*opt*/ kind = "dylib|static|...",
/*opt*/ cfg = "...""#), Ungated),
(symbols::link_name, Whitelisted, template!(NameValueStr: "name"), Ungated),
(symbols::link_section, Whitelisted, template!(NameValueStr: "name"), Ungated),
(symbols::no_builtins, Whitelisted, template!(Word), Ungated),
(symbols::no_debug, Whitelisted, template!(Word), Gated(
(sym::link_name, Whitelisted, template!(NameValueStr: "name"), Ungated),
(sym::link_section, Whitelisted, template!(NameValueStr: "name"), Ungated),
(sym::no_builtins, Whitelisted, template!(Word), Ungated),
(sym::no_debug, Whitelisted, template!(Word), Gated(
Stability::Deprecated("https://github.com/rust-lang/rust/issues/29721", None),
"no_debug",
"the `#[no_debug]` attribute was an experimental feature that has been \
deprecated due to lack of demand",
cfg_fn!(no_debug))),
(
symbols::omit_gdb_pretty_printer_section,
sym::omit_gdb_pretty_printer_section,
Whitelisted,
template!(Word),
Gated(
@ -1361,7 +1361,7 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
cfg_fn!(omit_gdb_pretty_printer_section)
)
),
(symbols::unsafe_destructor_blind_to_params,
(sym::unsafe_destructor_blind_to_params,
Normal,
template!(Word),
Gated(Stability::Deprecated("https://github.com/rust-lang/rust/issues/34761",
@ -1370,21 +1370,21 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
"unsafe_destructor_blind_to_params has been replaced by \
may_dangle and will be removed in the future",
cfg_fn!(dropck_parametricity))),
(symbols::may_dangle,
(sym::may_dangle,
Normal,
template!(Word),
Gated(Stability::Unstable,
"dropck_eyepatch",
"may_dangle has unstable semantics and may be removed in the future",
cfg_fn!(dropck_eyepatch))),
(symbols::unwind, Whitelisted, template!(List: "allowed|aborts"), Gated(Stability::Unstable,
(sym::unwind, Whitelisted, template!(List: "allowed|aborts"), Gated(Stability::Unstable,
"unwind_attributes",
"#[unwind] is experimental",
cfg_fn!(unwind_attributes))),
(symbols::used, Whitelisted, template!(Word), Ungated),
(sym::used, Whitelisted, template!(Word), Ungated),
// used in resolve
(symbols::prelude_import, Whitelisted, template!(Word), Gated(Stability::Unstable,
(sym::prelude_import, Whitelisted, template!(Word), Gated(Stability::Unstable,
"prelude_import",
"`#[prelude_import]` is for use by rustc only",
cfg_fn!(prelude_import))),
@ -1392,25 +1392,25 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
// FIXME: #14407 these are only looked at on-demand so we can't
// guarantee they'll have already been checked
(
symbols::rustc_deprecated,
sym::rustc_deprecated,
Whitelisted,
template!(List: r#"since = "version", reason = "...""#),
Ungated
),
(symbols::must_use, Whitelisted, template!(Word, NameValueStr: "reason"), Ungated),
(sym::must_use, Whitelisted, template!(Word, NameValueStr: "reason"), Ungated),
(
symbols::stable,
sym::stable,
Whitelisted,
template!(List: r#"feature = "name", since = "version""#),
Ungated
),
(
symbols::unstable,
sym::unstable,
Whitelisted,
template!(List: r#"feature = "name", reason = "...", issue = "N""#),
Ungated
),
(symbols::deprecated,
(sym::deprecated,
Normal,
template!(
Word,
@ -1420,69 +1420,69 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
Ungated
),
(symbols::rustc_paren_sugar, Normal, template!(Word), Gated(Stability::Unstable,
(sym::rustc_paren_sugar, Normal, template!(Word), Gated(Stability::Unstable,
"unboxed_closures",
"unboxed_closures are still evolving",
cfg_fn!(unboxed_closures))),
(symbols::windows_subsystem, Whitelisted, template!(NameValueStr: "windows|console"), Ungated),
(sym::windows_subsystem, Whitelisted, template!(NameValueStr: "windows|console"), Ungated),
(symbols::proc_macro_attribute, Normal, template!(Word), Ungated),
(symbols::proc_macro, Normal, template!(Word), Ungated),
(sym::proc_macro_attribute, Normal, template!(Word), Ungated),
(sym::proc_macro, Normal, template!(Word), Ungated),
(symbols::rustc_proc_macro_decls, Normal, template!(Word), Gated(Stability::Unstable,
(sym::rustc_proc_macro_decls, Normal, template!(Word), Gated(Stability::Unstable,
"rustc_attrs",
"used internally by rustc",
cfg_fn!(rustc_attrs))),
(symbols::allow_fail, Normal, template!(Word), Gated(Stability::Unstable,
(sym::allow_fail, Normal, template!(Word), Gated(Stability::Unstable,
"allow_fail",
"allow_fail attribute is currently unstable",
cfg_fn!(allow_fail))),
(symbols::rustc_std_internal_symbol, Whitelisted, template!(Word), Gated(Stability::Unstable,
(sym::rustc_std_internal_symbol, Whitelisted, template!(Word), Gated(Stability::Unstable,
"rustc_attrs",
"this is an internal attribute that will \
never be stable",
cfg_fn!(rustc_attrs))),
// whitelists "identity-like" conversion methods to suggest on type mismatch
(symbols::rustc_conversion_suggestion, Whitelisted, template!(Word), Gated(Stability::Unstable,
(sym::rustc_conversion_suggestion, Whitelisted, template!(Word), Gated(Stability::Unstable,
"rustc_attrs",
"this is an internal attribute that will \
never be stable",
cfg_fn!(rustc_attrs))),
(
symbols::rustc_args_required_const,
sym::rustc_args_required_const,
Whitelisted,
template!(List: "N"),
Gated(Stability::Unstable, "rustc_attrs", "never will be stable", cfg_fn!(rustc_attrs))
),
// RFC 2070
(symbols::panic_handler, Normal, template!(Word), Ungated),
(sym::panic_handler, Normal, template!(Word), Ungated),
(symbols::alloc_error_handler, Normal, template!(Word), Gated(Stability::Unstable,
(sym::alloc_error_handler, Normal, template!(Word), Gated(Stability::Unstable,
"alloc_error_handler",
"#[alloc_error_handler] is an unstable feature",
cfg_fn!(alloc_error_handler))),
// RFC 2412
(symbols::optimize, Whitelisted, template!(List: "size|speed"), Gated(Stability::Unstable,
(sym::optimize, Whitelisted, template!(List: "size|speed"), Gated(Stability::Unstable,
"optimize_attribute",
"#[optimize] attribute is an unstable feature",
cfg_fn!(optimize_attribute))),
// Crate level attributes
(symbols::crate_name, CrateLevel, template!(NameValueStr: "name"), Ungated),
(symbols::crate_type, CrateLevel, template!(NameValueStr: "bin|lib|..."), Ungated),
(symbols::crate_id, CrateLevel, template!(NameValueStr: "ignored"), Ungated),
(symbols::feature, CrateLevel, template!(List: "name1, name1, ..."), Ungated),
(symbols::no_start, CrateLevel, template!(Word), Ungated),
(symbols::no_main, CrateLevel, template!(Word), Ungated),
(symbols::recursion_limit, CrateLevel, template!(NameValueStr: "N"), Ungated),
(symbols::type_length_limit, CrateLevel, template!(NameValueStr: "N"), Ungated),
(symbols::test_runner, CrateLevel, template!(List: "path"), Gated(Stability::Unstable,
(sym::crate_name, CrateLevel, template!(NameValueStr: "name"), Ungated),
(sym::crate_type, CrateLevel, template!(NameValueStr: "bin|lib|..."), Ungated),
(sym::crate_id, CrateLevel, template!(NameValueStr: "ignored"), Ungated),
(sym::feature, CrateLevel, template!(List: "name1, name1, ..."), Ungated),
(sym::no_start, CrateLevel, template!(Word), Ungated),
(sym::no_main, CrateLevel, template!(Word), Ungated),
(sym::recursion_limit, CrateLevel, template!(NameValueStr: "N"), Ungated),
(sym::type_length_limit, CrateLevel, template!(NameValueStr: "N"), Ungated),
(sym::test_runner, CrateLevel, template!(List: "path"), Gated(Stability::Unstable,
"custom_test_frameworks",
EXPLAIN_CUSTOM_TEST_FRAMEWORKS,
cfg_fn!(custom_test_frameworks))),
@ -1582,9 +1582,9 @@ impl<'a> Context<'a> {
self, has_feature, attr.span, name, desc, GateStrength::Hard
);
}
} else if name == symbols::doc {
} else if name == sym::doc {
if let Some(content) = attr.meta_item_list() {
if content.iter().any(|c| c.check_name(symbols::include)) {
if content.iter().any(|c| c.check_name(sym::include)) {
gate_feature!(self, external_doc, attr.span,
"#[doc(include = \"...\")] is experimental"
);
@ -1841,11 +1841,11 @@ impl<'a> PostExpansionVisitor<'a> {
template: AttributeTemplate) {
// Some special attributes like `cfg` must be checked
// before the generic check, so we skip them here.
let should_skip = |name| name == symbols::cfg;
let should_skip = |name| name == sym::cfg;
// Some of previously accepted forms were used in practice,
// report them as warnings for now.
let should_warn = |name| name == symbols::doc || name == symbols::ignore ||
name == symbols::inline || name == symbols::link;
let should_warn = |name| name == sym::doc || name == sym::ignore ||
name == sym::inline || name == sym::link;
match attr.parse_meta(self.context.parse_sess) {
Ok(meta) => if !should_skip(name) && !template.compatible(&meta.node) {
@ -1893,25 +1893,25 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
// check for gated attributes
self.context.check_attribute(attr, attr_info, false);
if attr.check_name(symbols::doc) {
if attr.check_name(sym::doc) {
if let Some(content) = attr.meta_item_list() {
if content.len() == 1 && content[0].check_name(symbols::cfg) {
if content.len() == 1 && content[0].check_name(sym::cfg) {
gate_feature_post!(&self, doc_cfg, attr.span,
"#[doc(cfg(...))] is experimental"
);
} else if content.iter().any(|c| c.check_name(symbols::masked)) {
} else if content.iter().any(|c| c.check_name(sym::masked)) {
gate_feature_post!(&self, doc_masked, attr.span,
"#[doc(masked)] is experimental"
);
} else if content.iter().any(|c| c.check_name(symbols::spotlight)) {
} else if content.iter().any(|c| c.check_name(sym::spotlight)) {
gate_feature_post!(&self, doc_spotlight, attr.span,
"#[doc(spotlight)] is experimental"
);
} else if content.iter().any(|c| c.check_name(symbols::alias)) {
} else if content.iter().any(|c| c.check_name(sym::alias)) {
gate_feature_post!(&self, doc_alias, attr.span,
"#[doc(alias = \"...\")] is experimental"
);
} else if content.iter().any(|c| c.check_name(symbols::keyword)) {
} else if content.iter().any(|c| c.check_name(sym::keyword)) {
gate_feature_post!(&self, doc_keyword, attr.span,
"#[doc(keyword = \"...\")] is experimental"
);
@ -1978,7 +1978,7 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
ast::ItemKind::Struct(..) => {
for attr in attr::filter_by_name(&i.attrs[..], "repr") {
for item in attr.meta_item_list().unwrap_or_else(Vec::new) {
if item.check_name(symbols::simd) {
if item.check_name(sym::simd) {
gate_feature_post!(&self, repr_simd, attr.span,
"SIMD types are experimental and possibly buggy");
}
@ -1989,7 +1989,7 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
ast::ItemKind::Enum(..) => {
for attr in attr::filter_by_name(&i.attrs[..], "repr") {
for item in attr.meta_item_list().unwrap_or_else(Vec::new) {
if item.check_name(symbols::align) {
if item.check_name(sym::align) {
gate_feature_post!(&self, repr_align_enum, attr.span,
"`#[repr(align(x))]` on enums is experimental");
}
@ -2319,7 +2319,7 @@ pub fn get_features(span_handler: &Handler, krate_attrs: &[ast::Attribute],
// Process the edition umbrella feature-gates first, to ensure
// `edition_enabled_features` is completed before it's queried.
for attr in krate_attrs {
if !attr.check_name(symbols::feature) {
if !attr.check_name(sym::feature) {
continue
}
@ -2364,7 +2364,7 @@ pub fn get_features(span_handler: &Handler, krate_attrs: &[ast::Attribute],
}
for attr in krate_attrs {
if !attr.check_name(symbols::feature) {
if !attr.check_name(sym::feature) {
continue
}
@ -2496,7 +2496,7 @@ fn maybe_stage_features(span_handler: &Handler, krate: &ast::Crate,
};
if !allow_features {
for attr in &krate.attrs {
if attr.check_name(symbols::feature) {
if attr.check_name(sym::feature) {
let release_channel = option_env!("CFG_RELEASE_CHANNEL").unwrap_or("(unknown)");
span_err!(span_handler, attr.span, E0554,
"#![feature] may not be used on the {} release channel",

View file

@ -33,7 +33,7 @@ mod span_encoding;
pub use span_encoding::{Span, DUMMY_SP};
pub mod symbol;
pub use symbol::symbols;
pub use symbol::sym;
mod analyze_source_file;

View file

@ -99,8 +99,8 @@ symbols! {
Union: "union",
}
// Symbols that can be referred to with syntax_pos::symbols::*. The symbol
// is the stringified identifier unless otherwise specified (e.g.
// Symbols that can be referred to with syntax_pos::sym::*. The symbol is
// the stringified identifier unless otherwise specified (e.g.
// `proc_dash_macro` represents "proc-macro").
Symbols {
aarch64_target_feature,
@ -937,7 +937,8 @@ pub mod keywords {
keywords!();
}
pub mod symbols {
// This module has a very short name because it's used a lot.
pub mod sym {
use super::Symbol;
symbols!();
}