Fix string copy test by using predictable struct memory layout for `A…

…llocatedPyASCIIObject` (#574) * Fix string copy test by using predictable struct memory layout for `AllocatedPyASCIIObject` * handle deprecated --universal2 maturin option PyO3/maturin#1620 --------- Co-authored-by: Ben Frederickson <github@benfrederickson.com>
benfred · May 23, 2023 · e6053b5 · e6053b5
1 parent c325f41
commit e6053b5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -67,7 +67,7 @@ jobs:
       run: |
         rustup target add aarch64-apple-darwin
         pip install --upgrade maturin
-        maturin build --release -o dist --universal2
+        maturin build --release -o dist --target universal2-apple-darwin
       if: matrix.os == 'macos-latest'
     - name: Rename Wheels
       run: |

diff --git a/src/python_data_access.rs b/src/python_data_access.rs
@@ -333,6 +333,7 @@ pub mod tests {
     }
 
     #[allow(dead_code)]
+    #[repr(C)] // Rust can optimize the layout of this struct and break our pointer arithmetic
     pub struct AllocatedPyASCIIObject {
         pub base: PyASCIIObject,
         pub storage: [u8; 4096]