Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chores to keep the build system working #3114

Merged
merged 2 commits into from
Apr 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions noxfile.py
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/invalid_frozen_pyclass_borrow.stderr
Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 3 additions & 0 deletions 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);
Expand Down