ci: updates for Rust 1.84 (#4846)

* Fix failing ruff fmt test

* Add newsfragments

* remove changelog

* use wasm32-wasip1 in CI

* update ui tests

* use `wasm32-wasip1` in noxfile

* update one more ui test

* fix clippy beta

* bump `EMSCRIPTEN_VERSION`

* emscripten link `sqlite3`

* emscipten update node

---------

Co-authored-by: Nathan Goldbaum <[email protected]>
Co-authored-by: Icxolu <[email protected]>

Author: 3 people

.github/workflows/ci.yml

@@ -115,7 +115,7 @@ jobs:
             {
               os: "ubuntu-latest",
               python-architecture: "x64",
-              rust-target: "wasm32-wasi",
+              rust-target: "wasm32-wasip1",
             },
             {
               os: "windows-latest",
@@ -489,7 +489,7 @@ jobs:
           components: rust-src
       - uses: actions/setup-node@v4
         with:
-          node-version: 14
+          node-version: 18
       - run: python -m pip install --upgrade pip && pip install nox
       - uses: actions/cache@v4
         id: cache

emscripten/Makefile

@@ -4,7 +4,7 @@ CURDIR=$(abspath .)
 BUILDROOT ?= $(CURDIR)/builddir
 PYMAJORMINORMICRO ?= 3.11.0
 
-EMSCRIPTEN_VERSION=3.1.13
+EMSCRIPTEN_VERSION=3.1.68
 
 export EMSDKDIR = $(BUILDROOT)/emsdk
 

noxfile.py

@@ -339,6 +339,7 @@ def test_emscripten(session: nox.Session):
             f"-C link-arg=-lpython{info.pymajorminor}",
             "-C link-arg=-lexpat",
             "-C link-arg=-lmpdec",
+            "-C link-arg=-lsqlite3",
             "-C link-arg=-lz",
             "-C link-arg=-lbz2",
             "-C link-arg=-sALLOW_MEMORY_GROWTH=1",
@@ -351,7 +352,7 @@ def test_emscripten(session: nox.Session):
         session,
         "bash",
         "-c",
-        f"source {info.builddir/'emsdk/emsdk_env.sh'} && cargo test",
+        f"source {info.builddir / 'emsdk/emsdk_env.sh'} && cargo test",
     )
 
 
@@ -797,7 +798,7 @@ def _get_rust_default_target() -> str:
 def _get_feature_sets() -> Tuple[Tuple[str, ...], ...]:
     """Returns feature sets to use for clippy job"""
     cargo_target = os.getenv("CARGO_BUILD_TARGET", "")
-    if "wasm32-wasi" not in cargo_target:
+    if "wasm32-wasip1" not in cargo_target:
         # multiple-pymethods not supported on wasm
         return (
             ("--no-default-features",),
@@ -951,7 +952,7 @@ def set(
             f"""\
 implementation={implementation}
 version={version}
-build_flags={','.join(build_flags)}
+build_flags={",".join(build_flags)}
 suppress_build_script_link_lines=true
 """
         )

pyo3-build-config/src/impl_.rs

@@ -2001,7 +2001,7 @@ fn unescape(escaped: &str) -> Vec<u8> {
             }
         }
 
-        bytes.push(unhex(chunk[0]) << 4 | unhex(chunk[1]));
+        bytes.push((unhex(chunk[0]) << 4) | unhex(chunk[1]));
     }
 
     bytes

pyo3-ffi/src/datetime.rs

@@ -119,7 +119,7 @@ pub struct PyDateTime_DateTime {
 pub unsafe fn PyDateTime_GET_YEAR(o: *mut PyObject) -> c_int {
     // This should work for Date or DateTime
     let data = (*(o as *mut PyDateTime_Date)).data;
-    c_int::from(data[0]) << 8 | c_int::from(data[1])
+    (c_int::from(data[0]) << 8) | c_int::from(data[1])
 }
 
 #[inline]

src/types/any.rs

@@ -948,7 +948,7 @@ impl<'py> PyAnyMethods<'py> for Bound<'py, PyAny> {
             }
         }
 
-        inner(self.py(), self.getattr(attr_name).map_err(Into::into))
+        inner(self.py(), self.getattr(attr_name))
     }
 
     fn getattr<N>(&self, attr_name: N) -> PyResult<Bound<'py, PyAny>>

src/types/module.rs

@@ -443,7 +443,7 @@ impl<'py> PyModuleMethods<'py> for Bound<'py, PyModule> {
             Err(err) => {
                 if err.is_instance_of::<exceptions::PyAttributeError>(self.py()) {
                     let l = PyList::empty(self.py());
-                    self.setattr(__all__, &l).map_err(PyErr::from)?;
+                    self.setattr(__all__, &l)?;
                     Ok(l)
                 } else {
                     Err(err)

tests/ui/invalid_cancel_handle.stderr

@@ -42,7 +42,7 @@ error[E0277]: the trait bound `CancelHandle: PyFunctionArgument<'_, '_>` is not
   --> tests/ui/invalid_cancel_handle.rs:20:50
    |
 20 | async fn missing_cancel_handle_attribute(_param: pyo3::coroutine::CancelHandle) {}
-   |                                                  ^^^^ the trait `PyClass` is not implemented for `CancelHandle`, which is required by `CancelHandle: PyFunctionArgument<'_, '_>`
+   |                                                  ^^^^ the trait `PyClass` is not implemented for `CancelHandle`
    |
    = help: the trait `PyClass` is implemented for `pyo3::coroutine::Coroutine`
    = note: required for `CancelHandle` to implement `FromPyObject<'_>`
@@ -61,7 +61,7 @@ error[E0277]: the trait bound `CancelHandle: PyFunctionArgument<'_, '_>` is not
   --> tests/ui/invalid_cancel_handle.rs:20:50
    |
 20 | async fn missing_cancel_handle_attribute(_param: pyo3::coroutine::CancelHandle) {}
-   |                                                  ^^^^ the trait `Clone` is not implemented for `CancelHandle`, which is required by `CancelHandle: PyFunctionArgument<'_, '_>`
+   |                                                  ^^^^ the trait `Clone` is not implemented for `CancelHandle`
    |
    = help: the following other types implement trait `PyFunctionArgument<'a, 'py>`:
              &'a mut pyo3::coroutine::Coroutine

tests/ui/invalid_property_args.stderr

@@ -52,7 +52,7 @@ error[E0277]: `PhantomData<i32>` cannot be converted to a Python object
 45 |     value: ::std::marker::PhantomData<i32>,
    |            ^ required by `#[pyo3(get)]` to create a readable property from a field of type `PhantomData<i32>`
    |
-   = help: the trait `IntoPyObject<'_>` is not implemented for `PhantomData<i32>`, which is required by `for<'py> PhantomData<i32>: PyO3GetField<'py>`
+   = help: the trait `IntoPyObject<'_>` is not implemented for `PhantomData<i32>`
    = note: implement `IntoPyObject` for `&PhantomData<i32>` or `IntoPyObject + Clone` for `PhantomData<i32>` to define the conversion
    = help: the following other types implement trait `IntoPyObject<'py>`:
              &&'a T

tests/ui/invalid_pyclass_args.stderr

@@ -100,21 +100,21 @@ error: expected one of: `get`, `set`, `name`
 85 |     #[pyo3(pop)]
    |            ^^^
 
-error: invalid format string: expected `'}'` but string was terminated
+error: invalid format string: expected `}` but string was terminated
    --> tests/ui/invalid_pyclass_args.rs:105:19
     |
 105 | #[pyclass(str = "{")]
-    |                  -^ expected `'}'` in format string
+    |                  -^ expected `}` in format string
     |                  |
     |                  because of this opening brace
     |
     = note: if you intended to print `{`, you can escape it using `{{`
 
-error: invalid format string: expected `'}'`, found `'$'`
+error: invalid format string: expected `}`, found `$`
    --> tests/ui/invalid_pyclass_args.rs:109:19
     |
 109 | #[pyclass(str = "{$}")]
-    |                  -^ expected `'}'` in format string
+    |                  -^ expected `}` in format string
     |                  |
     |                  because of this opening brace
     |