Skip to content

Commit b3bcf48

Browse files
authored
Rollup merge of rust-lang#80534 - LeSeulArtichaut:doc-include, r=jyn514
Use #[doc = include_str!()] in std cc rust-lang#78835 (comment) r? ````@jyn514````
2 parents 6b56603 + a6eb836 commit b3bcf48

File tree

4 files changed

+3
-4
lines changed

4 files changed

+3
-4
lines changed

library/core/src/macros/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#[doc(include = "panic.md")]
1+
#[doc = include_str!("panic.md")]
22
#[macro_export]
33
#[rustc_builtin_macro = "core_panic"]
44
#[allow_internal_unstable(edition_panic)]

library/std/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,6 @@
264264
#![feature(exhaustive_patterns)]
265265
#![feature(extend_one)]
266266
#![feature(extended_key_value_attributes)]
267-
#![feature(external_doc)]
268267
#![feature(fn_traits)]
269268
#![feature(format_args_nl)]
270269
#![feature(gen_future)]

library/std/src/macros.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//! library. Each macro is available for use when linking against the standard
55
//! library.
66
7-
#[doc(include = "../../core/src/macros/panic.md")]
7+
#[doc = include_str!("../../core/src/macros/panic.md")]
88
#[macro_export]
99
#[rustc_builtin_macro = "std_panic"]
1010
#[stable(feature = "rust1", since = "1.0.0")]

library/std/src/os/raw/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ macro_rules! type_alias_no_nz {
1818
$Docfile:tt, $Alias:ident = $Real:ty;
1919
$( $Cfg:tt )*
2020
} => {
21-
#[doc(include = $Docfile)]
21+
#[doc = include_str!($Docfile)]
2222
$( $Cfg )*
2323
#[stable(feature = "raw_os", since = "1.1.0")]
2424
pub type $Alias = $Real;

0 commit comments

Comments
 (0)