Unverified Commit 673e01ff authored by bendk's avatar bendk Committed by GitHub
Browse files

Depend on our patched oneshot carte (#1736) (#1886) 

This avoids pulling in the loom dependency.
parent f2353fcb

Cargo.lock

+6 −190
Original line number Diff line number Diff line
@@ -648,19 +648,6 @@ dependencies = [ 
 "waker-fn",

]



[[package]]

name = "generator"

version = "0.7.5"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e"

dependencies = [

 "cc",

 "libc",

 "log",

 "rustversion",

 "windows",

]



[[package]]

name = "gimli"

version = "0.28.0"
@@ -850,29 +837,6 @@ dependencies = [ 
 "value-bag",

]



[[package]]

name = "loom"

version = "0.5.6"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5"

dependencies = [

 "cfg-if",

 "generator",

 "pin-utils",

 "scoped-tls",

 "tracing",

 "tracing-subscriber",

]



[[package]]

name = "matchers"

version = "0.1.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"

dependencies = [

 "regex-automata 0.1.10",

]



[[package]]

name = "memchr"

version = "2.5.0"
@@ -929,16 +893,6 @@ dependencies = [ 
 "minimal-lexical",

]



[[package]]

name = "nu-ansi-term"

version = "0.46.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"

dependencies = [

 "overload",

 "winapi",

]



[[package]]

name = "num-traits"

version = "0.2.16"
@@ -974,13 +928,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" 
checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"



[[package]]

name = "oneshot"

name = "oneshot-uniffi"

version = "0.1.5"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "fc22d22931513428ea6cc089e942d38600e3d00976eef8c86de6b8a3aadec6eb"

dependencies = [

 "loom",

]

checksum = "9ae4988774e7a7e6a0783d119bdc683ea8c1d01a24d4fff9b4bdc280e07bd99e"



[[package]]

name = "oorandom"
@@ -988,12 +939,6 @@ version = "11.1.3" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"



[[package]]

name = "overload"

version = "0.1.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"



[[package]]

name = "parking"

version = "2.1.0"
@@ -1122,17 +1067,8 @@ checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" 
dependencies = [

 "aho-corasick",

 "memchr",

 "regex-automata 0.3.6",

 "regex-syntax 0.7.4",

]



[[package]]

name = "regex-automata"

version = "0.1.10"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"

dependencies = [

 "regex-syntax 0.6.29",

 "regex-automata",

 "regex-syntax",

]



[[package]]
@@ -1143,15 +1079,9 @@ checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" 
dependencies = [

 "aho-corasick",

 "memchr",

 "regex-syntax 0.7.4",

 "regex-syntax",

]



[[package]]

name = "regex-syntax"

version = "0.6.29"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"



[[package]]

name = "regex-syntax"

version = "0.7.4"
@@ -1191,12 +1121,6 @@ dependencies = [ 
 "windows-sys",

]



[[package]]

name = "rustversion"

version = "1.0.14"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"



[[package]]

name = "ryu"

version = "1.0.15"
@@ -1212,12 +1136,6 @@ dependencies = [ 
 "winapi-util",

]



[[package]]

name = "scoped-tls"

version = "1.0.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"



[[package]]

name = "scopeguard"

version = "1.2.0"
@@ -1284,15 +1202,6 @@ dependencies = [ 
 "serde",

]



[[package]]

name = "sharded-slab"

version = "0.1.5"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "b6805d8ff0f66aa61fb79a97a51ba210dcae753a797336dea8a36a3168196fab"

dependencies = [

 "lazy_static",

]



[[package]]

name = "siphasher"

version = "0.3.11"
@@ -1308,12 +1217,6 @@ dependencies = [ 
 "autocfg",

]



[[package]]

name = "smallvec"

version = "1.11.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"



[[package]]

name = "socket2"

version = "0.4.9"
@@ -1386,16 +1289,6 @@ dependencies = [ 
 "syn",

]



[[package]]

name = "thread_local"

version = "1.1.7"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"

dependencies = [

 "cfg-if",

 "once_cell",

]



[[package]]

name = "tinytemplate"

version = "1.2.1"
@@ -1440,68 +1333,6 @@ dependencies = [ 
 "serde",

]



[[package]]

name = "tracing"

version = "0.1.37"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"

dependencies = [

 "cfg-if",

 "pin-project-lite",

 "tracing-attributes",

 "tracing-core",

]



[[package]]

name = "tracing-attributes"

version = "0.1.26"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"

dependencies = [

 "proc-macro2",

 "quote",

 "syn",

]



[[package]]

name = "tracing-core"

version = "0.1.31"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"

dependencies = [

 "once_cell",

 "valuable",

]



[[package]]

name = "tracing-log"

version = "0.1.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"

dependencies = [

 "lazy_static",

 "log",

 "tracing-core",

]



[[package]]

name = "tracing-subscriber"

version = "0.3.17"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"

dependencies = [

 "matchers",

 "nu-ansi-term",

 "once_cell",

 "regex",

 "sharded-slab",

 "smallvec",

 "thread_local",

 "tracing",

 "tracing-core",

 "tracing-log",

]



[[package]]

name = "trybuild"

version = "1.0.83"
@@ -1982,7 +1813,7 @@ dependencies = [ 
 "camino",

 "log",

 "once_cell",

 "oneshot",

 "oneshot-uniffi",

 "paste",

 "static_assertions",

]
@@ -2062,12 +1893,6 @@ version = "0.2.1" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"



[[package]]

name = "valuable"

version = "0.1.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"



[[package]]

name = "value-bag"

version = "1.4.1"
@@ -2211,15 +2036,6 @@ version = "0.4.0" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"



[[package]]

name = "windows"

version = "0.48.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"

dependencies = [

 "windows-targets",

]



[[package]]

name = "windows-sys"

version = "0.48.0"

uniffi_core/Cargo.toml

+3 −1
Original line number Diff line number Diff line
@@ -18,8 +18,10 @@ bytes = "1.3" 
camino = "1.0.8"

log = "0.4"

once_cell = "1.10.0"

# Use the `oneshot-uniffi` crate to get our `oneshot` dependency.

# That crate is a fork of `oneshot` that removes the `loom` target/dependency, which makes it easier to vendor UniFFI into the mozilla-central repository.

# Enable "async" so that receivers implement Future, no need for "std" since we don't block on them.

oneshot = { version = "0.1", features = ["async"] }

oneshot = { package = "oneshot-uniffi", version = "0.1.5", features = ["async"] }

# Regular dependencies

paste = "1.0"

static_assertions = "1.1.0"