danderson/ofborg
0
0
Fork 0
forked from the-distro/ofborg
Code Pull requests Activity

Revert "lapin: 1.0.0-beta4 -> 1.0.0-rc6"

Browse source 
This reverts commit 69c0fbb8bb.
This commit is contained in:
Daiderd Jordan 2020-05-25 22:30:34 +02:00 committed by Cole Helbling
parent e8f0bfabd4
commit 16d8b612cb
5 changed files with 57 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
Cargo.lock generated
View file

@ -18,23 +18,23 @@ dependencies = [
[[package]] [[package]]
name = "amq-protocol" name = "amq-protocol"
version = "6.0.0-rc7" version = "6.0.0-rc3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"amq-protocol-codegen 6.0.0-rc7 (registry+https://github.com/rust-lang/crates.io-index)", "amq-protocol-codegen 6.0.0-rc3 (registry+https://github.com/rust-lang/crates.io-index)",
"amq-protocol-tcp 6.0.0-rc7 (registry+https://github.com/rust-lang/crates.io-index)", "amq-protocol-tcp 6.0.0-rc3 (registry+https://github.com/rust-lang/crates.io-index)",
"amq-protocol-types 6.0.0-rc7 (registry+https://github.com/rust-lang/crates.io-index)", "amq-protocol-types 6.0.0-rc3 (registry+https://github.com/rust-lang/crates.io-index)",
"amq-protocol-uri 6.0.0-rc7 (registry+https://github.com/rust-lang/crates.io-index)", "amq-protocol-uri 6.0.0-rc3 (registry+https://github.com/rust-lang/crates.io-index)",
"cookie-factory 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "cookie-factory 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"nom 6.0.0-alpha1 (registry+https://github.com/rust-lang/crates.io-index)", "nom 6.0.0-alpha1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "amq-protocol-codegen" name = "amq-protocol-codegen"
version = "6.0.0-rc7" version = "6.0.0-rc3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"amq-protocol-types 6.0.0-rc7 (registry+https://github.com/rust-lang/crates.io-index)", "amq-protocol-types 6.0.0-rc3 (registry+https://github.com/rust-lang/crates.io-index)",
"handlebars 3.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "handlebars 3.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.53 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.53 (registry+https://github.com/rust-lang/crates.io-index)",
@ -42,17 +42,17 @@ dependencies = [
[[package]] [[package]]
name = "amq-protocol-tcp" name = "amq-protocol-tcp"
version = "6.0.0-rc7" version = "6.0.0-rc3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"amq-protocol-uri 6.0.0-rc7 (registry+https://github.com/rust-lang/crates.io-index)", "amq-protocol-uri 6.0.0-rc3 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"tcp-stream 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)", "tcp-stream 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "amq-protocol-types" name = "amq-protocol-types"
version = "6.0.0-rc7" version = "6.0.0-rc3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"cookie-factory 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "cookie-factory 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -63,7 +63,7 @@ dependencies = [
[[package]] [[package]]
name = "amq-protocol-uri" name = "amq-protocol-uri"
version = "6.0.0-rc7" version = "6.0.0-rc3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -150,11 +150,6 @@ dependencies = [
"byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "base64"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "bitflags" name = "bitflags"
version = "1.2.1" version = "1.2.1"
@ -590,11 +585,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "lapin" name = "lapin"
version = "1.0.0-rc6" version = "1.0.0-beta4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"amq-protocol 6.0.0-rc7 (registry+https://github.com/rust-lang/crates.io-index)", "amq-protocol 6.0.0-rc3 (registry+https://github.com/rust-lang/crates.io-index)",
"amq-protocol-codegen 6.0.0-rc7 (registry+https://github.com/rust-lang/crates.io-index)", "amq-protocol-codegen 6.0.0-rc3 (registry+https://github.com/rust-lang/crates.io-index)",
"async-task 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "async-task 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"crossbeam-channel 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-channel 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
"futures-core 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "futures-core 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -833,7 +828,7 @@ dependencies = [
"hubcaps 0.3.16 (git+https://github.com/grahamc/hubcaps.git)", "hubcaps 0.3.16 (git+https://github.com/grahamc/hubcaps.git)",
"hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"lapin 1.0.0-rc6 (registry+https://github.com/rust-lang/crates.io-index)", "lapin 1.0.0-beta4 (registry+https://github.com/rust-lang/crates.io-index)",
"lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"md5 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "md5 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
@ -918,16 +913,6 @@ dependencies = [
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "pem"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 1.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]] [[package]]
name = "percent-encoding" name = "percent-encoding"
version = "1.0.1" version = "1.0.1"
@ -1351,13 +1336,12 @@ dependencies = [
[[package]] [[package]]
name = "tcp-stream" name = "tcp-stream"
version = "0.19.1" version = "0.15.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"mio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"native-tls 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "native-tls 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
"pem 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1688,11 +1672,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[metadata] [metadata]
"checksum addr2line 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a49806b9dadc843c61e7c97e72490ad7f7220ae249012fbda9ad0609457c0543" "checksum addr2line 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a49806b9dadc843c61e7c97e72490ad7f7220ae249012fbda9ad0609457c0543"
"checksum aho-corasick 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)" = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada" "checksum aho-corasick 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)" = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada"
"checksum amq-protocol 6.0.0-rc7 (registry+https://github.com/rust-lang/crates.io-index)" = "f107cf5f6960ae3ddf1c5b5dea85a68a4f6d70c51ae66b8df86180860145da1b" "checksum amq-protocol 6.0.0-rc3 (registry+https://github.com/rust-lang/crates.io-index)" = "fc2af3b0b15738172334d196a3b98e651fcdbbcecf2069138f5bbedf400a3d6d"
"checksum amq-protocol-codegen 6.0.0-rc7 (registry+https://github.com/rust-lang/crates.io-index)" = "1f51a7891d6185faa895186b2a604ce9618088626bb2097f09fcb28bfc102636" "checksum amq-protocol-codegen 6.0.0-rc3 (registry+https://github.com/rust-lang/crates.io-index)" = "c3f2c370a138e85cec1656cb741de76ca80cf25c9a63f5bf611a7af6152315f2"
"checksum amq-protocol-tcp 6.0.0-rc7 (registry+https://github.com/rust-lang/crates.io-index)" = "b60861763928b4776f3b129595a13caf9caa533e89ed98436613c49d5041d887" "checksum amq-protocol-tcp 6.0.0-rc3 (registry+https://github.com/rust-lang/crates.io-index)" = "bc78407975f9b9cb73d01abf84996a54a64058493c147ba6c2bd3149df0937f7"
"checksum amq-protocol-types 6.0.0-rc7 (registry+https://github.com/rust-lang/crates.io-index)" = "00e2c0836916200c43f462f35dea50b520a551c4d755e07492e389b19befba95" "checksum amq-protocol-types 6.0.0-rc3 (registry+https://github.com/rust-lang/crates.io-index)" = "4425e82ba6069abf1132abae0395dd2d59bc0f5bd25b4001208dbfa7701f135f"
"checksum amq-protocol-uri 6.0.0-rc7 (registry+https://github.com/rust-lang/crates.io-index)" = "7b891342708e4ed231278ef5bb8ccccf6ca1542fc56d02e7a1cff548ac2ad215" "checksum amq-protocol-uri 6.0.0-rc3 (registry+https://github.com/rust-lang/crates.io-index)" = "9551b95be48c02825f0944eb45b372112e2ac4f76e1ab684c8bc789e62d8a7e4"
"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
"checksum antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5" "checksum antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5"
"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" "checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
@ -1701,7 +1685,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" "checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
"checksum backtrace 0.3.48 (registry+https://github.com/rust-lang/crates.io-index)" = "0df2f85c8a2abbe3b7d7e748052fdd9b76a0458fdeb16ad4223f5eca78c7c130" "checksum backtrace 0.3.48 (registry+https://github.com/rust-lang/crates.io-index)" = "0df2f85c8a2abbe3b7d7e748052fdd9b76a0458fdeb16ad4223f5eca78c7c130"
"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" "checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
"checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" "checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" "checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
"checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" "checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
@ -1756,7 +1739,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
"checksum kv-log-macro 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4ff57d6d215f7ca7eb35a9a64d656ba4d9d2bef114d741dc08048e75e2f5d418" "checksum kv-log-macro 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4ff57d6d215f7ca7eb35a9a64d656ba4d9d2bef114d741dc08048e75e2f5d418"
"checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
"checksum lapin 1.0.0-rc6 (registry+https://github.com/rust-lang/crates.io-index)" = "6fcc19a0b0a5c9de7fd25ec93a590ab0c12780729fb72cf68ecb8fc08b1005e3" "checksum lapin 1.0.0-beta4 (registry+https://github.com/rust-lang/crates.io-index)" = "daceedfb02915683f986b8860f3ed65530e8a33fcc77b3a0f52dffeb08e482c3"
"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
"checksum lexical-core 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616" "checksum lexical-core 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616"
"checksum libc 0.2.70 (registry+https://github.com/rust-lang/crates.io-index)" = "3baa92041a6fec78c687fa0cc2b3fae8884f743d672cf551bed1d6dac6988d0f" "checksum libc 0.2.70 (registry+https://github.com/rust-lang/crates.io-index)" = "3baa92041a6fec78c687fa0cc2b3fae8884f743d672cf551bed1d6dac6988d0f"
@ -1791,7 +1774,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum openssl-sys 0.9.57 (registry+https://github.com/rust-lang/crates.io-index)" = "7410fef80af8ac071d4f63755c0ab89ac3df0fd1ea91f1d1f37cf5cec4395990" "checksum openssl-sys 0.9.57 (registry+https://github.com/rust-lang/crates.io-index)" = "7410fef80af8ac071d4f63755c0ab89ac3df0fd1ea91f1d1f37cf5cec4395990"
"checksum parking_lot 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" "checksum parking_lot 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e"
"checksum parking_lot_core 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3" "checksum parking_lot_core 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3"
"checksum pem 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a1581760c757a756a41f0ee3ff01256227bdf64cb752839779b95ffb01c59793"
"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" "checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" "checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
"checksum pest 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" "checksum pest 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
@ -1845,7 +1827,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum static_assertions 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" "checksum static_assertions 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
"checksum syn 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)" = "95b5f192649e48a5302a13f2feb224df883b98933222369e4b3b0fe2a5447269" "checksum syn 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)" = "95b5f192649e48a5302a13f2feb224df883b98933222369e4b3b0fe2a5447269"
"checksum sys-info 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "58283a48c9212afcade2069f8bbf7ded6a7bdbf4888d2defba72244c8e5f423c" "checksum sys-info 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "58283a48c9212afcade2069f8bbf7ded6a7bdbf4888d2defba72244c8e5f423c"
"checksum tcp-stream 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3bf936a66fc83b53e50a754b2dc3ca607c1149710b5e96f0546e053a9764303e" "checksum tcp-stream 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cffaa277f6a7eae762f9ba79da149e239e1940b392d6dd32c1cd3bb27ca6d9dd"
"checksum tempfile 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "11ce2fe9db64b842314052e2421ac61a73ce41b898dc8e3750398b219c5fc1e0" "checksum tempfile 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "11ce2fe9db64b842314052e2421ac61a73ce41b898dc8e3750398b219c5fc1e0"
"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" "checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
"checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" "checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"

80
Cargo.nix
View file

@ -119,9 +119,9 @@ rec {
}; };
"amq-protocol" = rec { "amq-protocol" = rec {
crateName = "amq-protocol"; crateName = "amq-protocol";
version = "6.0.0-rc7"; version = "6.0.0-rc3";
edition = "2018"; edition = "2018";
sha256 = "06ys8l0qd031z26nprhsqmq6skwals2ylpav3kgkvbk0d5gwy1zi"; sha256 = "0v9x190dzgjviw9nj86grsxws7v5isws75ni6hiiff2pn6qg6apw";
libName = "amq_protocol"; libName = "amq_protocol";
authors = [ authors = [
"Marc-Antoine Perennou <%arc-Antoine@Perennou.com>" "Marc-Antoine Perennou <%arc-Antoine@Perennou.com>"
@ -171,9 +171,9 @@ rec {
}; };
"amq-protocol-codegen" = rec { "amq-protocol-codegen" = rec {
crateName = "amq-protocol-codegen"; crateName = "amq-protocol-codegen";
version = "6.0.0-rc7"; version = "6.0.0-rc3";
edition = "2018"; edition = "2018";
sha256 = "0di623y8pcpw15zhkckbca480qg99ih2lsqqjnlgm1b13n4sfl8z"; sha256 = "1whm4cazcyhsc6zzaqwsbkr0ra3cwwfp9jsn2vn5rs1ql5qc7wn3";
libName = "amq_protocol_codegen"; libName = "amq_protocol_codegen";
authors = [ authors = [
"Marc-Antoine Perennou <%arc-Antoine@Perennou.com>" "Marc-Antoine Perennou <%arc-Antoine@Perennou.com>"
@ -201,9 +201,9 @@ rec {
}; };
"amq-protocol-tcp" = rec { "amq-protocol-tcp" = rec {
crateName = "amq-protocol-tcp"; crateName = "amq-protocol-tcp";
version = "6.0.0-rc7"; version = "6.0.0-rc3";
edition = "2018"; edition = "2018";
sha256 = "11yq8589vi0kcr1rivc97r9sm75g7jhrb58j7dppgd1875v6225n"; sha256 = "1xrp17gljcdxqak7n51w95c419jldacq9gqss1rwpfgrfmwl0y5w";
libName = "amq_protocol_tcp"; libName = "amq_protocol_tcp";
authors = [ authors = [
"Marc-Antoine Perennou <%arc-Antoine@Perennou.com>" "Marc-Antoine Perennou <%arc-Antoine@Perennou.com>"
@ -237,9 +237,9 @@ rec {
}; };
"amq-protocol-types" = rec { "amq-protocol-types" = rec {
crateName = "amq-protocol-types"; crateName = "amq-protocol-types";
version = "6.0.0-rc7"; version = "6.0.0-rc3";
edition = "2018"; edition = "2018";
sha256 = "15dsxydv32g3j9sf0mfpqi8sa85ma3m5vwv2yi1hq80nd61w1qh0"; sha256 = "0pqk3xqaggwd400l0nyjbc7vqn9dvnah7bmb688vz6h6lqmyh9a4";
libName = "amq_protocol_types"; libName = "amq_protocol_types";
authors = [ authors = [
"Marc-Antoine Perennou <%arc-Antoine@Perennou.com>" "Marc-Antoine Perennou <%arc-Antoine@Perennou.com>"
@ -270,9 +270,9 @@ rec {
}; };
"amq-protocol-uri" = rec { "amq-protocol-uri" = rec {
crateName = "amq-protocol-uri"; crateName = "amq-protocol-uri";
version = "6.0.0-rc7"; version = "6.0.0-rc3";
edition = "2018"; edition = "2018";
sha256 = "05fj5an4ixfgl7kh4vf55xaa2v6grj6bpxcf4wqx4klff11172bv"; sha256 = "1r57v1i9wy5wr22bc6kfyz22lbhifarlbss415gq40lcwidvjlcm";
libName = "amq_protocol_uri"; libName = "amq_protocol_uri";
authors = [ authors = [
"Marc-Antoine Perennou <%arc-Antoine@Perennou.com>" "Marc-Antoine Perennou <%arc-Antoine@Perennou.com>"
@ -529,20 +529,6 @@ rec {
]; ];
}; };
"base64 0.11.0" = rec {
crateName = "base64";
version = "0.11.0";
edition = "2018";
sha256 = "1iqmims6yvr6vwzyy54qd672zw29ipjj17p8klcr578c9ajpw6xl";
authors = [
"Alice Maz <alice@alicemaz.com>"
"Marshall Pierce <marshall@mpierce.org>"
];
features = {
"default" = [ "std" ];
};
resolvedDefaultFeatures = [ "default" "std" ];
};
"base64 0.9.3" = rec { "base64 0.9.3" = rec {
crateName = "base64"; crateName = "base64";
version = "0.9.3"; version = "0.9.3";
@ -1761,9 +1747,9 @@ rec {
}; };
"lapin" = rec { "lapin" = rec {
crateName = "lapin"; crateName = "lapin";
version = "1.0.0-rc6"; version = "1.0.0-beta4";
edition = "2018"; edition = "2018";
sha256 = "1qq5225w13ybivv2rdwzfa02ghdh19ckmjays9zxxjd5n2h1kk3g"; sha256 = "1hw2wh4fpzrdynhb6xyc7yiyhc2msqz0z1mqhvwq6mli0bxyvkns";
authors = [ authors = [
"Geoffroy Couprie <geo.couprie@gmail.com>" "Geoffroy Couprie <geo.couprie@gmail.com>"
"Marc-Antoine Perennou <Marc-Antoine@Perennou.com>" "Marc-Antoine Perennou <Marc-Antoine@Perennou.com>"
@ -2753,30 +2739,6 @@ rec {
"deadlock_detection" = [ "petgraph" "thread-id" "backtrace" ]; "deadlock_detection" = [ "petgraph" "thread-id" "backtrace" ];
}; };
}; };
"pem" = rec {
crateName = "pem";
version = "0.7.0";
edition = "2018";
sha256 = "14wpql0znpxrg6bq6lmp9kvbs9v24l0zzqqf3yj5d9spqxh1fn51";
authors = [
"Jonathan Creekmore <jonathan@thecreekmores.org>"
];
dependencies = [
{
name = "base64";
packageId = "base64 0.11.0";
}
{
name = "lazy_static";
packageId = "lazy_static";
}
{
name = "regex";
packageId = "regex";
}
];
};
"percent-encoding 1.0.1" = rec { "percent-encoding 1.0.1" = rec {
crateName = "percent-encoding"; crateName = "percent-encoding";
version = "1.0.1"; version = "1.0.1";
@ -3962,9 +3924,9 @@ rec {
}; };
"tcp-stream" = rec { "tcp-stream" = rec {
crateName = "tcp-stream"; crateName = "tcp-stream";
version = "0.19.1"; version = "0.15.4";
edition = "2018"; edition = "2018";
sha256 = "0gihcjbkl1bfakq9cphbf54i2z30rb1jsjvm1bjm6fy8dyk3dy9v"; sha256 = "1pfrlryb4fydq4rdvmljnd01k7i3kqadlydsz5ifgsm7yrvs5yng";
libName = "tcp_stream"; libName = "tcp_stream";
authors = [ authors = [
"Marc-Antoine Perennou <Marc-Antoine@Perennou.com>" "Marc-Antoine Perennou <Marc-Antoine@Perennou.com>"
@ -3983,27 +3945,19 @@ rec {
{ {
name = "native-tls"; name = "native-tls";
packageId = "native-tls"; packageId = "native-tls";
rename = "native-tls-crate";
optional = true;
}
{
name = "pem";
packageId = "pem";
optional = true; optional = true;
} }
]; ];
features = { features = {
"dangerous-configuration" = [ "rustls-connector/dangerous-configuration" ]; "dangerous-configuration" = [ "rustls-connector/dangerous-configuration" ];
"default" = [ "native-tls" ]; "default" = [ "native-tls" ];
"native-tls" = [ "native-tls-crate" "pem" ];
"quic" = [ "rustls-connector/quic" ]; "quic" = [ "rustls-connector/quic" ];
"rustls" = [ "rustls-native-certs" ]; "rustls" = [ "rustls-native-certs" ];
"rustls-common" = [ "rustls-connector" "p12" ]; "rustls-native-certs" = [ "rustls-connector" "rustls-connector/native-certs" ];
"rustls-native-certs" = [ "rustls-common" "rustls-connector/native-certs" ]; "rustls-webpki-roots-certs" = [ "rustls-connector" "rustls-connector/webpki-roots-certs" ];
"rustls-webpki-roots-certs" = [ "rustls-common" "rustls-connector/webpki-roots-certs" ];
"vendored-openssl" = [ "openssl/vendored" ]; "vendored-openssl" = [ "openssl/vendored" ];
}; };
resolvedDefaultFeatures = [ "native-tls" "native-tls-crate" "pem" ]; resolvedDefaultFeatures = [ "native-tls" ];
}; };
"tempfile 2.2.0" = rec { "tempfile 2.2.0" = rec {
crateName = "tempfile"; crateName = "tempfile";

2
ofborg/Cargo.toml
View file

@ -27,4 +27,4 @@ chrono = "0.4.6"
separator = "0.4.1" separator = "0.4.1"
async-std = "1.5.0" async-std = "1.5.0"
lapin = "1.0.0-rc6" lapin = "=1.0.0-beta4"

20
ofborg/src/easylapin.rs
View file

@ -18,10 +18,12 @@ use lapin::options::{
ExchangeDeclareOptions, QueueBindOptions, QueueDeclareOptions, ExchangeDeclareOptions, QueueBindOptions, QueueDeclareOptions,
}; };
use lapin::types::{AMQPValue, FieldTable}; use lapin::types::{AMQPValue, FieldTable};
use lapin::{BasicProperties, Channel, Connection, ConnectionProperties, ExchangeKind}; use lapin::{
BasicProperties, Channel, CloseOnDrop, Connection, ConnectionProperties, ExchangeKind,
};
use tracing::{debug, trace}; use tracing::{debug, trace};
pub fn from_config(cfg: &RabbitMQConfig) -> Result<Connection, lapin::Error> { pub fn from_config(cfg: &RabbitMQConfig) -> Result<CloseOnDrop<Connection>, lapin::Error> {
let mut props = FieldTable::default(); let mut props = FieldTable::default();
props.insert( props.insert(
"ofborg_version".into(), "ofborg_version".into(),
@ -32,7 +34,7 @@ pub fn from_config(cfg: &RabbitMQConfig) -> Result<Connection, lapin::Error> {
task::block_on(Connection::connect(&cfg.as_uri(), opts)) task::block_on(Connection::connect(&cfg.as_uri(), opts))
} }
impl ChannelExt for Channel { impl ChannelExt for CloseOnDrop<Channel> {
type Error = lapin::Error; type Error = lapin::Error;
fn declare_exchange(&mut self, config: ExchangeConfig) -> Result<(), Self::Error> { fn declare_exchange(&mut self, config: ExchangeConfig) -> Result<(), Self::Error> {
@ -79,7 +81,7 @@ impl ChannelExt for Channel {
} }
} }
impl<'a, W: SimpleWorker + 'a> ConsumerExt<'a, W> for Channel { impl<'a, W: SimpleWorker + 'a> ConsumerExt<'a, W> for CloseOnDrop<Channel> {
type Error = lapin::Error; type Error = lapin::Error;
type Handle = Pin<Box<dyn Future<Output = ()> + 'a>>; type Handle = Pin<Box<dyn Future<Output = ()> + 'a>>;
@ -115,7 +117,7 @@ impl<'a, W: SimpleWorker + 'a> ConsumerExt<'a, W> for Channel {
/// Same as a regular channel, but without prefetching, /// Same as a regular channel, but without prefetching,
/// used for services with multiple instances. /// used for services with multiple instances.
pub struct WorkerChannel(pub Channel); pub struct WorkerChannel(pub CloseOnDrop<Channel>);
impl<'a, W: SimpleWorker + 'a> ConsumerExt<'a, W> for WorkerChannel { impl<'a, W: SimpleWorker + 'a> ConsumerExt<'a, W> for WorkerChannel {
type Error = lapin::Error; type Error = lapin::Error;
@ -128,12 +130,12 @@ impl<'a, W: SimpleWorker + 'a> ConsumerExt<'a, W> for WorkerChannel {
} }
pub struct ChannelNotificationReceiver<'a> { pub struct ChannelNotificationReceiver<'a> {
channel: &'a mut lapin::Channel, channel: &'a mut CloseOnDrop<lapin::Channel>,
deliver: &'a Delivery, deliver: &'a Delivery,
} }
impl<'a> ChannelNotificationReceiver<'a> { impl<'a> ChannelNotificationReceiver<'a> {
pub fn new(channel: &'a mut lapin::Channel, deliver: &'a Delivery) -> Self { pub fn new(channel: &'a mut CloseOnDrop<lapin::Channel>, deliver: &'a Delivery) -> Self {
ChannelNotificationReceiver { channel, deliver } ChannelNotificationReceiver { channel, deliver }
} }
} }
@ -147,7 +149,7 @@ impl<'a> NotificationReceiver for ChannelNotificationReceiver<'a> {
// FIXME the consumer trait for SimpleWorker and SimpleNotifyWorker conflict, // FIXME the consumer trait for SimpleWorker and SimpleNotifyWorker conflict,
// but one could probably be implemented in terms of the other instead. // but one could probably be implemented in terms of the other instead.
pub struct NotifyChannel(pub Channel); pub struct NotifyChannel(pub CloseOnDrop<Channel>);
impl<'a, W: SimpleNotifyWorker + 'a> ConsumerExt<'a, W> for NotifyChannel { impl<'a, W: SimpleNotifyWorker + 'a> ConsumerExt<'a, W> for NotifyChannel {
type Error = lapin::Error; type Error = lapin::Error;
@ -188,7 +190,7 @@ impl<'a, W: SimpleNotifyWorker + 'a> ConsumerExt<'a, W> for NotifyChannel {
} }
async fn action_deliver( async fn action_deliver(
chan: &Channel, chan: &CloseOnDrop<Channel>,
deliver: &Delivery, deliver: &Delivery,
action: Action, action: Action,
) -> Result<(), lapin::Error> { ) -> Result<(), lapin::Error> {

7
ofborg/src/stats.rs
View file

@ -1,5 +1,6 @@
use async_std::task; use async_std::task;
use lapin::options::BasicPublishOptions; use lapin::options::BasicPublishOptions;
use lapin::CloseOnDrop;
include!(concat!(env!("OUT_DIR"), "/events.rs")); include!(concat!(env!("OUT_DIR"), "/events.rs"));
@ -24,8 +25,8 @@ pub struct RabbitMQ<C> {
channel: C, channel: C,
} }
impl RabbitMQ<lapin::Channel> { impl RabbitMQ<CloseOnDrop<lapin::Channel>> {
pub fn from_lapin(identity: &str, channel: lapin::Channel) -> Self { pub fn from_lapin(identity: &str, channel: CloseOnDrop<lapin::Channel>) -> Self {
RabbitMQ { RabbitMQ {
identity: identity.to_owned(), identity: identity.to_owned(),
channel, channel,
@ -33,7 +34,7 @@ impl RabbitMQ<lapin::Channel> {
} }
} }
impl SysEvents for RabbitMQ<lapin::Channel> { impl SysEvents for RabbitMQ<CloseOnDrop<lapin::Channel>> {
fn notify(&mut self, event: Event) { fn notify(&mut self, event: Event) {
let props = lapin::BasicProperties::default().with_content_type("application/json".into()); let props = lapin::BasicProperties::default().with_content_type("application/json".into());
task::block_on(async { task::block_on(async {