Merge pull request #3722 from PyO3/fix-doc-build

Fix missing feature flags in implementation of Either conversion.
This commit is contained in:
David Hewitt 2024-01-02 19:52:53 +00:00 committed by GitHub
commit f7893858d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 3 deletions

View File

@ -313,6 +313,22 @@ jobs:
RUST_BACKTRACE: 1 RUST_BACKTRACE: 1
TRYBUILD: overwrite TRYBUILD: overwrite
docsrs:
if: ${{ contains(github.event.pull_request.labels.*.name, 'CI-build-full') || (github.event_name != 'pull_request' && github.ref != 'refs/heads/main') }}
needs: [fmt]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: Swatinem/rust-cache@v2
with:
key: cargo-careful
continue-on-error: true
- uses: dtolnay/rust-toolchain@nightly
with:
components: rust-src
- run: cargo rustdoc --lib --no-default-features --features full -Zunstable-options --config "build.rustdocflags=[\"--cfg\", \"docsrs\"]"
coverage: coverage:
needs: [fmt] needs: [fmt]
name: coverage-${{ matrix.os }} name: coverage-${{ matrix.os }}
@ -387,6 +403,8 @@ jobs:
run: nox -s test-emscripten run: nox -s test-emscripten
test-debug: test-debug:
needs: [fmt]
if: github.ref != 'refs/heads/main'
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@ -438,6 +456,7 @@ jobs:
- build-full - build-full
- valgrind - valgrind
- careful - careful
- docsrs
- coverage - coverage
- emscripten - emscripten
if: always() if: always()

View File

@ -128,7 +128,7 @@ members = [
[package.metadata.docs.rs] [package.metadata.docs.rs]
no-default-features = true no-default-features = true
features = ["macros", "num-bigint", "num-complex", "hashbrown", "serde", "multiple-pymethods", "indexmap", "eyre", "either", "chrono", "rust_decimal"] features = ["full"]
rustdoc-args = ["--cfg", "docsrs"] rustdoc-args = ["--cfg", "docsrs"]
[workspace.lints.clippy] [workspace.lints.clippy]

View File

@ -43,9 +43,10 @@
//! //!
//! [either](https://docs.rs/either/ "A library for easy idiomatic error handling and reporting in Rust applications")s //! [either](https://docs.rs/either/ "A library for easy idiomatic error handling and reporting in Rust applications")s
#[cfg(feature = "experimental-inspect")]
use crate::inspect::types::TypeInfo;
use crate::{ use crate::{
exceptions::PyTypeError, inspect::types::TypeInfo, FromPyObject, IntoPy, PyAny, PyObject, exceptions::PyTypeError, FromPyObject, IntoPy, PyAny, PyObject, PyResult, Python, ToPyObject,
PyResult, Python, ToPyObject,
}; };
use either::Either; use either::Either;
@ -97,6 +98,7 @@ where
} }
} }
#[cfg(feature = "experimental-inspect")]
fn type_input() -> TypeInfo { fn type_input() -> TypeInfo {
TypeInfo::union_of(&[L::type_input(), R::type_input()]) TypeInfo::union_of(&[L::type_input(), R::type_input()])
} }