Address review comments

.github/workflows/test.yml

@@ -35,8 +35,10 @@ jobs:
         with:
           profile: minimal
           toolchain: stable
-          target: aarch64-apple-darwin
           override: true
+      - name: Install aarch64-apple-darwin Rust target
+        if: matrix.os == 'macos-latest'
+        run: rustup target add aarch64-apple-darwin
       #- name: Cache cargo registry
       #  uses: actions/cache@v2
       #  with:

Cargo.toml

@@ -63,7 +63,7 @@ dirs = { version = "3.0.1", optional = true }
 configparser = { version = "2.0.0", optional = true }
 mailparse = "0.13.1"
 fs-err = "2.5.0"
-fat-macho = "0.2.0"
+fat-macho = "0.4.2"
 
 [dev-dependencies]
 indoc = "1.0.2"

Readme.md

@@ -212,6 +212,10 @@ FLAGS:
         --strip
             Strip the library for minimum file size
 
+        --universal2
+            Control whether to build universal2 wheel for macOS or not. Only applies to macOS targets, do nothing
+            otherwise
+
     -V, --version
             Prints version information
 

src/build_options.rs

@@ -68,7 +68,8 @@ pub struct BuildOptions {
     /// Use as `--rustc-extra-args="--my-arg"`
     #[structopt(long = "rustc-extra-args")]
     pub rustc_extra_args: Vec<String>,
-    /// Control whether to build universal2 wheel for macOS or not
+    /// Control whether to build universal2 wheel for macOS or not.
+    /// Only applies to macOS targets, do nothing otherwise.
     #[structopt(long)]
     pub universal2: bool,
 }
@@ -85,7 +86,7 @@ impl Default for BuildOptions {
             target: None,
             cargo_extra_args: Vec::new(),
             rustc_extra_args: Vec::new(),
-            universal2: true,
+            universal2: false,
         }
     }
 }

src/compile.rs

@@ -3,9 +3,8 @@ use crate::BuildContext;
 use crate::PythonInterpreter;
 use anyhow::{anyhow, bail, Context, Result};
 use fat_macho::FatWriter;
-use fs_err::File;
+use fs_err::{self as fs, File};
 use std::collections::HashMap;
-use std::fs;
 use std::io::{BufReader, Read};
 use std::path::PathBuf;
 use std::process::{Command, Stdio};
@@ -72,10 +71,10 @@ pub fn compile(
         let aarch64_file = fs::read(aarch64_artifact)?;
         let x86_64_file = fs::read(x86_64_artifact)?;
         writer
-            .add(&aarch64_file)
+            .add(aarch64_file)
             .map_err(|e| anyhow!("Failed to add aarch64 cdylib: {:?}", e))?;
         writer
-            .add(&x86_64_file)
+            .add(x86_64_file)
             .map_err(|e| anyhow!("Failed to add x86_64 cdylib: {:?}", e))?;
         writer
             .write_to_file(&output_path)

src/develop.rs

@@ -36,7 +36,7 @@ pub fn develop(
         target: None,
         cargo_extra_args,
         rustc_extra_args,
-        universal2: true,
+        universal2: false,
     };
 
     let build_context = build_options.into_build_context(release, strip)?;

tests/common/integration.rs

@@ -80,21 +80,6 @@ pub fn test_integration(package: impl AsRef<Path>, bindings: Option<String>) ->
 
         let python = target.get_venv_python(&venv_dir);
 
-        // Upgrade pip
-        let output = Command::new(&python)
-            .args(&["-m", "pip", "install", "-U", "pip"])
-            .stderr(Stdio::inherit())
-            .output()
-            .context(format!("pip install failed with {:?}", python))?;
-        if !output.status.success() {
-            bail!(
-                "pip install -U pip failed: {}\n--- Stdout:\n{}\n--- Stderr:\n{}",
-                output.status,
-                str::from_utf8(&output.stdout)?,
-                str::from_utf8(&output.stderr)?,
-            );
-        }
-
         let command = [
             "-m",
             "pip",