From 7ebbf2046716646eec9abdbfa774ed1aef9dc8c6 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Sun, 6 Jun 2021 15:27:36 +0200 Subject: [PATCH] Fix doc build with nightly in CI The #[doc = include_str!("...")] syntax is now the new external file syntax in rust nightly - the old syntax was removed. --- api/sixtyfps-rs/docs.rs | 8 ++++---- api/sixtyfps-rs/lib.rs | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/api/sixtyfps-rs/docs.rs b/api/sixtyfps-rs/docs.rs index 637073fa3..0f2f64398 100644 --- a/api/sixtyfps-rs/docs.rs +++ b/api/sixtyfps-rs/docs.rs @@ -21,7 +21,7 @@ LICENSE END */ */ pub mod langref { - #![doc(include = "docs/langref.md")] + #![doc = include_str!("docs/langref.md")] //! //! # //! Next: [Builtin Elements](super::builtin_elements) @@ -29,7 +29,7 @@ pub mod langref { #[cfg(all(doc, nightly))] pub mod builtin_elements { - #![doc(include = "docs/builtin_elements.md")] + #![doc = include_str!("docs/builtin_elements.md")] //! //! # //! Next: [Widgets](super::widgets) @@ -37,7 +37,7 @@ pub mod builtin_elements { #[cfg(all(doc, nightly))] pub mod widgets { - #![doc(include = "docs/widgets.md")] + #![doc = include_str!("docs/widgets.md")] //! //! # //! Next: [Layouting](super::layouting) @@ -45,7 +45,7 @@ pub mod widgets { #[cfg(all(doc, nightly))] pub mod layouting { - #![doc(include = "docs/layouting.md")] + #![doc = include_str!("docs/layouting.md")] #![doc = ""] } diff --git a/api/sixtyfps-rs/lib.rs b/api/sixtyfps-rs/lib.rs index 716221d6f..40a3d93f3 100644 --- a/api/sixtyfps-rs/lib.rs +++ b/api/sixtyfps-rs/lib.rs @@ -174,7 +174,6 @@ struct MyStruct { */ -#![cfg_attr(nightly, feature(doc_cfg, external_doc))] #![warn(missing_docs)] #![deny(unsafe_code)] #![doc(html_logo_url = "https://sixtyfps.io/resources/logo.drawio.svg")]