commit 0d872688f92a849527595c97f65fe98d2c9ec54c
parent ce570fc8c43e2fe68964f1f9f15fc890ee682cf3
Author: Matt Brubeck <mbrubeck@limpet.net>
Date: Thu, 21 May 2020 17:05:06 -0700
Use temporary fork of tree_magic
Diffstat:
| M | Cargo.lock | | | 78 | +++++++++++++----------------------------------------------------------------- |
| M | Cargo.toml | | | 4 | ++++ |
2 files changed, 17 insertions(+), 65 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
@@ -27,7 +27,7 @@ dependencies = [
"futures-timer",
"kv-log-macro",
"log",
- "memchr 2.3.3",
+ "memchr",
"mio",
"mio-uds",
"num_cpus",
@@ -96,15 +96,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
[[package]]
-name = "cloudabi"
-version = "0.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
name = "crossbeam-channel"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -272,7 +263,7 @@ dependencies = [
"futures-macro",
"futures-sink",
"futures-task",
- "memchr 2.3.3",
+ "memchr",
"pin-project",
"pin-utils",
"proc-macro-hack",
@@ -359,15 +350,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3baa92041a6fec78c687fa0cc2b3fae8884f743d672cf551bed1d6dac6988d0f"
[[package]]
-name = "lock_api"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75"
-dependencies = [
- "scopeguard",
-]
-
-[[package]]
name = "log"
version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -390,15 +372,6 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
[[package]]
name = "memchr"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "148fab2e51b4f1cfc66da2a7c32981d1d3c083a803978268bb11fe4b86925e7a"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "memchr"
version = "2.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
@@ -467,11 +440,12 @@ dependencies = [
[[package]]
name = "nom"
-version = "3.2.1"
+version = "4.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05aec50c70fd288702bcd93284a8444607f3292dbdf2a30de5ea5dcdbe72287b"
+checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
dependencies = [
- "memchr 1.0.2",
+ "memchr",
+ "version_check",
]
[[package]]
@@ -491,30 +465,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d"
[[package]]
-name = "parking_lot"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3"
-dependencies = [
- "cfg-if",
- "cloudabi",
- "libc",
- "redox_syscall",
- "smallvec",
- "winapi 0.3.8",
-]
-
-[[package]]
name = "percent-encoding"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -593,12 +543,6 @@ dependencies = [
]
[[package]]
-name = "redox_syscall"
-version = "0.1.56"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
-
-[[package]]
name = "ring"
version = "0.16.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -674,13 +618,11 @@ dependencies = [
[[package]]
name = "tree_magic"
version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1d99367ce3e553a84738f73bd626ccca541ef90ae757fdcdc4cbe728e6cb629"
+source = "git+https://github.com/mbrubeck/tree_magic?branch=override#3562ba156b60172e8e94ad29882ed852279763a2"
dependencies = [
"fnv",
"lazy_static",
"nom",
- "parking_lot",
"petgraph",
]
@@ -726,6 +668,12 @@ dependencies = [
]
[[package]]
+name = "version_check"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
+
+[[package]]
name = "wasm-bindgen"
version = "0.2.62"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,3 +22,7 @@ url = "2.1"
lto = true
codegen-units = 1
panic = "abort"
+
+[patch.crates-io.tree_magic]
+git = "https://github.com/mbrubeck/tree_magic"
+branch = "override"
