Skip to content

Commit

Permalink
Merge pull request #3722 from PyO3/fix-doc-build
Browse files Browse the repository at this point in the history
Fix missing feature flags in implementation of Either conversion.
  • Loading branch information
davidhewitt committed Jan 2, 2024
2 parents be4d562 + 9120b35 commit f789385
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 3 deletions.
19 changes: 19 additions & 0 deletions .github/workflows/ci.yml
Expand Up @@ -313,6 +313,22 @@ jobs:
RUST_BACKTRACE: 1
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:
needs: [fmt]
name: coverage-${{ matrix.os }}
Expand Down Expand Up @@ -387,6 +403,8 @@ jobs:
run: nox -s test-emscripten

test-debug:
needs: [fmt]
if: github.ref != 'refs/heads/main'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -438,6 +456,7 @@ jobs:
- build-full
- valgrind
- careful
- docsrs
- coverage
- emscripten
if: always()
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Expand Up @@ -128,7 +128,7 @@ members = [

[package.metadata.docs.rs]
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"]

[workspace.lints.clippy]
Expand Down
6 changes: 4 additions & 2 deletions src/conversions/either.rs
Expand Up @@ -43,9 +43,10 @@
//!
//! [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::{
exceptions::PyTypeError, inspect::types::TypeInfo, FromPyObject, IntoPy, PyAny, PyObject,
PyResult, Python, ToPyObject,
exceptions::PyTypeError, FromPyObject, IntoPy, PyAny, PyObject, PyResult, Python, ToPyObject,
};
use either::Either;

Expand Down Expand Up @@ -97,6 +98,7 @@ where
}
}

#[cfg(feature = "experimental-inspect")]
fn type_input() -> TypeInfo {
TypeInfo::union_of(&[L::type_input(), R::type_input()])
}
Expand Down

0 comments on commit f789385

Please sign in to comment.