Skip to content

Make borrow-state tests portable on 32-bit targets #566

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.

Sign up for GitHub

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

Open
heiserhorn wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make borrow-state tests portable on 32-bit targets #566

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions src/borrow/shared.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ mod tests {
use pyo3::ffi::c_str;

struct BorrowFlagsState {
#[cfg(not(Py_GIL_DISABLED))]
#[cfg(all(not(Py_GIL_DISABLED), target_pointer_width = "64"))]
n_flags: usize,
n_arrays: usize,
flag: Option<isize>,
Expand All @@ -472,14 +472,14 @@ mod tests {
.unwrap();
if let Some(base_arrays) = inner.get(&base) {
BorrowFlagsState {
#[cfg(not(Py_GIL_DISABLED))]
#[cfg(all(not(Py_GIL_DISABLED), target_pointer_width = "64"))]
n_flags: inner.len(),
n_arrays: base_arrays.len(),
flag: base_arrays.get(key).copied(),
}
} else {
BorrowFlagsState {
#[cfg(not(Py_GIL_DISABLED))]
#[cfg(all(not(Py_GIL_DISABLED), target_pointer_width = "64"))]
n_flags: 0,
n_arrays: 0,
flag: None,
Expand Down Expand Up @@ -812,7 +812,7 @@ mod tests {

{
let state = get_borrow_flags_state(py, base1, &key1);
#[cfg(not(Py_GIL_DISABLED))]
#[cfg(all(not(Py_GIL_DISABLED), target_pointer_width = "64"))]
// borrow checking state is shared and other tests might have registered a borrow
assert_eq!(state.n_flags, 1);

Expand All @@ -825,7 +825,7 @@ mod tests {

{
let state = get_borrow_flags_state(py, base1, &key1);
#[cfg(not(Py_GIL_DISABLED))]
#[cfg(all(not(Py_GIL_DISABLED), target_pointer_width = "64"))]
// borrow checking state is shared and other tests might have registered a borrow
assert_eq!(state.n_flags, 2);

Expand Down Expand Up @@ -859,7 +859,7 @@ mod tests {
{
let state = get_borrow_flags_state(py, base, &key1);

#[cfg(not(Py_GIL_DISABLED))]
#[cfg(all(not(Py_GIL_DISABLED), target_pointer_width = "64"))]
// borrow checking state is shared and other tests might have registered a borrow
assert_eq!(state.n_flags, 1);
assert_eq!(state.n_arrays, 1);
Expand All @@ -877,7 +877,7 @@ mod tests {

{
let state = get_borrow_flags_state(py, base, &key1);
#[cfg(not(Py_GIL_DISABLED))]
#[cfg(all(not(Py_GIL_DISABLED), target_pointer_width = "64"))]
// borrow checking state is shared and other tests might have registered a borrow
assert_eq!(state.n_flags, 1);
assert_eq!(state.n_arrays, 2);
Expand All @@ -898,7 +898,7 @@ mod tests {

{
let state = get_borrow_flags_state(py, base, &key1);
#[cfg(not(Py_GIL_DISABLED))]
#[cfg(all(not(Py_GIL_DISABLED), target_pointer_width = "64"))]
// borrow checking state is shared and other tests might have registered a borrow
assert_eq!(state.n_flags, 1);
assert_eq!(state.n_arrays, 2);
Expand All @@ -922,7 +922,7 @@ mod tests {

{
let state = get_borrow_flags_state(py, base, &key1);
#[cfg(not(Py_GIL_DISABLED))]
#[cfg(all(not(Py_GIL_DISABLED), target_pointer_width = "64"))]
// borrow checking state is shared and other tests might have registered a borrow
assert_eq!(state.n_flags, 1);
assert_eq!(state.n_arrays, 3);
Expand All @@ -942,7 +942,7 @@ mod tests {

{
let state = get_borrow_flags_state(py, base, &key1);
#[cfg(not(Py_GIL_DISABLED))]
#[cfg(all(not(Py_GIL_DISABLED), target_pointer_width = "64"))]
// borrow checking state is shared and other tests might have registered a borrow
assert_eq!(state.n_flags, 1);
assert_eq!(state.n_arrays, 3);
Expand All @@ -962,7 +962,7 @@ mod tests {

{
let state = get_borrow_flags_state(py, base, &key1);
#[cfg(not(Py_GIL_DISABLED))]
#[cfg(all(not(Py_GIL_DISABLED), target_pointer_width = "64"))]
// borrow checking state is shared and other tests might have registered a borrow
assert_eq!(state.n_flags, 1);
assert_eq!(state.n_arrays, 2);
Expand All @@ -982,7 +982,7 @@ mod tests {

{
let state = get_borrow_flags_state(py, base, &key1);
#[cfg(not(Py_GIL_DISABLED))]
#[cfg(all(not(Py_GIL_DISABLED), target_pointer_width = "64"))]
// borrow checking state is shared and other tests might have registered a borrow
assert_eq!(state.n_flags, 1);
assert_eq!(state.n_arrays, 1);
Expand All @@ -1000,7 +1000,7 @@ mod tests {

drop(shared4);

#[cfg(not(Py_GIL_DISABLED))]
#[cfg(all(not(Py_GIL_DISABLED), target_pointer_width = "64"))]
// borrow checking state is shared and other tests might have registered a borrow
{
assert_eq!(get_borrow_flags_state(py, base, &key1).n_flags, 0);
Expand Down