From 54be466cd1b1a91a3b9f1c8efc7785a922155d58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Drouet?= Date: Thu, 19 Sep 2024 08:30:16 +0200 Subject: [PATCH] fix(lint): rename cfg from docs to doc and enable nightly for embed tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Drouet --- .github/actions/embed/Dockerfile | 2 +- src/lib.rs | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/actions/embed/Dockerfile b/.github/actions/embed/Dockerfile index 13ee7c725..a6c5276f1 100644 --- a/.github/actions/embed/Dockerfile +++ b/.github/actions/embed/Dockerfile @@ -10,6 +10,6 @@ ENV RUSTUP_HOME=/rust ENV CARGO_HOME=/cargo ENV PATH=/cargo/bin:/rust/bin:$PATH -RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path +RUN (curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly --no-modify-path) && rustup default nightly ENTRYPOINT [ "/cargo/bin/cargo", "test", "--all", "--release", "--all-features", "--no-fail-fast" ] diff --git a/src/lib.rs b/src/lib.rs index ee1d68fc8..45633c096 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -3,7 +3,7 @@ #![allow(non_upper_case_globals)] #![allow(non_camel_case_types)] #![allow(non_snake_case)] -#![cfg_attr(docs, feature(doc_cfg))] +#![cfg_attr(doc, feature(doc_cfg))] #![cfg_attr(windows, feature(abi_vectorcall))] pub mod alloc; @@ -20,8 +20,8 @@ pub mod flags; pub mod macros; pub mod boxed; pub mod class; -#[cfg(any(docs, feature = "closure"))] -#[cfg_attr(docs, doc(cfg(feature = "closure")))] +#[cfg(any(doc, feature = "closure"))] +#[cfg_attr(doc, doc(cfg(feature = "closure")))] pub mod closure; pub mod constant; pub mod describe; @@ -39,8 +39,8 @@ pub mod zend; pub mod prelude { pub use crate::builders::ModuleBuilder; - #[cfg(any(docs, feature = "closure"))] - #[cfg_attr(docs, doc(cfg(feature = "closure")))] + #[cfg(any(doc, feature = "closure"))] + #[cfg_attr(doc, doc(cfg(feature = "closure")))] pub use crate::closure::Closure; pub use crate::exception::{PhpException, PhpResult}; pub use crate::php_class;