From 0fb0c3759a04c025800e3175fb4cbd8d595f8c4b Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Tue, 17 Nov 2020 15:48:33 -0800 Subject: rust: fatcatd changes for DOAJ+dblp identifiers --- rust/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rust/Cargo.toml') diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 3b84df22..0290492a 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fatcat" -version = "0.3.1" +version = "0.3.3" edition = "2018" authors = ["Bryan Newbold "] description = "A scalable, versioned, API-oriented catalog for bibliographic entities and file metadata" -- cgit v1.2.3 From 1fca5a9822944d0646d2dcba6cf54f27a0ffe5c0 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Fri, 20 Nov 2020 18:39:53 -0800 Subject: cargo: update sentry to fix memory initialization issue Older sentry had an unsafe memory initialization error, which wasn't caught by older compilers. Rust 1.48 catches the problem at runtime and raises a panic. This meant that new builds (eg, on QA machine after update) were panic-ing. Newest versions of sentry have modern dependencies, which breaks our crufty old 'iron' dependency tree. Work-around is to only partially update (v0.12 to v0.15). This is a fairly frustrating situation. I'm hopeful that when we update to a different web framework and openapi generator 5.0 (not yet released), many of these dependency issues will be resolved, but i'm not certain. I did notice that if we entirely remove Sentry, which has not really been used much (only a small handful of issues reported over several years), we might be able to resolve openssl dependency issues. --- rust/Cargo.lock | 604 +++++++++++++++++++++++++++++++------------------------- rust/Cargo.toml | 2 +- 2 files changed, 332 insertions(+), 274 deletions(-) (limited to 'rust/Cargo.toml') diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 6bd42699..fc260a6f 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -1,10 +1,19 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. [[package]] -name = "adler32" -version = "1.0.3" +name = "addr2line" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c" +checksum = "7c0929d69e78dd9bf5408269919fcbcaeb2e35e5d43e5815517cdc6a8e11a423" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" [[package]] name = "aho-corasick" @@ -12,7 +21,16 @@ version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e" dependencies = [ - "memchr 2.1.3", + "memchr 2.3.4", +] + +[[package]] +name = "aho-corasick" +version = "0.7.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" +dependencies = [ + "memchr 2.3.4", ] [[package]] @@ -63,27 +81,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799" [[package]] -name = "backtrace" -version = "0.3.13" +name = "autocfg" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5" -dependencies = [ - "autocfg", - "backtrace-sys", - "cfg-if", - "libc", - "rustc-demangle", - "winapi 0.3.6", -] +checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] -name = "backtrace-sys" -version = "0.1.28" +name = "backtrace" +version = "0.3.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6" +checksum = "ef5140344c85b01f9bbb4d4b7288a8aa4b3287ccef913a14bcc78a1063623598" dependencies = [ - "cc", + "addr2line", + "cfg-if 1.0.0", "libc", + "miniz_oxide", + "object", + "rustc-demangle", ] [[package]] @@ -129,7 +143,7 @@ dependencies = [ "iron 0.6.0", "persistent", "plugin", - "serde 1.0.85", + "serde 1.0.117", "serde_json 1.0.38", ] @@ -169,16 +183,16 @@ dependencies = [ ] [[package]] -name = "cc" -version = "1.0.28" +name = "cfg-if" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749" +checksum = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4" [[package]] name = "cfg-if" -version = "0.1.6" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" @@ -198,7 +212,7 @@ checksum = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878" dependencies = [ "num-integer", "num-traits 0.2.6", - "serde 1.0.85", + "serde 1.0.117", "time", ] @@ -242,28 +256,40 @@ dependencies = [ ] [[package]] -name = "core-foundation" -version = "0.6.4" +name = "cookie" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" +checksum = "888604f00b3db336d2af898ec3c1d5d0ddf5e6d462220f2ededc33a87ac4bbd5" dependencies = [ - "core-foundation-sys", - "libc", + "time", + "url 1.7.2", ] [[package]] -name = "core-foundation-sys" -version = "0.6.2" +name = "cookie_store" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" +checksum = "46750b3f362965f197996c4448e4a0935e791bf7d6631bfce9ee0af3d24c919c" +dependencies = [ + "cookie", + "failure", + "idna 0.1.5", + "log 0.4.6", + "publicsuffix", + "serde 1.0.117", + "serde_json 1.0.38", + "time", + "try_from", + "url 1.7.2", +] [[package]] name = "crc32fast" -version = "1.1.2" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91d5240c6975ef33aeb5f148f35275c25eda8e8a5f95abe421978b05b8bf192" +checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", ] [[package]] @@ -284,12 +310,12 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad4c7ea749d9fb09e23c5cb17e3b70650860553a0e2744e38446b1803bf7db94" dependencies = [ - "cfg-if", + "cfg-if 0.1.6", "crossbeam-channel 0.3.8", "crossbeam-deque", "crossbeam-epoch 0.7.1", "crossbeam-utils 0.6.5", - "lazy_static 1.2.0", + "lazy_static 1.4.0", "num_cpus", "parking_lot 0.7.1", ] @@ -334,9 +360,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2449aaa4ec7ef96e5fb24db16024b935df718e9ae1cec0a1e68feeca2efca7b8" dependencies = [ "arrayvec", - "cfg-if", + "cfg-if 0.1.6", "crossbeam-utils 0.6.5", - "lazy_static 1.2.0", + "lazy_static 1.4.0", "memoffset", "scopeguard", ] @@ -348,9 +374,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04c9e3102cc2d69cd681412141b390abd55a362afc1540965dad0ad4d34280b4" dependencies = [ "arrayvec", - "cfg-if", + "cfg-if 0.1.6", "crossbeam-utils 0.6.5", - "lazy_static 1.2.0", + "lazy_static 1.4.0", "memoffset", "scopeguard", ] @@ -367,8 +393,8 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8306fcef4a7b563b76b7dd949ca48f52bc1141aa067d2ea09565f3e2652aa5c" dependencies = [ - "cfg-if", - "lazy_static 1.2.0", + "cfg-if 0.1.6", + "lazy_static 1.4.0", ] [[package]] @@ -379,13 +405,13 @@ checksum = "f4f47ca1860a761136924ddd2422ba77b2ea54fe8cc75b9040804a0d9d32ad97" [[package]] name = "debugid" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeb088ba9178f59386641547f9c22fd1d658e2d130f02359bb562759f8f992fc" +checksum = "088c9627adec1e494ff9dea77377f1e69893023d631254a0ec68b16ee20be3e9" dependencies = [ - "lazy_static 1.2.0", - "regex 1.1.0", - "serde 1.0.85", + "lazy_static 1.4.0", + "regex 1.4.2", + "serde 1.0.117", "uuid 0.7.2", ] @@ -411,7 +437,7 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62a27666098617d52c487a41f70de23d44a1dc1f3aa5877ceba2790fb1f1cab4" dependencies = [ - "proc-macro2", + "proc-macro2 0.4.27", "quote 0.6.11", "syn 0.15.26", ] @@ -511,7 +537,7 @@ version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd251508d65030820f3a4317af2248180db337fdb25d89967956242580277813" dependencies = [ - "cfg-if", + "cfg-if 0.1.6", ] [[package]] @@ -523,7 +549,7 @@ dependencies = [ "atty", "humantime", "log 0.4.6", - "regex 1.1.0", + "regex 1.4.2", "termcolor", ] @@ -546,6 +572,15 @@ dependencies = [ "backtrace", ] +[[package]] +name = "error-chain" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" +dependencies = [ + "version_check 0.9.2", +] + [[package]] name = "failure" version = "0.1.5" @@ -562,7 +597,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1" dependencies = [ - "proc-macro2", + "proc-macro2 0.4.27", "quote 0.6.11", "syn 0.15.26", "synstructure", @@ -588,15 +623,15 @@ dependencies = [ "iron 0.6.0", "iron-slog", "iron-test", - "lazy_static 1.2.0", - "log 0.3.9", + "lazy_static 1.4.0", + "log 0.4.6", "macaroon", "num_cpus", - "rand 0.3.23", - "regex 1.1.0", + "rand 0.6.5", + "regex 1.4.2", "sentry", - "serde 1.0.85", - "serde_derive 1.0.85", + "serde 1.0.117", + "serde_derive 1.0.117", "serde_ignored", "serde_json 1.0.38", "sha1", @@ -616,7 +651,7 @@ dependencies = [ "bodyparser", "chrono 0.4.6", "clap", - "error-chain", + "error-chain 0.11.0", "futures", "hyper 0.10.15", "iron 0.6.0", @@ -624,8 +659,8 @@ dependencies = [ "log 0.3.9", "multipart", "router", - "serde 1.0.85", - "serde_derive 1.0.85", + "serde 1.0.117", + "serde_derive 1.0.117", "serde_ignored", "serde_json 1.0.38", "swagger", @@ -634,6 +669,18 @@ dependencies = [ "uuid 0.5.1", ] +[[package]] +name = "flate2" +version = "1.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7411863d55df97a419aa64cb4d2f167103ea9d767e2c54a1868b7ac3f6b47129" +dependencies = [ + "cfg-if 1.0.0", + "crc32fast", + "libc", + "miniz_oxide", +] + [[package]] name = "fnv" version = "1.0.6" @@ -641,20 +688,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" [[package]] -name = "foreign-types" -version = "0.3.2" +name = "form_urlencoded" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00" dependencies = [ - "foreign-types-shared", + "matches", + "percent-encoding 2.1.0", ] -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "fuchsia-cprng" version = "0.1.0" @@ -693,6 +735,12 @@ dependencies = [ "num_cpus", ] +[[package]] +name = "gimli" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" + [[package]] name = "h2" version = "0.1.16" @@ -790,23 +838,21 @@ dependencies = [ ] [[package]] -name = "hyper-tls" -version = "0.3.2" +name = "idna" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a800d6aa50af4b5850b2b0f659625ce9504df908e9733b635720483be26174f" +checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" dependencies = [ - "bytes", - "futures", - "hyper 0.12.23", - "native-tls", - "tokio-io", + "matches", + "unicode-bidi", + "unicode-normalization", ] [[package]] name = "idna" -version = "0.1.5" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" +checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" dependencies = [ "matches", "unicode-bidi", @@ -815,11 +861,12 @@ dependencies = [ [[package]] name = "im" -version = "12.3.0" +version = "12.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0627d417829c1d763d602687634869f254fc79f7e22dea6c824dab993db857e4" +checksum = "de38d1511a0ce7677538acb1e31b5df605147c458e061b2cdb89858afb1cd182" dependencies = [ "rustc_version", + "sized-chunks", "typenum", ] @@ -903,7 +950,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e31a8281fc93ec9693494da65fbf28c0c2aa60a2eaec25dc58e2f31952e95edc" dependencies = [ - "cfg-if", + "cfg-if 0.1.6", "libc", "redox_syscall", "winapi 0.3.6", @@ -945,9 +992,9 @@ checksum = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" [[package]] name = "lazy_static" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lazycell" @@ -957,20 +1004,9 @@ checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" [[package]] name = "libc" -version = "0.2.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e962c7641008ac010fa60a7dfdc1712449f29c44ef2d4702394aea943ee75047" - -[[package]] -name = "libflate" -version = "0.1.19" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff3ac7d6f23730d3b533c35ed75eef638167634476a499feef16c428d74b57b" -dependencies = [ - "adler32", - "byteorder", - "crc32fast", -] +checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614" [[package]] name = "libsodium-sys" @@ -1007,7 +1043,7 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" dependencies = [ - "cfg-if", + "cfg-if 0.1.6", ] [[package]] @@ -1040,13 +1076,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.1.3" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1dd4eaac298c32ce07eb6ed9242eda7d82955b9170b7d6db59b2e02cc63fcb8" -dependencies = [ - "cfg-if", - "libc", -] +checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" [[package]] name = "memoffset" @@ -1089,7 +1121,7 @@ version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e27ca21f40a310bd06d9031785f4801710d566c184a6e15bad4f1d9b65f9425" dependencies = [ - "unicase 2.2.0", + "unicase 2.6.0", ] [[package]] @@ -1106,14 +1138,22 @@ dependencies = [ [[package]] name = "mime_guess" -version = "2.0.0-alpha.6" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30de2e4613efcba1ec63d8133f344076952090c122992a903359be5a4f99c3ed" +checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212" dependencies = [ "mime 0.3.13", - "phf", - "phf_codegen", - "unicase 1.4.2", + "unicase 2.6.0", +] + +[[package]] +name = "miniz_oxide" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d" +dependencies = [ + "adler", + "autocfg 1.0.1", ] [[package]] @@ -1173,31 +1213,13 @@ dependencies = [ "twoway", ] -[[package]] -name = "native-tls" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e" -dependencies = [ - "lazy_static 1.2.0", - "libc", - "log 0.4.6", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - [[package]] name = "net2" version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" dependencies = [ - "cfg-if", + "cfg-if 0.1.6", "libc", "winapi 0.3.6", ] @@ -1263,37 +1285,10 @@ dependencies = [ ] [[package]] -name = "openssl" -version = "0.10.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8152bb5a9b5b721538462336e3bef9a539f892715e5037fda0f984577311af15" -dependencies = [ - "bitflags", - "cfg-if", - "foreign-types", - "lazy_static 1.2.0", - "libc", - "openssl-sys", -] - -[[package]] -name = "openssl-probe" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" - -[[package]] -name = "openssl-sys" -version = "0.9.49" +name = "object" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fad9e54bd23bd4cbbe48fdc08a1b8091707ac869ef8508edea2fec77dcc884" -dependencies = [ - "autocfg", - "cc", - "libc", - "pkg-config", - "vcpkg", -] +checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397" [[package]] name = "owning_ref" @@ -1356,6 +1351,12 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" +[[package]] +name = "percent-encoding" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" + [[package]] name = "persistent" version = "0.4.0" @@ -1438,6 +1439,28 @@ dependencies = [ "unicode-xid 0.1.0", ] +[[package]] +name = "proc-macro2" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" +dependencies = [ + "unicode-xid 0.2.1", +] + +[[package]] +name = "publicsuffix" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bbaa49075179162b49acac1c6aa45fb4dafb5f13cf6794276d77bc7fd95757b" +dependencies = [ + "error-chain 0.12.4", + "idna 0.2.0", + "lazy_static 1.4.0", + "regex 1.4.2", + "url 2.2.0", +] + [[package]] name = "quick-error" version = "1.2.2" @@ -1456,7 +1479,16 @@ version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdd8e04bd9c52e0342b406469d494fcb033be4bdbe5c606016defbb1681411e1" dependencies = [ - "proc-macro2", + "proc-macro2 0.4.27", +] + +[[package]] +name = "quote" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" +dependencies = [ + "proc-macro2 1.0.24", ] [[package]] @@ -1512,7 +1544,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" dependencies = [ - "autocfg", + "autocfg 0.1.2", "libc", "rand_chacha", "rand_core 0.4.0", @@ -1531,7 +1563,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" dependencies = [ - "autocfg", + "autocfg 0.1.2", "rand_core 0.3.1", ] @@ -1642,24 +1674,23 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384" dependencies = [ - "aho-corasick", - "memchr 2.1.3", + "aho-corasick 0.6.9", + "memchr 2.3.4", "regex-syntax 0.5.6", - "thread_local", + "thread_local 0.3.6", "utf8-ranges", ] [[package]] name = "regex" -version = "1.1.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e7cbbd370869ce2e8dff25c7018702d10b21a20ef7135316f8daecd6c25b7f" +checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c" dependencies = [ - "aho-corasick", - "memchr 2.1.3", - "regex-syntax 0.6.5", - "thread_local", - "utf8-ranges", + "aho-corasick 0.7.15", + "memchr 2.3.4", + "regex-syntax 0.6.21", + "thread_local 1.0.1", ] [[package]] @@ -1673,12 +1704,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.5" +version = "0.6.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2f35eedad5295fdf00a63d7d4b238135723f92b434ec06774dad15c7ab0861" -dependencies = [ - "ucd-util", -] +checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189" [[package]] name = "remove_dir_all" @@ -1691,25 +1719,26 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.9.9" +version = "0.9.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d6e187a58d923ee132fcda141c94e716bcfe301c2ea2bef5c81536e0085376" +checksum = "f88643aea3c1343c804950d7bf983bd2067f5ab59db6d613a08e05572f2714ab" dependencies = [ "base64 0.10.1", "bytes", + "cookie", + "cookie_store", "encoding_rs", + "flate2", "futures", "http", "hyper 0.12.23", - "hyper-tls", - "libflate", "log 0.4.6", "mime 0.3.13", - "mime_guess 2.0.0-alpha.6", - "native-tls", - "serde 1.0.85", + "mime_guess 2.0.3", + "serde 1.0.117", "serde_json 1.0.38", "serde_urlencoded", + "time", "tokio", "tokio-executor", "tokio-io", @@ -1717,6 +1746,7 @@ dependencies = [ "tokio-timer", "url 1.7.2", "uuid 0.7.2", + "winreg", ] [[package]] @@ -1775,16 +1805,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9" -[[package]] -name = "schannel" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e1a231dc10abf6749cfa5d7767f25888d484201accbd919b66ab5413c502d56" -dependencies = [ - "lazy_static 1.2.0", - "winapi 0.3.6", -] - [[package]] name = "scheduled-thread-pool" version = "0.2.0" @@ -1800,27 +1820,6 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" -[[package]] -name = "security-framework" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eee63d0f4a9ec776eeb30e220f0bc1e092c3ad744b2a379e3993070364d3adc2" -dependencies = [ - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9636f8989cbf61385ae4824b98c1aaa54c994d7d8b41f11c601ed799f0549a56" -dependencies = [ - "core-foundation-sys", -] - [[package]] name = "semver" version = "0.9.0" @@ -1838,18 +1837,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "sentry" -version = "0.12.1" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f68b67973fb8e8cc09a85168e2b4242be4255cca776b7ae25cfec5eb3a9d708" +checksum = "95129dccb5a12b47b030697dac994e59fb63fe4e8294c1dc4c78ab7b54b49c22" dependencies = [ "backtrace", "failure", "httpdate", "im", - "lazy_static 1.2.0", + "lazy_static 1.4.0", "log 0.4.6", - "rand 0.5.6", - "regex 1.1.0", + "rand 0.6.5", + "regex 1.4.2", "reqwest", "rustc_version", "sentry-types", @@ -1858,16 +1857,14 @@ dependencies = [ [[package]] name = "sentry-types" -version = "0.8.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1108bf605cb7f136bea4d30d24c9e255ab16ea610a74e004c02d673a2247f6cf" +checksum = "b23e3d9c8c6e4a1523f24df6753c4088bfe16c44a73c8881c1d23c70f28ae280" dependencies = [ "chrono 0.4.6", "debugid", "failure", - "failure_derive", - "serde 1.0.85", - "serde_derive 1.0.85", + "serde 1.0.117", "serde_json 1.0.38", "url 1.7.2", "url_serde", @@ -1888,9 +1885,12 @@ checksum = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af" [[package]] name = "serde" -version = "1.0.85" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534b8b91a95e0f71bca3ed5824752d558da048d4248c91af873b63bd60519752" +checksum = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a" +dependencies = [ + "serde_derive 1.0.117", +] [[package]] name = "serde_codegen_internals" @@ -1914,13 +1914,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.85" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a915306b0f1ac5607797697148c223bedeaa36bcc2e28a01441cd638cc6567b4" +checksum = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e" dependencies = [ - "proc-macro2", - "quote 0.6.11", - "syn 0.15.26", + "proc-macro2 1.0.24", + "quote 1.0.7", + "syn 1.0.48", ] [[package]] @@ -1929,7 +1929,7 @@ version = "0.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "190e9765dcedb56be63b6e0993a006c7e3b071a016a304736e4a315dc01fb142" dependencies = [ - "serde 1.0.85", + "serde 1.0.117", ] [[package]] @@ -1952,7 +1952,7 @@ checksum = "27dce848e7467aa0e2fcaf0a413641499c0b745452aaca1194d24dedde9e13c9" dependencies = [ "itoa 0.4.3", "ryu", - "serde 1.0.85", + "serde 1.0.117", ] [[package]] @@ -1963,7 +1963,7 @@ checksum = "d48f9f99cd749a2de71d29da5f948de7f2764cc5a9d7f3c97e3514d4ee6eabf2" dependencies = [ "dtoa", "itoa 0.4.3", - "serde 1.0.85", + "serde 1.0.117", "url 1.7.2", ] @@ -1979,6 +1979,15 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" +[[package]] +name = "sized-chunks" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d3e7f23bad2d6694e0f46f5e470ec27eb07b8f3e8b309a4b0dc17501928b9f2" +dependencies = [ + "typenum", +] + [[package]] name = "slab" version = "0.4.2" @@ -1999,7 +2008,7 @@ checksum = "e544d16c6b230d84c866662fe55e31aacfca6ae71e6fc49ae9a311cb379bfc2f" dependencies = [ "slog", "take_mut", - "thread_local", + "thread_local 0.3.6", ] [[package]] @@ -2009,7 +2018,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60c04b4726fa04595ccf2c2dad7bcd15474242c4c5e109a8a376e8a2c9b1539a" dependencies = [ "crossbeam 0.6.0", - "lazy_static 1.2.0", + "lazy_static 1.4.0", "slog", ] @@ -2035,7 +2044,7 @@ dependencies = [ "isatty", "slog", "term", - "thread_local", + "thread_local 0.3.6", ] [[package]] @@ -2085,8 +2094,8 @@ dependencies = [ "base64 0.5.2", "hyper 0.10.15", "iron 0.5.1", - "serde 1.0.85", - "serde_derive 1.0.85", + "serde 1.0.117", + "serde_derive 1.0.117", "serde_json 1.0.38", ] @@ -2107,11 +2116,22 @@ version = "0.15.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f92e629aa1d9c827b2bb8297046c1ccffc57c99b947a680d3ccff1f136a3bee9" dependencies = [ - "proc-macro2", + "proc-macro2 0.4.27", "quote 0.6.11", "unicode-xid 0.1.0", ] +[[package]] +name = "syn" +version = "1.0.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac" +dependencies = [ + "proc-macro2 1.0.24", + "quote 1.0.7", + "unicode-xid 0.2.1", +] + [[package]] name = "synom" version = "0.11.3" @@ -2127,7 +2147,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015" dependencies = [ - "proc-macro2", + "proc-macro2 0.4.27", "quote 0.6.11", "syn 0.15.26", "unicode-xid 0.1.0", @@ -2149,20 +2169,6 @@ dependencies = [ "remove_dir_all", ] -[[package]] -name = "tempfile" -version = "3.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e91405c14320e5c79b3d148e1c86f40749a36e490642202a31689cb1a3452b2" -dependencies = [ - "cfg-if", - "libc", - "rand 0.6.5", - "redox_syscall", - "remove_dir_all", - "winapi 0.3.6", -] - [[package]] name = "term" version = "0.5.1" @@ -2208,7 +2214,16 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" dependencies = [ - "lazy_static 1.2.0", + "lazy_static 1.4.0", +] + +[[package]] +name = "thread_local" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" +dependencies = [ + "lazy_static 1.4.0", ] [[package]] @@ -2250,6 +2265,7 @@ dependencies = [ "tokio-executor", "tokio-io", "tokio-reactor", + "tokio-tcp", "tokio-threadpool", "tokio-timer", ] @@ -2293,7 +2309,7 @@ checksum = "afbcdb0f0d2a1e4c440af82d7bbf0bf91a8a8c0575bcd20c05d15be7e9d3a02f" dependencies = [ "crossbeam-utils 0.6.5", "futures", - "lazy_static 1.2.0", + "lazy_static 1.4.0", "log 0.4.6", "mio", "num_cpus", @@ -2359,13 +2375,22 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" +[[package]] +name = "try_from" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b" +dependencies = [ + "cfg-if 0.1.6", +] + [[package]] name = "twoway" version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1" dependencies = [ - "memchr 2.1.3", + "memchr 2.3.4", ] [[package]] @@ -2401,16 +2426,16 @@ version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" dependencies = [ - "version_check", + "version_check 0.1.5", ] [[package]] name = "unicase" -version = "2.2.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d3218ea14b4edcaccfa0df0a64a3792a2c32cc706f1b336e48867f9d3147f90" +checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" dependencies = [ - "version_check", + "version_check 0.9.2", ] [[package]] @@ -2449,6 +2474,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" +[[package]] +name = "unicode-xid" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" + [[package]] name = "unreachable" version = "1.0.0" @@ -2484,9 +2515,21 @@ version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" dependencies = [ - "idna", + "idna 0.1.5", "matches", - "percent-encoding", + "percent-encoding 1.0.1", +] + +[[package]] +name = "url" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e" +dependencies = [ + "form_urlencoded", + "idna 0.2.0", + "matches", + "percent-encoding 2.1.0", ] [[package]] @@ -2495,7 +2538,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74e7d099f1ee52f823d4bdd60c93c3602043c728f5db3b97bdb548467f7bddea" dependencies = [ - "serde 1.0.85", + "serde 1.0.117", "url 1.7.2", ] @@ -2534,7 +2577,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bcc7e3b898aa6f6c08e5295b6c89258d1331e9ac578cc992fb818759951bdc22" dependencies = [ "rand 0.3.23", - "serde 1.0.85", + "serde 1.0.117", ] [[package]] @@ -2543,7 +2586,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1436e58182935dcd9ce0add9ea0b558e8a87befe01c1a301e6020aeb0876363" dependencies = [ - "cfg-if", + "cfg-if 0.1.6", ] [[package]] @@ -2553,7 +2596,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0238db0c5b605dd1cf51de0f21766f97fba2645897024461d6a00c036819a768" dependencies = [ "rand 0.6.5", - "serde 1.0.85", + "serde 1.0.117", ] [[package]] @@ -2574,6 +2617,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" +[[package]] +name = "version_check" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" + [[package]] name = "void" version = "1.0.2" @@ -2644,6 +2693,15 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "winreg" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf67b95d0b1bf421c4f11048d63110ca3719977169eec86396b614c8942b6e0" +dependencies = [ + "winapi 0.3.6", +] + [[package]] name = "ws2_32-sys" version = "0.2.1" diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 0290492a..3eda4df9 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -44,7 +44,7 @@ serde_json = "1.0" serde = "1.0" serde_derive = "1.0" serde_ignored = "0.0.4" -sentry = { version = "^0.12", default-features = false, features = ["with_client_implementation", "with_backtrace", "with_panic", "with_log", "with_rust_info", "with_failure"] } +sentry = { version = "0.15", default-features = false, features = ["with_client_implementation", "with_backtrace", "with_panic", "with_log", "with_rust_info", "with_failure", "with_default_transport" ] } cadence = "^0.16" # Command-line tools -- cgit v1.2.3