Merge branch 'main' into ps/update-uniffi

Author: dani-garcia

.github/workflows/scan.yml

@@ -7,8 +7,14 @@ on:
       - "main"
       - "rc"
       - "hotfix-rc"
+  pull_request:
+    types: [opened, synchronize, reopened]
+    branches-ignore:
+      - main
   pull_request_target:
-    types: [opened, synchronize]
+    types: [opened, synchronize, reopened]
+    branches:
+      - "main"
 
 jobs:
   check-run:

crates/bitwarden-wasm-internal/build.rs

@@ -11,13 +11,13 @@ fn main() {
 }
 
 fn run(args: &[&str]) -> Result<String, std::io::Error> {
-    use std::io::{Error, ErrorKind};
+    use std::io::Error;
     let out = Command::new(args[0]).args(&args[1..]).output()?;
     if !out.status.success() {
-        return Err(Error::new(ErrorKind::Other, "Command not successful"));
+        return Err(Error::other("Command not successful"));
     }
     Ok(String::from_utf8(out.stdout)
-        .map_err(|e| Error::new(ErrorKind::Other, e.to_string()))?
+        .map_err(Error::other)?
         .trim()
         .to_string())
 }

crates/memory-testing/src/bin/capture-dumps.rs

@@ -11,10 +11,10 @@ fn dump_process_to_bytearray(pid: u32, output_dir: &Path, output_name: &Path) ->
         .output()?;
 
     if !output.status.success() {
-        return io::Result::Err(io::Error::new(
-            io::ErrorKind::Other,
-            format!("Failed to dump process: {:?}", output),
-        ));
+        return io::Result::Err(io::Error::other(format!(
+            "Failed to dump process: {:?}",
+            output
+        )));
     }
 
     let core_path = format!("core.{}", pid);