Rollup merge of rust-lang#80534 - LeSeulArtichaut:doc-include, r=jyn514

Use #[doc = include_str!()] in std cc rust-lang#78835 (comment) r? ````@jyn514````
Dylan-DPC-zz · Feb 24, 2021 · b3bcf48 · b3bcf48
2 parents 6b56603 + a6eb836
commit b3bcf48
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/library/core/src/macros/mod.rs b/library/core/src/macros/mod.rs
@@ -1,4 +1,4 @@
-#[doc(include = "panic.md")]
+#[doc = include_str!("panic.md")]
 #[macro_export]
 #[rustc_builtin_macro = "core_panic"]
 #[allow_internal_unstable(edition_panic)]

diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs
@@ -264,7 +264,6 @@
 #![feature(exhaustive_patterns)]
 #![feature(extend_one)]
 #![feature(extended_key_value_attributes)]
-#![feature(external_doc)]
 #![feature(fn_traits)]
 #![feature(format_args_nl)]
 #![feature(gen_future)]

diff --git a/library/std/src/macros.rs b/library/std/src/macros.rs
@@ -4,7 +4,7 @@
 //! library. Each macro is available for use when linking against the standard
 //! library.
 
-#[doc(include = "../../core/src/macros/panic.md")]
+#[doc = include_str!("../../core/src/macros/panic.md")]
 #[macro_export]
 #[rustc_builtin_macro = "std_panic"]
 #[stable(feature = "rust1", since = "1.0.0")]

diff --git a/library/std/src/os/raw/mod.rs b/library/std/src/os/raw/mod.rs
@@ -18,7 +18,7 @@ macro_rules! type_alias_no_nz {
       $Docfile:tt, $Alias:ident = $Real:ty;
       $( $Cfg:tt )*
     } => {
-        #[doc(include = $Docfile)]
+        #[doc = include_str!($Docfile)]
         $( $Cfg )*
         #[stable(feature = "raw_os", since = "1.1.0")]
         pub type $Alias = $Real;