Merge #3114

3114: Chores to keep the build system working r=adamreichold a=adamreichold



Co-authored-by: Adam Reichold <adam.reichold@t-online.de>

noxfile.py

@@ -433,6 +433,7 @@ def set_minimal_package_versions(session: nox.Session, venv_backend="none"):
         "once_cell": "1.14.0",
         "rayon": "1.5.3",
         "rayon-core": "1.9.3",
+        "regex": "1.7.3",
         # string_cache 0.8.4 depends on parking_lot 0.12
         "string_cache": "0.8.3",
         # 1.15.0 depends on hermit-abi 0.2.6 which has edition 2021 and breaks 1.48.0

tests/ui/invalid_frozen_pyclass_borrow.stderr

@@ -2,7 +2,7 @@ error[E0271]: type mismatch resolving `<Foo as PyClass>::Frozen == False`
   --> tests/ui/invalid_frozen_pyclass_borrow.rs:10:33
    |
 10 |     let borrow = foo.as_ref(py).borrow_mut();
-   |                                 ^^^^^^^^^^ expected struct `False`, found struct `True`
+   |                                 ^^^^^^^^^^ expected `False`, found `True`
    |
 note: required by a bound in `PyCell::<T>::borrow_mut`
   --> src/pycell.rs
@@ -14,7 +14,7 @@ error[E0271]: type mismatch resolving `<ImmutableChild as PyClass>::Frozen == Fa
   --> tests/ui/invalid_frozen_pyclass_borrow.rs:20:35
    |
 20 |     let borrow = child.as_ref(py).borrow_mut();
-   |                                   ^^^^^^^^^^ expected struct `False`, found struct `True`
+   |                                   ^^^^^^^^^^ expected `False`, found `True`
    |
 note: required by a bound in `PyCell::<T>::borrow_mut`
   --> src/pycell.rs

tests/ui/wrong_aspyref_lifetimes.stderr

@@ -1,6 +1,9 @@
 error[E0505]: cannot move out of `gil` because it is borrowed
   --> tests/ui/wrong_aspyref_lifetimes.rs:8:10
    |
+5  |     let gil = Python::acquire_gil();
+   |         --- binding `gil` declared here
+6  |     let dict: Py<PyDict> = PyDict::new(gil.python()).into();
 7  |     let dict: &PyDict = dict.as_ref(gil.python());
    |                                     ------------ borrow of `gil` occurs here
 8  |     drop(gil);