Merge branch 'master' into python_3_12

.github/workflows/build.yml

@@ -31,6 +31,7 @@ jobs:
         os: [ubuntu-latest, windows-latest, macos-latest]
     steps:
     - uses: actions/checkout@v3
+    - uses: Swatinem/rust-cache@v2
     - name: Install Dependencies
       run: sudo apt install libunwind-dev
       if: runner.os == 'Linux'
@@ -39,6 +40,9 @@ jobs:
         python-version: 3.9
     - name: Build
       run: cargo build --release --verbose --examples
+    - uses: actions/setup-python@v4
+      with:
+        python-version: 3.9
     - name: Test
       id: test
       continue-on-error: true
@@ -92,6 +96,7 @@ jobs:
         CARGO_HOME: /root/.cargo
     steps:
     - uses: actions/checkout@v3
+    - uses: Swatinem/rust-cache@v2
     - name: Build
       run: |
         python3 -m pip install --upgrade maturin

Cargo.toml

@@ -48,4 +48,4 @@ py-spy-testdata = "0.1.0"
 termios = "0.3.3"
 
 [target.'cfg(windows)'.dependencies]
-winapi = {version = "0.3", features = ["winbase", "consoleapi", "wincon", "handleapi", "timeapi", "processenv" ]}
+winapi = {version = "0.3", features = ["errhandlingapi", "winbase", "consoleapi", "wincon", "handleapi", "timeapi", "processenv" ]}

src/python_process_info.rs

@@ -10,7 +10,9 @@ use std::slice;
 use anyhow::{Context, Error, Result};
 use lazy_static::lazy_static;
 use proc_maps::{get_process_maps, MapRange};
-use remoteprocess::{Pid, ProcessMemory};
+#[cfg(not(target_os = "macos"))]
+use remoteprocess::Pid;
+use remoteprocess::ProcessMemory;
 
 use crate::binary_parser::{parse_binary, BinaryInfo};
 use crate::config::Config;
@@ -604,7 +606,7 @@ pub trait ContainsAddr {
 
 impl ContainsAddr for Vec<MapRange> {
     #[cfg(windows)]
-    fn contains_addr(&self, addr: usize) -> bool {
+    fn contains_addr(&self, _addr: usize) -> bool {
         // On windows, we can't just check if a pointer is valid by looking to see if it points
         // to something in the virtual memory map. Brute-force it instead
         true

src/python_spy.rs

@@ -1,5 +1,3 @@
-#[cfg(windows)]
-use regex::RegexBuilder;
 use std::collections::HashMap;
 #[cfg(all(target_os = "linux", feature = "unwind"))]
 use std::collections::HashSet;