Skip to content

Commit 6fc4fe4

Browse files
petrochenkovpetrochenkov
committed
#[rustc_doc_only_macro] -> #[rustc_builtin_macro] 
1 parent 481068a commit 6fc4fe4

File tree

6 files changed

+36
-36
lines changed

6 files changed

+36
-36
lines changed

‎src/libcore/macros.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@ mod builtin {
653653
///
654654
/// [`std::compile_error!`]: ../std/macro.compile_error.html
655655
#[stable(feature = "compile_error_macro", since = "1.20.0")]
656-
#[rustc_doc_only_macro]
656+
#[rustc_builtin_macro]
657657
macro_rules! compile_error {
658658
($msg:expr) => ({ /* compiler built-in */ });
659659
($msg:expr,) => ({ /* compiler built-in */ });
@@ -665,7 +665,7 @@ mod builtin {
665665
///
666666
/// [`std::format_args!`]: ../std/macro.format_args.html
667667
#[stable(feature = "rust1", since = "1.0.0")]
668-
#[rustc_doc_only_macro]
668+
#[rustc_builtin_macro]
669669
macro_rules! format_args {
670670
($fmt:expr) => ({ /* compiler built-in */ });
671671
($fmt:expr, $($args:tt)*) => ({ /* compiler built-in */ });
@@ -677,7 +677,7 @@ mod builtin {
677677
///
678678
/// [`std::env!`]: ../std/macro.env.html
679679
#[stable(feature = "rust1", since = "1.0.0")]
680-
#[rustc_doc_only_macro]
680+
#[rustc_builtin_macro]
681681
macro_rules! env {
682682
($name:expr) => ({ /* compiler built-in */ });
683683
($name:expr,) => ({ /* compiler built-in */ });
@@ -689,7 +689,7 @@ mod builtin {
689689
///
690690
/// [`std::option_env!`]: ../std/macro.option_env.html
691691
#[stable(feature = "rust1", since = "1.0.0")]
692-
#[rustc_doc_only_macro]
692+
#[rustc_builtin_macro]
693693
macro_rules! option_env {
694694
($name:expr) => ({ /* compiler built-in */ });
695695
($name:expr,) => ({ /* compiler built-in */ });
@@ -701,7 +701,7 @@ mod builtin {
701701
///
702702
/// [`std::concat_idents!`]: ../std/macro.concat_idents.html
703703
#[unstable(feature = "concat_idents_macro", issue = "29599")]
704-
#[rustc_doc_only_macro]
704+
#[rustc_builtin_macro]
705705
macro_rules! concat_idents {
706706
($($e:ident),+) => ({ /* compiler built-in */ });
707707
($($e:ident,)+) => ({ /* compiler built-in */ });
@@ -713,7 +713,7 @@ mod builtin {
713713
///
714714
/// [`std::concat!`]: ../std/macro.concat.html
715715
#[stable(feature = "rust1", since = "1.0.0")]
716-
#[rustc_doc_only_macro]
716+
#[rustc_builtin_macro]
717717
macro_rules! concat {
718718
($($e:expr),*) => ({ /* compiler built-in */ });
719719
($($e:expr,)*) => ({ /* compiler built-in */ });
@@ -725,7 +725,7 @@ mod builtin {
725725
///
726726
/// [`std::line!`]: ../std/macro.line.html
727727
#[stable(feature = "rust1", since = "1.0.0")]
728-
#[rustc_doc_only_macro]
728+
#[rustc_builtin_macro]
729729
macro_rules! line { () => ({ /* compiler built-in */ }) }
730730

731731
/// Expands to the column number on which it was invoked.
@@ -734,7 +734,7 @@ mod builtin {
734734
///
735735
/// [`std::column!`]: ../std/macro.column.html
736736
#[stable(feature = "rust1", since = "1.0.0")]
737-
#[rustc_doc_only_macro]
737+
#[rustc_builtin_macro]
738738
macro_rules! column { () => ({ /* compiler built-in */ }) }
739739

740740
/// Expands to the file name from which it was invoked.
@@ -743,7 +743,7 @@ mod builtin {
743743
///
744744
/// [`std::file!`]: ../std/macro.file.html
745745
#[stable(feature = "rust1", since = "1.0.0")]
746-
#[rustc_doc_only_macro]
746+
#[rustc_builtin_macro]
747747
macro_rules! file { () => ({ /* compiler built-in */ }) }
748748

749749
/// Stringifies its arguments.
@@ -752,7 +752,7 @@ mod builtin {
752752
///
753753
/// [`std::stringify!`]: ../std/macro.stringify.html
754754
#[stable(feature = "rust1", since = "1.0.0")]
755-
#[rustc_doc_only_macro]
755+
#[rustc_builtin_macro]
756756
macro_rules! stringify { ($($t:tt)*) => ({ /* compiler built-in */ }) }
757757

758758
/// Includes a utf8-encoded file as a string.
@@ -761,7 +761,7 @@ mod builtin {
761761
///
762762
/// [`std::include_str!`]: ../std/macro.include_str.html
763763
#[stable(feature = "rust1", since = "1.0.0")]
764-
#[rustc_doc_only_macro]
764+
#[rustc_builtin_macro]
765765
macro_rules! include_str {
766766
($file:expr) => ({ /* compiler built-in */ });
767767
($file:expr,) => ({ /* compiler built-in */ });
@@ -773,7 +773,7 @@ mod builtin {
773773
///
774774
/// [`std::include_bytes!`]: ../std/macro.include_bytes.html
775775
#[stable(feature = "rust1", since = "1.0.0")]
776-
#[rustc_doc_only_macro]
776+
#[rustc_builtin_macro]
777777
macro_rules! include_bytes {
778778
($file:expr) => ({ /* compiler built-in */ });
779779
($file:expr,) => ({ /* compiler built-in */ });
@@ -785,7 +785,7 @@ mod builtin {
785785
///
786786
/// [`std::module_path!`]: ../std/macro.module_path.html
787787
#[stable(feature = "rust1", since = "1.0.0")]
788-
#[rustc_doc_only_macro]
788+
#[rustc_builtin_macro]
789789
macro_rules! module_path { () => ({ /* compiler built-in */ }) }
790790

791791
/// Evaluates boolean combinations of configuration flags, at compile-time.
@@ -794,7 +794,7 @@ mod builtin {
794794
///
795795
/// [`std::cfg!`]: ../std/macro.cfg.html
796796
#[stable(feature = "rust1", since = "1.0.0")]
797-
#[rustc_doc_only_macro]
797+
#[rustc_builtin_macro]
798798
macro_rules! cfg { ($($cfg:tt)*) => ({ /* compiler built-in */ }) }
799799

800800
/// Parses a file as an expression or an item according to the context.
@@ -803,7 +803,7 @@ mod builtin {
803803
///
804804
/// [`std::include!`]: ../std/macro.include.html
805805
#[stable(feature = "rust1", since = "1.0.0")]
806-
#[rustc_doc_only_macro]
806+
#[rustc_builtin_macro]
807807
macro_rules! include {
808808
($file:expr) => ({ /* compiler built-in */ });
809809
($file:expr,) => ({ /* compiler built-in */ });
@@ -814,7 +814,7 @@ mod builtin {
814814
/// For more information, see the documentation for [`std::assert!`].
815815
///
816816
/// [`std::assert!`]: ../std/macro.assert.html
817-
#[rustc_doc_only_macro]
817+
#[rustc_builtin_macro]
818818
#[stable(feature = "rust1", since = "1.0.0")]
819819
macro_rules! assert {
820820
($cond:expr) => ({ /* compiler built-in */ });

‎src/librustc/hir/lowering.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4010,7 +4010,7 @@ impl<'a> LoweringContext<'a> {
40104010
let attrs = self.lower_attrs(&i.attrs);
40114011
if let ItemKind::MacroDef(ref def) = i.node {
40124012
if !def.legacy || attr::contains_name(&i.attrs, sym::macro_export) ||
4013-
attr::contains_name(&i.attrs, sym::rustc_doc_only_macro) {
4013+
attr::contains_name(&i.attrs, sym::rustc_builtin_macro) {
40144014
let body = self.lower_token_stream(def.stream());
40154015
let hir_id = self.lower_node_id(i.id);
40164016
self.exported_macros.push(hir::MacroDef {

‎src/librustc_resolve/macros.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1142,7 +1142,7 @@ impl<'a> Resolver<'a> {
11421142
self.define(module, ident, MacroNS,
11431143
(res, vis, item.span, expansion, IsMacroExport));
11441144
} else {
1145-
if !attr::contains_name(&item.attrs, sym::rustc_doc_only_macro) {
1145+
if !attr::contains_name(&item.attrs, sym::rustc_builtin_macro) {
11461146
self.check_reserved_macro_name(ident, MacroNS);
11471147
}
11481148
self.unused_macros.insert(def_id);

‎src/libstd/macros.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ mod builtin {
410410
///
411411
/// [`panic!`]: ../std/macro.panic.html
412412
#[stable(feature = "compile_error_macro", since = "1.20.0")]
413-
#[rustc_doc_only_macro]
413+
#[rustc_builtin_macro]
414414
macro_rules! compile_error {
415415
($msg:expr) => ({ /* compiler built-in */ });
416416
($msg:expr,) => ({ /* compiler built-in */ });
@@ -462,7 +462,7 @@ mod builtin {
462462
/// assert_eq!(s, format!("hello {}", "world"));
463463
/// ```
464464
#[stable(feature = "rust1", since = "1.0.0")]
465-
#[rustc_doc_only_macro]
465+
#[rustc_builtin_macro]
466466
macro_rules! format_args {
467467
($fmt:expr) => ({ /* compiler built-in */ });
468468
($fmt:expr, $($args:tt)*) => ({ /* compiler built-in */ });
@@ -500,7 +500,7 @@ mod builtin {
500500
/// error: what's that?!
501501
/// ```
502502
#[stable(feature = "rust1", since = "1.0.0")]
503-
#[rustc_doc_only_macro]
503+
#[rustc_builtin_macro]
504504
macro_rules! env {
505505
($name:expr) => ({ /* compiler built-in */ });
506506
($name:expr,) => ({ /* compiler built-in */ });
@@ -526,7 +526,7 @@ mod builtin {
526526
/// println!("the secret key might be: {:?}", key);
527527
/// ```
528528
#[stable(feature = "rust1", since = "1.0.0")]
529-
#[rustc_doc_only_macro]
529+
#[rustc_builtin_macro]
530530
macro_rules! option_env {
531531
($name:expr) => ({ /* compiler built-in */ });
532532
($name:expr,) => ({ /* compiler built-in */ });
@@ -557,7 +557,7 @@ mod builtin {
557557
/// # }
558558
/// ```
559559
#[unstable(feature = "concat_idents_macro", issue = "29599")]
560-
#[rustc_doc_only_macro]
560+
#[rustc_builtin_macro]
561561
macro_rules! concat_idents {
562562
($($e:ident),+) => ({ /* compiler built-in */ });
563563
($($e:ident,)+) => ({ /* compiler built-in */ });
@@ -579,7 +579,7 @@ mod builtin {
579579
/// assert_eq!(s, "test10btrue");
580580
/// ```
581581
#[stable(feature = "rust1", since = "1.0.0")]
582-
#[rustc_doc_only_macro]
582+
#[rustc_builtin_macro]
583583
macro_rules! concat {
584584
($($e:expr),*) => ({ /* compiler built-in */ });
585585
($($e:expr,)*) => ({ /* compiler built-in */ });
@@ -607,7 +607,7 @@ mod builtin {
607607
/// println!("defined on line: {}", current_line);
608608
/// ```
609609
#[stable(feature = "rust1", since = "1.0.0")]
610-
#[rustc_doc_only_macro]
610+
#[rustc_builtin_macro]
611611
macro_rules! line { () => ({ /* compiler built-in */ }) }
612612

613613
/// Expands to the column number at which it was invoked.
@@ -632,7 +632,7 @@ mod builtin {
632632
/// println!("defined on column: {}", current_col);
633633
/// ```
634634
#[stable(feature = "rust1", since = "1.0.0")]
635-
#[rustc_doc_only_macro]
635+
#[rustc_builtin_macro]
636636
macro_rules! column { () => ({ /* compiler built-in */ }) }
637637

638638
/// Expands to the file name in which it was invoked.
@@ -656,7 +656,7 @@ mod builtin {
656656
/// println!("defined in file: {}", this_file);
657657
/// ```
658658
#[stable(feature = "rust1", since = "1.0.0")]
659-
#[rustc_doc_only_macro]
659+
#[rustc_builtin_macro]
660660
macro_rules! file { () => ({ /* compiler built-in */ }) }
661661

662662
/// Stringifies its arguments.
@@ -675,7 +675,7 @@ mod builtin {
675675
/// assert_eq!(one_plus_one, "1 + 1");
676676
/// ```
677677
#[stable(feature = "rust1", since = "1.0.0")]
678-
#[rustc_doc_only_macro]
678+
#[rustc_builtin_macro]
679679
macro_rules! stringify { ($($t:tt)*) => ({ /* compiler built-in */ }) }
680680

681681
/// Includes a utf8-encoded file as a string.
@@ -709,7 +709,7 @@ mod builtin {
709709
///
710710
/// Compiling 'main.rs' and running the resulting binary will print "adiós".
711711
#[stable(feature = "rust1", since = "1.0.0")]
712-
#[rustc_doc_only_macro]
712+
#[rustc_builtin_macro]
713713
macro_rules! include_str {
714714
($file:expr) => ({ /* compiler built-in */ });
715715
($file:expr,) => ({ /* compiler built-in */ });
@@ -746,7 +746,7 @@ mod builtin {
746746
///
747747
/// Compiling 'main.rs' and running the resulting binary will print "adiós".
748748
#[stable(feature = "rust1", since = "1.0.0")]
749-
#[rustc_doc_only_macro]
749+
#[rustc_builtin_macro]
750750
macro_rules! include_bytes {
751751
($file:expr) => ({ /* compiler built-in */ });
752752
($file:expr,) => ({ /* compiler built-in */ });
@@ -770,7 +770,7 @@ mod builtin {
770770
/// test::foo();
771771
/// ```
772772
#[stable(feature = "rust1", since = "1.0.0")]
773-
#[rustc_doc_only_macro]
773+
#[rustc_builtin_macro]
774774
macro_rules! module_path { () => ({ /* compiler built-in */ }) }
775775

776776
/// Evaluates boolean combinations of configuration flags at compile-time.
@@ -794,7 +794,7 @@ mod builtin {
794794
/// };
795795
/// ```
796796
#[stable(feature = "rust1", since = "1.0.0")]
797-
#[rustc_doc_only_macro]
797+
#[rustc_builtin_macro]
798798
macro_rules! cfg { ($($cfg:tt)*) => ({ /* compiler built-in */ }) }
799799

800800
/// Parses a file as an expression or an item according to the context.
@@ -837,7 +837,7 @@ mod builtin {
837837
/// Compiling 'main.rs' and running the resulting binary will print
838838
/// "🙈🙊🙉🙈🙊🙉".
839839
#[stable(feature = "rust1", since = "1.0.0")]
840-
#[rustc_doc_only_macro]
840+
#[rustc_builtin_macro]
841841
macro_rules! include {
842842
($file:expr) => ({ /* compiler built-in */ });
843843
($file:expr,) => ({ /* compiler built-in */ });
@@ -889,7 +889,7 @@ mod builtin {
889889
/// assert!(a + b == 30, "a = {}, b = {}", a, b);
890890
/// ```
891891
#[stable(feature = "rust1", since = "1.0.0")]
892-
#[rustc_doc_only_macro]
892+
#[rustc_builtin_macro]
893893
macro_rules! assert {
894894
($cond:expr) => ({ /* compiler built-in */ });
895895
($cond:expr,) => ({ /* compiler built-in */ });

‎src/libsyntax/feature_gate.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1374,7 +1374,7 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
13741374
"internal implementation detail",
13751375
cfg_fn!(rustc_attrs))),
13761376

1377-
(sym::rustc_doc_only_macro, Whitelisted, template!(Word), Gated(Stability::Unstable,
1377+
(sym::rustc_builtin_macro, Whitelisted, template!(Word), Gated(Stability::Unstable,
13781378
sym::rustc_attrs,
13791379
"internal implementation detail",
13801380
cfg_fn!(rustc_attrs))),

‎src/libsyntax_pos/symbol.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,6 +537,7 @@ symbols! {
537537
rustc_allow_const_fn_ptr,
538538
rustc_args_required_const,
539539
rustc_attrs,
540+
rustc_builtin_macro,
540541
rustc_clean,
541542
rustc_const_unstable,
542543
rustc_conversion_suggestion,
@@ -545,7 +546,6 @@ symbols! {
545546
rustc_deprecated,
546547
rustc_diagnostic_macros,
547548
rustc_dirty,
548-
rustc_doc_only_macro,
549549
rustc_dummy,
550550
rustc_dump_env_program_clauses,
551551
rustc_dump_program_clauses,

0 commit comments

Comments
 (0)