Skip to content

Commit 5dcf0e8

Browse files
authored
Rollup merge of #37727 - GuillaumeGomez:invalid_src, r=eddyb
Fix invalid src url Fixes #37684. Thanks to @eddyb's help. r? @eddyb
2 parents 79b8bb8 + 248a3d9 commit 5dcf0e8

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

src/libcore/macros.rs

+15-2
Original file line numberDiff line numberDiff line change
@@ -550,15 +550,15 @@ macro_rules! unimplemented {
550550
/// into libsyntax itself.
551551
///
552552
/// For more information, see documentation for `std`'s macros.
553-
#[cfg(dox)]
554-
pub mod builtin {
553+
mod builtin {
555554
/// The core macro for formatted string creation & output.
556555
///
557556
/// For more information, see the documentation for [`std::format_args!`].
558557
///
559558
/// [`std::format_args!`]: ../std/macro.format_args.html
560559
#[stable(feature = "rust1", since = "1.0.0")]
561560
#[macro_export]
561+
#[cfg(dox)]
562562
macro_rules! format_args { ($fmt:expr, $($args:tt)*) => ({
563563
/* compiler built-in */
564564
}) }
@@ -570,6 +570,7 @@ pub mod builtin {
570570
/// [`std::env!`]: ../std/macro.env.html
571571
#[stable(feature = "rust1", since = "1.0.0")]
572572
#[macro_export]
573+
#[cfg(dox)]
573574
macro_rules! env { ($name:expr) => ({ /* compiler built-in */ }) }
574575

575576
/// Optionally inspect an environment variable at compile time.
@@ -579,6 +580,7 @@ pub mod builtin {
579580
/// [`std::option_env!`]: ../std/macro.option_env.html
580581
#[stable(feature = "rust1", since = "1.0.0")]
581582
#[macro_export]
583+
#[cfg(dox)]
582584
macro_rules! option_env { ($name:expr) => ({ /* compiler built-in */ }) }
583585

584586
/// Concatenate identifiers into one identifier.
@@ -588,6 +590,7 @@ pub mod builtin {
588590
/// [`std::concat_idents!`]: ../std/macro.concat_idents.html
589591
#[unstable(feature = "concat_idents_macro", issue = "29599")]
590592
#[macro_export]
593+
#[cfg(dox)]
591594
macro_rules! concat_idents {
592595
($($e:ident),*) => ({ /* compiler built-in */ })
593596
}
@@ -599,6 +602,7 @@ pub mod builtin {
599602
/// [`std::concat!`]: ../std/macro.concat.html
600603
#[stable(feature = "rust1", since = "1.0.0")]
601604
#[macro_export]
605+
#[cfg(dox)]
602606
macro_rules! concat { ($($e:expr),*) => ({ /* compiler built-in */ }) }
603607

604608
/// A macro which expands to the line number on which it was invoked.
@@ -608,6 +612,7 @@ pub mod builtin {
608612
/// [`std::line!`]: ../std/macro.line.html
609613
#[stable(feature = "rust1", since = "1.0.0")]
610614
#[macro_export]
615+
#[cfg(dox)]
611616
macro_rules! line { () => ({ /* compiler built-in */ }) }
612617

613618
/// A macro which expands to the column number on which it was invoked.
@@ -617,6 +622,7 @@ pub mod builtin {
617622
/// [`std::column!`]: ../std/macro.column.html
618623
#[stable(feature = "rust1", since = "1.0.0")]
619624
#[macro_export]
625+
#[cfg(dox)]
620626
macro_rules! column { () => ({ /* compiler built-in */ }) }
621627

622628
/// A macro which expands to the file name from which it was invoked.
@@ -626,6 +632,7 @@ pub mod builtin {
626632
/// [`std::file!`]: ../std/macro.file.html
627633
#[stable(feature = "rust1", since = "1.0.0")]
628634
#[macro_export]
635+
#[cfg(dox)]
629636
macro_rules! file { () => ({ /* compiler built-in */ }) }
630637

631638
/// A macro which stringifies its argument.
@@ -635,6 +642,7 @@ pub mod builtin {
635642
/// [`std::stringify!`]: ../std/macro.stringify.html
636643
#[stable(feature = "rust1", since = "1.0.0")]
637644
#[macro_export]
645+
#[cfg(dox)]
638646
macro_rules! stringify { ($t:tt) => ({ /* compiler built-in */ }) }
639647

640648
/// Includes a utf8-encoded file as a string.
@@ -644,6 +652,7 @@ pub mod builtin {
644652
/// [`std::include_str!`]: ../std/macro.include_str.html
645653
#[stable(feature = "rust1", since = "1.0.0")]
646654
#[macro_export]
655+
#[cfg(dox)]
647656
macro_rules! include_str { ($file:expr) => ({ /* compiler built-in */ }) }
648657

649658
/// Includes a file as a reference to a byte array.
@@ -653,6 +662,7 @@ pub mod builtin {
653662
/// [`std::include_bytes!`]: ../std/macro.include_bytes.html
654663
#[stable(feature = "rust1", since = "1.0.0")]
655664
#[macro_export]
665+
#[cfg(dox)]
656666
macro_rules! include_bytes { ($file:expr) => ({ /* compiler built-in */ }) }
657667

658668
/// Expands to a string that represents the current module path.
@@ -662,6 +672,7 @@ pub mod builtin {
662672
/// [`std::module_path!`]: ../std/macro.module_path.html
663673
#[stable(feature = "rust1", since = "1.0.0")]
664674
#[macro_export]
675+
#[cfg(dox)]
665676
macro_rules! module_path { () => ({ /* compiler built-in */ }) }
666677

667678
/// Boolean evaluation of configuration flags.
@@ -671,6 +682,7 @@ pub mod builtin {
671682
/// [`std::cfg!`]: ../std/macro.cfg.html
672683
#[stable(feature = "rust1", since = "1.0.0")]
673684
#[macro_export]
685+
#[cfg(dox)]
674686
macro_rules! cfg { ($($cfg:tt)*) => ({ /* compiler built-in */ }) }
675687

676688
/// Parse a file as an expression or an item according to the context.
@@ -680,5 +692,6 @@ pub mod builtin {
680692
/// [`std::include!`]: ../std/macro.include.html
681693
#[stable(feature = "rust1", since = "1.0.0")]
682694
#[macro_export]
695+
#[cfg(dox)]
683696
macro_rules! include { ($file:expr) => ({ /* compiler built-in */ }) }
684697
}

0 commit comments

Comments
 (0)