diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2021-02-25 14:33:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-25 14:33:47 +0100 |
| commit | cb2b4ff7142935ebaaec2fe2782d0f53af87be6d (patch) | |
| tree | f4203d029206a4544acfd6dbd10409dcf569309a /library/std/src | |
| parent | c9cf92226ca3e6fa2372aa549e9593345be906a6 (diff) | |
| parent | a6eb836ff0e2dff4397468d1bcca787436489efb (diff) | |
| download | rust-cb2b4ff7142935ebaaec2fe2782d0f53af87be6d.tar.gz rust-cb2b4ff7142935ebaaec2fe2782d0f53af87be6d.zip | |
Rollup merge of #80534 - LeSeulArtichaut:doc-include, r=jyn514
Use #[doc = include_str!()] in std cc https://github.com/rust-lang/rust/issues/78835#issuecomment-742531894 r? `````@jyn514`````
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/lib.rs | 1 | ||||
| -rw-r--r-- | library/std/src/macros.rs | 2 | ||||
| -rw-r--r-- | library/std/src/os/raw/mod.rs | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs index 588bffb57c9..32aca8c8392 100644 --- 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 index c0750f8c0d1..b729349cf53 100644 --- 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 index 22c98d7ade9..50464a050c7 100644 --- 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; |