From 3366bfbfdfb28e38594a8850dcc825ff990f88f5 Mon Sep 17 00:00:00 2001
From: Gwilym Kuiper <gw@ilym.me>
Date: Sun, 16 Jan 2022 22:10:57 +0000
Subject: [PATCH] Remove siphasher by using DefaultHasher::new instead

---
 agb-fixnum/Cargo.lock          |  4 ++--
 agb-macros/Cargo.lock          |  4 ++--
 agb-sound-converter/Cargo.lock |  7 -------
 agb-sound-converter/Cargo.toml |  3 +--
 agb-sound-converter/src/lib.rs |  4 ++--
 agb/Cargo.lock                 | 11 ++---------
 mgba-test-runner/Cargo.lock    |  4 ++--
 7 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/agb-fixnum/Cargo.lock b/agb-fixnum/Cargo.lock
index 2eeb5cf7..11529f6d 100644
--- a/agb-fixnum/Cargo.lock
+++ b/agb-fixnum/Cargo.lock
@@ -27,9 +27,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "getrandom"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
+checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c"
 dependencies = [
  "cfg-if",
  "libc",
diff --git a/agb-macros/Cargo.lock b/agb-macros/Cargo.lock
index 4b5dbc96..84cdc8c3 100644
--- a/agb-macros/Cargo.lock
+++ b/agb-macros/Cargo.lock
@@ -20,9 +20,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "getrandom"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
+checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c"
 dependencies = [
  "cfg-if",
  "libc",
diff --git a/agb-sound-converter/Cargo.lock b/agb-sound-converter/Cargo.lock
index 4b4f7477..622dd6a1 100644
--- a/agb-sound-converter/Cargo.lock
+++ b/agb-sound-converter/Cargo.lock
@@ -9,7 +9,6 @@ dependencies = [
  "hound",
  "proc-macro2",
  "quote",
- "siphasher",
  "syn",
 ]
 
@@ -37,12 +36,6 @@ dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "siphasher"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba1eead9e94aa5a2e02de9e7839f96a007f686ae7a1d57c7797774810d24908a"
-
 [[package]]
 name = "syn"
 version = "1.0.85"
diff --git a/agb-sound-converter/Cargo.toml b/agb-sound-converter/Cargo.toml
index c82dcd4f..12481018 100644
--- a/agb-sound-converter/Cargo.toml
+++ b/agb-sound-converter/Cargo.toml
@@ -24,5 +24,4 @@ freq18157 = []
 hound = "3.4.0"
 syn = "1.0.85"
 proc-macro2 = "1.0.36"
-quote = "1.0.14"
-siphasher = "0.3.8"
\ No newline at end of file
+quote = "1.0.14"
\ No newline at end of file
diff --git a/agb-sound-converter/src/lib.rs b/agb-sound-converter/src/lib.rs
index d373945c..ea2117f2 100644
--- a/agb-sound-converter/src/lib.rs
+++ b/agb-sound-converter/src/lib.rs
@@ -2,8 +2,8 @@
 
 use proc_macro::TokenStream;
 use quote::quote;
-use siphasher::sip::SipHasher;
 use std::{
+    collections::hash_map::DefaultHasher,
     fs,
     fs::File,
     hash::{Hash, Hasher},
@@ -106,7 +106,7 @@ where
 }
 
 fn get_out_filename(path: &Path) -> String {
-    let mut hasher = SipHasher::new();
+    let mut hasher = DefaultHasher::new();
     path.hash(&mut hasher);
 
     format!("{}.raw", hasher.finish())
diff --git a/agb/Cargo.lock b/agb/Cargo.lock
index 9c02050c..88f57060 100644
--- a/agb/Cargo.lock
+++ b/agb/Cargo.lock
@@ -55,7 +55,6 @@ dependencies = [
  "hound",
  "proc-macro2",
  "quote",
- "siphasher",
  "syn",
 ]
 
@@ -116,9 +115,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
+checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c"
 dependencies = [
  "cfg-if",
  "libc",
@@ -298,12 +297,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "siphasher"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "533494a8f9b724d33625ab53c6c4800f7cc445895924a8ef649222dcb76e938b"
-
 [[package]]
 name = "syn"
 version = "1.0.85"
diff --git a/mgba-test-runner/Cargo.lock b/mgba-test-runner/Cargo.lock
index d7cea62d..3682c015 100644
--- a/mgba-test-runner/Cargo.lock
+++ b/mgba-test-runner/Cargo.lock
@@ -249,9 +249,9 @@ checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
 
 [[package]]
 name = "libloading"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afe203d669ec979b7128619bae5a63b7b42e9203c1b29146079ee05e2f604b52"
+checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd"
 dependencies = [
  "cfg-if",
  "winapi",