Skip to content

Commit

Permalink
Merge pull request #3598 from davidhewitt/clippy-beta
Browse files Browse the repository at this point in the history
ci: run beta clippy as an allowed-to-fail job
  • Loading branch information
davidhewitt committed Nov 29, 2023
2 parents 016b110 + cf67c2c commit 81ad2e8
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
10 changes: 10 additions & 0 deletions .github/workflows/ci.yml
Expand Up @@ -113,7 +113,17 @@ jobs:
rust-target: "i686-pc-windows-msvc",
},
]
include:
# Run beta clippy as a way to detect any incoming lints which may affect downstream users
- rust: beta
platform:
{
os: "ubuntu-latest",
python-architecture: "x64",
rust-target: "x86_64-unknown-linux-gnu",
}
name: clippy/${{ matrix.platform.rust-target }}/${{ matrix.rust }}
continue-on-error: ${{ matrix.platform.rust != 'stable' }}
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
Expand Down
4 changes: 2 additions & 2 deletions pyo3-ffi/src/cpython/mod.rs
Expand Up @@ -31,7 +31,6 @@ pub(crate) mod pystate;
pub(crate) mod pythonrun;
// skipped sysmodule.h
pub(crate) mod floatobject;
#[cfg(not(PyPy))]
pub(crate) mod pyframe;
pub(crate) mod tupleobject;
pub(crate) mod unicodeobject;
Expand Down Expand Up @@ -60,7 +59,7 @@ pub use self::object::*;
pub use self::objimpl::*;
pub use self::pydebug::*;
pub use self::pyerrors::*;
#[cfg(not(PyPy))]
#[cfg(Py_3_11)]
pub use self::pyframe::*;
#[cfg(all(Py_3_8, not(PyPy)))]
pub use self::pylifecycle::*;
Expand All @@ -69,4 +68,5 @@ pub use self::pystate::*;
pub use self::pythonrun::*;
pub use self::tupleobject::*;
pub use self::unicodeobject::*;
#[cfg(not(PyPy))]
pub use self::weakrefobject::*;
2 changes: 1 addition & 1 deletion tests/test_serde.rs
Expand Up @@ -66,7 +66,7 @@ mod test_serde {
assert_eq!(user.username, "danya");
assert!(user.group.is_none());
assert_eq!(user.friends.len(), 1usize);
let friend = user.friends.get(0).unwrap();
let friend = user.friends.first().unwrap();

Python::with_gil(|py| {
assert_eq!(friend.borrow(py).username, "friend");
Expand Down

0 comments on commit 81ad2e8

Please sign in to comment.