Merge branch 'develop' into ins-from-script

serai-dex · Jan 8, 2024 · 082e483 · 082e483
2 parents 26fd8e8 + 2da2b75
commit 082e483
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 31 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -72,7 +72,6 @@ members = [
   "patches/matches",
   "patches/option-ext",
   "patches/directories-next",
-  "patches/mach",
   "patches/proc-macro-crate",
 ]
 
@@ -116,9 +115,6 @@ matches = { path = "patches/matches" }
 option-ext = { path = "patches/option-ext" }
 directories-next = { path = "patches/directories-next" }
 
-# mach is unmaintained, so this wraps mach2 as mach
-mach = { path = "patches/mach" }
-
 # proc-macro-crate 2 binds to an old version of toml for msrv so we patch to 3
 proc-macro-crate = { path = "patches/proc-macro-crate" }
 

diff --git a/patches/mach/Cargo.toml b/patches/mach/Cargo.toml
diff --git a/patches/mach/src/lib.rs b/patches/mach/src/lib.rs