diff --git a/testing/read-it-later/fix-wallabag-api.patch b/testing/read-it-later/0001-Cargo-Update-the-glib-dependencies.patch similarity index 66% rename from testing/read-it-later/fix-wallabag-api.patch rename to testing/read-it-later/0001-Cargo-Update-the-glib-dependencies.patch index c3ddeef34bd..7a5898139bf 100644 --- a/testing/read-it-later/fix-wallabag-api.patch +++ b/testing/read-it-later/0001-Cargo-Update-the-glib-dependencies.patch @@ -1,37 +1,58 @@ +From 73a641861fb7151410f783acae7824dc8ce89bd9 Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Tue, 24 Aug 2021 21:12:46 +1000 +Subject: [PATCH 1/4] Cargo: Update the glib dependencies + +Update libhandy to 0.8 to allow using libhandy 1.0. In order for this to +build we also update the glib and gtk dependencies. + +Signed-off-by: Alistair Francis +--- + Cargo.lock | 3408 +++++++++++++++++----------- + Cargo.toml | 21 +- + data/resources/ui/articles_list.ui | 4 +- + data/resources/ui/login.ui.in | 14 +- + data/resources/ui/settings.ui | 10 +- + data/resources/ui/window.ui.in | 4 +- + meson.build | 2 +- + src/application.rs | 28 +- + src/database.rs | 2 +- + src/main.rs | 5 +- + src/meson.build | 1 - + src/models/article.rs | 2 +- + src/models/client_manager.rs | 2 +- + src/models/object_wrapper.rs | 74 +- + src/models/preview_image.rs | 4 +- + src/settings/settings_manager.rs | 21 +- + src/static_resources.rs.in | 2 +- + src/views/articles_list.rs | 4 +- + src/widgets/articles/index.rs | 23 +- + src/widgets/articles/list.rs | 10 +- + src/widgets/articles/preview.rs | 14 +- + src/widgets/articles/row.rs | 2 +- + src/widgets/login.rs | 24 +- + src/widgets/settings.rs | 9 +- + src/widgets/window.rs | 66 +- + src/window_state.rs | 34 - + 26 files changed, 2247 insertions(+), 1543 deletions(-) + delete mode 100644 src/window_state.rs + diff --git a/Cargo.lock b/Cargo.lock -index d02cd43..7077d0e 100644 +index db14929..f74e3e9 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -1,3266 +1,3380 @@ +@@ -1,2668 +1,3446 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] -name = "aes" -+name = "addr2line" -+version = "0.16.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd" -+dependencies = [ -+ "gimli", -+] -+ -+[[package]] -+name = "adler" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -+ -+[[package]] +name = "aead" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" - dependencies = [ -- "aes-soft 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "aesni 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "block-cipher-trait 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++dependencies = [ + "generic-array", +] + @@ -51,7 +72,10 @@ index d02cd43..7077d0e 100644 +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5278b5fabbb9bd46e24aa69b2fdea62c99088e0a950a9be40e3e0101298f88da" -+dependencies = [ + dependencies = [ +- "aes-soft 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "aesni 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "block-cipher-trait 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "aead", + "aes", + "cipher", @@ -122,7 +146,7 @@ index d02cd43..7077d0e 100644 [[package]] name = "anyhow" --version = "1.0.25" +-version = "1.0.31" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28ae2b3dec75a406790005a200b1bd89785afc02517a00ca99ecfe093ee9e6cf" @@ -207,8 +231,8 @@ index d02cd43..7077d0e 100644 - "crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-io 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-io 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-timer 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "kv-log-macro 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -225,9 +249,9 @@ index d02cd43..7077d0e 100644 + +[[package]] +name = "async-std" -+version = "1.10.0" ++version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f8056f1455169ab86dd47b47391e4ab0cbd25410a70e9fe675544f49bafaf952" ++checksum = "d9f06685bad74e0570f5213741bea82158279a4103d988e57bfada11ad230341" +dependencies = [ + "async-channel", + "async-global-executor", @@ -244,23 +268,23 @@ index d02cd43..7077d0e 100644 + "memchr", + "num_cpus", + "once_cell", -+ "pin-project-lite 0.2.7", ++ "pin-project-lite", + "pin-utils", + "slab", -+ "wasm-bindgen-futures 0.4.26", ++ "wasm-bindgen-futures", ] [[package]] name = "async-task" -version = "1.0.0" +version = "4.0.3" - source = "registry+https://github.com/rust-lang/crates.io-index" ++source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0" + +[[package]] +name = "async-trait" +version = "0.1.51" -+source = "registry+https://github.com/rust-lang/crates.io-index" + source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e" dependencies = [ - "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -271,9 +295,10 @@ index d02cd43..7077d0e 100644 [[package]] name = "atk" - version = "0.8.0" +-version = "0.8.0" ++version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "444daefa55f229af145ea58d77efd23725024ee1f6f3102743709aa6b18c663e" ++checksum = "a83b21d2aa75e464db56225e1bda2dd5993311ba1095acaa8fa03d1ae67026ba" dependencies = [ - "atk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -284,25 +309,24 @@ index d02cd43..7077d0e 100644 + "atk-sys", + "bitflags", + "glib", -+ "glib-sys", -+ "gobject-sys", + "libc", ] [[package]] name = "atk-sys" - version = "0.9.1" +-version = "0.9.1" ++version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e552c1776737a4c80110d06b36d099f47c727335f9aaa5d942a72b6863a8ec6f" ++checksum = "badcf670157c84bb8b1cf6b5f70b650fed78da2033c9eed84c4e49b11cbe83ea" dependencies = [ - "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "glib-sys", -+ "gobject-sys", ++ "glib-sys 0.14.0", ++ "gobject-sys 0.14.0", + "libc", -+ "pkg-config", ++ "system-deps 3.2.0", ] +[[package]] @@ -330,32 +354,20 @@ index d02cd43..7077d0e 100644 version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" -+ -+[[package]] -+name = "autocfg" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] - name = "backtrace" +-name = "backtrace" -version = "0.3.40" -+version = "0.3.61" ++name = "autocfg" ++version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e7a905d892734eea339e896738c14b9afce22b5318f64b951e70bf3844419b01" - dependencies = [ +-dependencies = [ - "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "addr2line", -+ "cc", -+ "cfg-if 1.0.0", -+ "libc", -+ "miniz_oxide", -+ "object", -+ "rustc-demangle", - ] +-] ++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] -name = "backtrace-sys" @@ -370,86 +382,82 @@ index d02cd43..7077d0e 100644 +checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" [[package]] - name = "base64" --version = "0.10.1" +-name = "bitflags" +-version = "1.2.1" ++name = "base64" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", --] +checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] - name = "bitflags" --version = "1.2.1" +-name = "block-buffer" +-version = "0.7.3" ++name = "bitflags" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" +-dependencies = [ +- "block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", +-] +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] - name = "block-buffer" --version = "0.7.3" +-name = "block-cipher-trait" +-version = "0.6.2" ++name = "block-buffer" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ -- "block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", + "generic-array", ] [[package]] --name = "block-cipher-trait" --version = "0.6.2" -+name = "block-modes" + name = "block-modes" +-version = "0.3.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57a0e8073e8baa88212fb5823574c02ebccb395136ba9a164ab89379ec6072f0" dependencies = [ -- "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "block-cipher-trait 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "block-padding", + "cipher", ] [[package]] --name = "block-modes" --version = "0.3.3" -+name = "block-padding" + name = "block-padding" +-version = "0.1.5" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ -- "block-cipher-trait 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -] +checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] --name = "block-padding" --version = "0.1.5" +-name = "bumpalo" +-version = "3.2.1" +name = "blocking" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5e170dbede1f740736619b776d7251cb1b9095c435c34d8ca9f57fcd2f335e9" - dependencies = [ -- "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++dependencies = [ + "async-channel", + "async-task", + "atomic-waker", + "fastrand", + "futures-lite", + "once_cell", - ] ++] [[package]] - name = "bumpalo" --version = "2.6.0" --source = "registry+https://github.com/rust-lang/crates.io-index" -- --[[package]] -name = "byte-tools" -version = "0.3.1" ++name = "bumpalo" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" @@ -474,34 +482,30 @@ index d02cd43..7077d0e 100644 ] [[package]] --name = "c2-chacha" --version = "0.2.3" -+name = "bytes" + name = "bytes" +-version = "0.5.4" +version = "0.5.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", --] ++source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" + +[[package]] +name = "bytes" -+version = "1.1.0" ++version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" ++checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" + +[[package]] +name = "cache-padded" +version = "1.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" + source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" [[package]] name = "cairo-rs" -version = "0.8.0" -+version = "0.8.1" ++version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "157049ba9618aa3a61c39d5d785102c04d3b1f40632a706c621a9aedc21e6084" ++checksum = "f859ade407c19810ae920b4fafab92189ed312adad490d08fb16b5f49f1e2207" dependencies = [ - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -512,31 +516,40 @@ index d02cd43..7077d0e 100644 + "bitflags", + "cairo-sys-rs", + "glib", -+ "glib-sys", -+ "gobject-sys", + "libc", ++ "thiserror", ] [[package]] name = "cairo-sys-rs" - version = "0.9.2" +-version = "0.9.2" ++version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ff65ba02cac715be836f63429ab00a767d48336efc5497c5637afb53b4f14d63" ++checksum = "d7c9c3928781e8a017ece15eace05230f04b647457d170d2d9641c94a444ff80" dependencies = [ - "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "glib-sys", ++ "glib-sys 0.14.0", + "libc", -+ "pkg-config", ++ "system-deps 3.2.0", ] [[package]] name = "cc" -version = "1.0.48" -+version = "1.0.70" ++version = "1.0.69" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" ++ ++[[package]] ++name = "cfg-expr" ++version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d26a6ce4b6a484fa3edb70f7efa6fc430fd2b87285fe8b84304fd0936faa0dc0" ++checksum = "b412e83326147c2bb881f8b40edfbf9905b9b8abaebd0e47ca190ba62fda8f0e" ++dependencies = [ ++ "smallvec", ++] [[package]] name = "cfg-if" @@ -565,7 +578,7 @@ index d02cd43..7077d0e 100644 + "num-integer", + "num-traits", + "serde", -+ "time 0.1.43", ++ "time 0.1.44", + "winapi", +] + @@ -589,35 +602,33 @@ index d02cd43..7077d0e 100644 ] [[package]] --name = "core-foundation" --version = "0.6.4" +-name = "crossbeam-channel" +-version = "0.4.0" +name = "concurrent-queue" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3" dependencies = [ -- "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cache-padded", ] [[package]] --name = "core-foundation-sys" --version = "0.6.2" +-name = "crossbeam-deque" +-version = "0.7.2" +name = "const_fn" +version = "0.4.8" - source = "registry+https://github.com/rust-lang/crates.io-index" ++source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f92cfa0fd5690b3cf8c1ef2cabbd9b7ef22fa53cf5e1f92b05103f6d5d1cf6e7" - - [[package]] --name = "crossbeam-channel" --version = "0.3.9" ++ ++[[package]] +name = "cookie" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951" dependencies = [ -- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "aes-gcm", + "base64", + "hkdf", @@ -630,20 +641,17 @@ index d02cd43..7077d0e 100644 ] [[package]] --name = "crossbeam-channel" --version = "0.4.0" +-name = "crossbeam-epoch" +-version = "0.8.0" +name = "cpufeatures" -+version = "0.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" - dependencies = [ -- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef" ++dependencies = [ + "libc", - ] - - [[package]] --name = "crossbeam-deque" --version = "0.7.2" ++] ++ ++[[package]] +name = "cpuid-bool" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -651,22 +659,9 @@ index d02cd43..7077d0e 100644 + +[[package]] +name = "crossbeam-channel" -+version = "0.3.9" ++version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa" - dependencies = [ -- "crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.6.6", - ] - - [[package]] --name = "crossbeam-epoch" --version = "0.8.0" -+name = "crossbeam-utils" -+version = "0.6.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" ++checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" dependencies = [ - "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -674,55 +669,60 @@ index d02cd43..7077d0e 100644 - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.7.2", ++ "maybe-uninit", + ] + + [[package]] + name = "crossbeam-utils" +-version = "0.6.6" ++version = "0.7.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" + dependencies = [ +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 1.0.1", + "cfg-if 0.1.10", + "lazy_static", ] [[package]] --name = "crossbeam-queue" --version = "0.1.2" -+name = "crossbeam-utils" + name = "crossbeam-utils" +-version = "0.7.0" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" dependencies = [ -- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 1.0.0", + "lazy_static", ] [[package]] --name = "crossbeam-utils" --version = "0.6.6" -+name = "crypto-mac" + name = "crypto-mac" +-version = "0.7.0" +version = "0.10.1" - source = "registry+https://github.com/rust-lang/crates.io-index" ++source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++dependencies = [ + "generic-array", + "subtle", - ] - - [[package]] --name = "crossbeam-utils" --version = "0.7.0" ++] ++ ++[[package]] +name = "ctor" -+version = "0.1.21" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa" - dependencies = [ -- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++version = "0.1.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5e98e2ad1a782e33928b96fc3948e7c355e5af34ba4de7670fe8bac2a3b2006d" ++dependencies = [ + "quote", + "syn", - ] - - [[package]] --name = "crypto-mac" --version = "0.7.0" ++] ++ ++[[package]] +name = "ctr" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -740,7 +740,7 @@ index d02cd43..7077d0e 100644 source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "003cb79c1c6d1c93344c7e1201bb51c2148f24ec2bd9c253709d6b2efb796515" dependencies = [ -- "curl-sys 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", +- "curl-sys 0.4.31+curl-7.70.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", @@ -758,14 +758,14 @@ index d02cd43..7077d0e 100644 [[package]] name = "curl-sys" --version = "0.4.25" +-version = "0.4.31+curl-7.70.0" +version = "0.4.45+curl-7.78.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de9e5a72b1c744eb5dd20b2be4d7eb84625070bb5c4ab9b347b70464ab1e62eb" dependencies = [ - "cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "libnghttp2-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "libnghttp2-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", @@ -826,9 +826,9 @@ index d02cd43..7077d0e 100644 source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3" dependencies = [ -- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "proc-macro2 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2", + "quote", + "syn", @@ -857,18 +857,19 @@ index d02cd43..7077d0e 100644 + "generic-array", ] -+[[package]] + [[package]] +-name = "dtoa" +-version = "0.4.4" +name = "discard" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" + - [[package]] - name = "dtoa" --version = "0.4.4" -+version = "0.4.8" ++[[package]] ++name = "either" ++version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" ++checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "encoding_rs" @@ -899,67 +900,48 @@ index d02cd43..7077d0e 100644 + "termcolor", ] -+[[package]] + [[package]] +-name = "failure" +-version = "0.1.6" +name = "event-listener" +version = "2.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" -+ - [[package]] - name = "failure" --version = "0.1.6" -+version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" - dependencies = [ +-dependencies = [ - "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)", - "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "backtrace", -+ "failure_derive", - ] +-] ++checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" [[package]] - name = "failure_derive" +-name = "failure_derive" -version = "0.1.6" -+version = "0.1.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" - dependencies = [ -- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2", -+ "quote", -+ "syn", -+ "synstructure", - ] - - [[package]] --name = "fake-simd" --version = "0.1.2" --source = "registry+https://github.com/rust-lang/crates.io-index" -- --[[package]] --name = "fnv" --version = "1.0.6" --source = "registry+https://github.com/rust-lang/crates.io-index" -- --[[package]] --name = "foreign-types" --version = "0.3.2" +name = "fastrand" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b394ed3d285a429378d3b384b9eb1285267e7df4b166df24b7a6939a04dc392e" dependencies = [ -- "foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "proc-macro2 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", +- "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", + "instant", ] [[package]] --name = "foreign-types-shared" --version = "0.1.1" +-name = "fake-simd" +-version = "0.1.2" ++name = "field-offset" ++version = "0.3.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92" ++dependencies = [ ++ "memoffset", ++ "rustc_version 0.3.3", ++] + + [[package]] +-name = "fnv" +-version = "1.0.6" +name = "flume" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1020,209 +1002,157 @@ index d02cd43..7077d0e 100644 +checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] - name = "futures-channel" --version = "0.3.1" -+version = "0.3.17" + name = "futures" +-version = "0.3.4" ++version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888" ++checksum = "1adc00f486adfc9ce99f77d717836f0c5aa84965eb0b4f051f4e83f7cab53f8b" dependencies = [ -- "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "futures-core", - ] - - [[package]] - name = "futures-channel-preview" - version = "0.3.0-alpha.19" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d5e5f4df964fa9c1c2f8bddeb5c3611631cacd93baf810fc8bb2fb4b495c263a" - dependencies = [ -- "futures-core-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-sink-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -+ "futures-core-preview", -+ "futures-sink-preview", - ] - - [[package]] - name = "futures-core" --version = "0.3.1" -+version = "0.3.17" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d" - - [[package]] - name = "futures-core-preview" - version = "0.3.0-alpha.19" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b35b6263fb1ef523c3056565fa67b1d16f0a8604ff12b11b08c25f28a734c60a" - - [[package]] - name = "futures-executor" --version = "0.3.1" -+version = "0.3.17" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c" - dependencies = [ -- "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-executor 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-io 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-sink 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-task 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures-channel", + "futures-core", ++ "futures-executor", ++ "futures-io", ++ "futures-sink", + "futures-task", + "futures-util", ] [[package]] - name = "futures-executor-preview" - version = "0.3.0-alpha.19" + name = "futures-channel" +-version = "0.3.4" ++version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "75236e88bd9fe88e5e8bfcd175b665d0528fe03ca4c5207fabc028c8f9d93e98" ++checksum = "74ed2411805f6e4e3d9bc904c95d5d423b89b3b25dc0250aa74729de20629ff9" dependencies = [ -- "futures-core-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-util-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-sink 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures-core", ++ "futures-sink", + ] + + [[package]] + name = "futures-core" +-version = "0.3.4" ++version = "0.3.16" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99" + + [[package]] + name = "futures-executor" +-version = "0.3.4" ++version = "0.3.16" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4d0d535a57b87e1ae31437b892713aee90cd2d7b0ee48727cd11fc72ef54761c" + dependencies = [ +- "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-task 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "futures-core-preview", -+ "futures-util-preview", ++ "futures-core", ++ "futures-task", ++ "futures-util", + "num_cpus", ] [[package]] name = "futures-io" --version = "0.3.1" -+version = "0.3.17" +-version = "0.3.4" ++version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377" ++checksum = "0b0e06c393068f3a6ef246c75cdca793d6a46347e75286933e5e75fd2fd11582" [[package]] - name = "futures-io-preview" - version = "0.3.0-alpha.19" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f4914ae450db1921a56c91bde97a27846287d062087d4a652efc09bb3a01ebda" -+ -+[[package]] +-name = "futures-macro" +-version = "0.3.4" +name = "futures-lite" +version = "1.12.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" + source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" -+dependencies = [ + dependencies = [ +- "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "proc-macro2 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", + "fastrand", + "futures-core", + "futures-io", + "memchr", + "parking", -+ "pin-project-lite 0.2.7", ++ "pin-project-lite", + "waker-fn", -+] + ] [[package]] - name = "futures-macro" +-name = "futures-sink" -version = "0.3.4" -+version = "0.3.17" ++name = "futures-macro" ++version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb" - dependencies = [ -- "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ++checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57" ++dependencies = [ + "autocfg 1.0.1", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn", - ] - - [[package]] - name = "futures-preview" - version = "0.3.0-alpha.19" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3b1dce2a0267ada5c6ff75a8ba864b4e679a9e2aa44262af7a3b5516d530d76e" - dependencies = [ -- "futures-channel-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-core-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-executor-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-io-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-sink-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-util-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -+ "futures-channel-preview", -+ "futures-core-preview", -+ "futures-executor-preview", -+ "futures-io-preview", -+ "futures-sink-preview", -+ "futures-util-preview", - ] - - [[package]] --name = "futures-sink-preview" --version = "0.3.0-alpha.19" -+name = "futures-sink" -+version = "0.3.17" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11" ++] [[package]] -name = "futures-task" -version = "0.3.4" -+name = "futures-sink-preview" -+version = "0.3.0-alpha.19" ++name = "futures-sink" ++version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "86f148ef6b69f75bb610d4f9a2336d4fc88c4b5b67129d1a340dd0fd362efeec" ++checksum = "c0f30aaa67363d119812743aa5f33c201a7a66329f97d1a887022971feea4b53" [[package]] -name = "futures-timer" -version = "2.0.2" +name = "futures-task" -+version = "0.3.17" ++version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99" ++checksum = "bbe54a98670017f3be909561f6ad13e810d9a51f3f061b902062ca3da80799f2" [[package]] name = "futures-util" --version = "0.3.1" -+version = "0.3.17" +-version = "0.3.4" ++version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481" ++checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78" dependencies = [ -- "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-io 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-macro 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-sink 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-task 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 1.0.1", ++ "futures 0.1.31", ++ "futures-channel", + "futures-core", + "futures-io", + "futures-macro", ++ "futures-sink", + "futures-task", + "memchr", -+ "pin-project-lite 0.2.7", ++ "pin-project-lite", + "pin-utils", + "proc-macro-hack", + "proc-macro-nested", -+ "slab", - ] - - [[package]] - name = "futures-util-preview" - version = "0.3.0-alpha.19" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5ce968633c17e5f97936bd2797b6e38fb56cf16a7422319f7ec2e30d3c470e8d" - dependencies = [ -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-channel-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-core-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-io-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-sink-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "futures", -+ "futures-channel-preview", -+ "futures-core-preview", -+ "futures-io-preview", -+ "futures-sink-preview", -+ "memchr", -+ "pin-utils", + "slab", + "tokio-io", ] @@ -1236,9 +1166,9 @@ index d02cd43..7077d0e 100644 [[package]] name = "gdk" -version = "0.12.0" -+version = "0.12.1" ++version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fbe5e8772fc0865c52460cdd7a59d7d47700f44d9809d1dd00eecceb769a7589" ++checksum = "679e22651cd15888e7acd01767950edca2ee9fcd6421fbf5b3c3b420d4e88bb0" dependencies = [ - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cairo-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1254,23 +1184,20 @@ index d02cd43..7077d0e 100644 - "pango 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags", + "cairo-rs", -+ "cairo-sys-rs", + "gdk-pixbuf", + "gdk-sys", + "gio", -+ "gio-sys", + "glib", -+ "glib-sys", -+ "gobject-sys", + "libc", + "pango", ] [[package]] name = "gdk-pixbuf" - version = "0.8.0" +-version = "0.8.0" ++version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e248220c46b329b097d4b158d2717f8c688f16dd76d0399ace82b3e98062bdd7" ++checksum = "534192cb8f01daeb8fab2c8d4baa8f9aae5b7a39130525779f5c2608e235b10f" dependencies = [ - "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gio 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1281,36 +1208,35 @@ index d02cd43..7077d0e 100644 - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "gdk-pixbuf-sys", + "gio", -+ "gio-sys", + "glib", -+ "glib-sys", -+ "gobject-sys", + "libc", ] [[package]] name = "gdk-pixbuf-sys" - version = "0.9.1" +-version = "0.9.1" ++version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d8991b060a9e9161bafd09bf4a202e6fd404f5b4dd1a08d53a1e84256fb34ab0" ++checksum = "f097c0704201fbc8f69c1762dc58c6947c8bb188b8ed0bc7e65259f1894fe590" dependencies = [ - "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "gio-sys", -+ "glib-sys", -+ "gobject-sys", ++ "gio-sys 0.14.0", ++ "glib-sys 0.14.0", ++ "gobject-sys 0.14.0", + "libc", -+ "pkg-config", ++ "system-deps 3.2.0", ] [[package]] name = "gdk-sys" - version = "0.9.1" +-version = "0.9.1" ++version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6adf679e91d1bff0c06860287f80403e7db54c2d2424dce0a470023b56c88fbb" ++checksum = "0e091b3d3d6696949ac3b3fb3c62090e5bfd7bd6850bef5c3c5ea701de1b1f1e" dependencies = [ - "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1322,12 +1248,13 @@ index d02cd43..7077d0e 100644 - "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-sys-rs", + "gdk-pixbuf-sys", -+ "gio-sys", -+ "glib-sys", -+ "gobject-sys", ++ "gio-sys 0.14.0", ++ "glib-sys 0.14.0", ++ "gobject-sys 0.14.0", + "libc", + "pango-sys", + "pkg-config", ++ "system-deps 3.2.0", ] [[package]] @@ -1340,18 +1267,14 @@ index d02cd43..7077d0e 100644 - "typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "typenum", + "version_check", - ] - - [[package]] - name = "getrandom" --version = "0.1.13" ++] ++ ++[[package]] ++name = "getrandom" +version = "0.1.16" - source = "registry+https://github.com/rust-lang/crates.io-index" ++source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", @@ -1365,7 +1288,7 @@ index d02cd43..7077d0e 100644 +dependencies = [ + "cfg-if 1.0.0", + "libc", -+ "wasi 0.10.2+wasi-snapshot-preview1", ++ "wasi 0.10.0+wasi-snapshot-preview1", ] [[package]] @@ -1385,126 +1308,155 @@ index d02cd43..7077d0e 100644 version = "0.19.9" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e034c4ba5bb796730a6cc5eb0d654c16885006a7c3d6c6603581ed809434f153" - dependencies = [ -- "cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)", ++dependencies = [ + "cc", - ] - ++] ++ +[[package]] +name = "ghash" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97304e4cd182c3846f7575ced3890c53012ce534ad9114046b0a9e00bb30a375" -+dependencies = [ + dependencies = [ +- "cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)", + "opaque-debug", + "polyval", -+] -+ -+[[package]] -+name = "gimli" -+version = "0.25.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7" -+ + ] + [[package]] name = "gio" -version = "0.8.0" -+version = "0.8.1" ++version = "0.14.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "402a7057cd21d64bfa7ac027b344a7f50f677fb3308693df0e8c70fb55d29f0d" ++dependencies = [ ++ "bitflags", ++ "futures-channel", ++ "futures-core", ++ "futures-io", ++ "gio-sys 0.14.0", ++ "glib", ++ "libc", ++ "once_cell", ++ "thiserror", ++] ++ ++[[package]] ++name = "gio-sys" ++version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0cd10f9415cce39b53f8024bf39a21f84f8157afa52da53837b102e585a296a5" ++checksum = "5e24fb752f8f5d2cf6bbc2c606fd2bc989c81c5e2fe321ab974d54f8b6344eac" dependencies = [ - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-channel 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-io 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-io 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags", -+ "futures-channel", -+ "futures-core", -+ "futures-io", -+ "futures-util", -+ "gio-sys", -+ "glib", -+ "glib-sys", -+ "gobject-sys", -+ "lazy_static", ++ "glib-sys 0.10.1", ++ "gobject-sys 0.10.0", + "libc", ++ "system-deps 1.3.2", ++ "winapi", ] [[package]] name = "gio-sys" - version = "0.9.1" +-version = "0.9.1" ++version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4fad225242b9eae7ec8a063bb86974aca56885014672375e5775dc0ea3533911" ++checksum = "c0a41df66e57fcc287c4bcf74fc26b884f31901ea9792ec75607289b456f48fa" dependencies = [ - "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "glib-sys", -+ "gobject-sys", ++ "glib-sys 0.14.0", ++ "gobject-sys 0.14.0", + "libc", -+ "pkg-config", ++ "system-deps 3.2.0", ++ "winapi", ] [[package]] name = "glib" -version = "0.9.1" -+version = "0.9.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "40fb573a09841b6386ddf15fd4bc6655b4f5b106ca962f57ecaecde32a0061c0" - dependencies = [ -- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-channel 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-executor 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-task 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++version = "0.14.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a8fb802e3798d75b415bea8f016eed88d50106ce82f1274e80f31d80cfd4b056" ++dependencies = [ + "bitflags", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", -+ "futures-util", -+ "glib-sys", -+ "gobject-sys", -+ "lazy_static", ++ "glib-macros", ++ "glib-sys 0.14.0", ++ "gobject-sys 0.14.0", + "libc", ++ "once_cell", ++ "smallvec", ++] ++ ++[[package]] ++name = "glib-macros" ++version = "0.14.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2aad66361f66796bfc73f530c51ef123970eb895ffba991a234fcf7bea89e518" + dependencies = [ +- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-executor 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-task 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow", ++ "heck", ++ "proc-macro-crate", ++ "proc-macro-error", ++ "proc-macro2", ++ "quote", ++ "syn", ] [[package]] name = "glib-sys" - version = "0.9.1" +-version = "0.9.1" ++version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "95856f3802f446c05feffa5e24859fe6a183a7cb849c8449afc35c86b1e316e2" ++checksum = "c7e9b997a66e9a23d073f2b1abb4dbfc3925e0b8952f67efd8d9b6e168e4cdc1" dependencies = [ - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", + "libc", -+ "pkg-config", - ] - - [[package]] --name = "gobject-sys" --version = "0.9.1" ++ "system-deps 1.3.2", ++] ++ ++[[package]] ++name = "glib-sys" ++version = "0.14.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1c1d60554a212445e2a858e42a0e48cece1bd57b311a19a9468f70376cf554ae" ++dependencies = [ ++ "libc", ++ "system-deps 3.2.0", ++] ++ ++[[package]] +name = "gloo-timers" +version = "0.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" ++source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47204a46aaff920a1ea58b11d03dec6f704287d27561724a4631e450654a891f" - dependencies = [ -- "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", ++dependencies = [ + "futures-channel", + "futures-core", + "js-sys", @@ -1513,12 +1465,37 @@ index d02cd43..7077d0e 100644 ] [[package]] --name = "gtk" --version = "0.8.0" -+name = "gobject-sys" -+version = "0.9.1" + name = "gobject-sys" +-version = "0.9.1" ++version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "31d1a804f62034eccf370006ccaef3708a71c31d561fee88564abe71177553d9" ++checksum = "952133b60c318a62bf82ee75b93acc7e84028a093e06b9e27981c2b6fe68218c" + dependencies = [ +- "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib-sys 0.10.1", ++ "libc", ++ "system-deps 1.3.2", ++] ++ ++[[package]] ++name = "gobject-sys" ++version = "0.14.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aa92cae29759dae34ab5921d73fff5ad54b3d794ab842c117e36cafc7994c3f5" ++dependencies = [ ++ "glib-sys 0.14.0", ++ "libc", ++ "system-deps 3.2.0", + ] + + [[package]] + name = "gtk" +-version = "0.8.0" ++version = "0.14.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6603bb79ded6ac6f3bac203794383afa8b1d6a8656d34a93a88f0b22826cd46c" dependencies = [ - "atk 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1539,18 +1516,55 @@ index d02cd43..7077d0e 100644 - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "pango 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "glib-sys", ++ "atk", ++ "bitflags", ++ "cairo-rs", ++ "field-offset", ++ "futures-channel", ++ "gdk", ++ "gdk-pixbuf", ++ "gio", ++ "glib", ++ "gtk-sys", ++ "gtk3-macros", + "libc", ++ "once_cell", ++ "pango", + "pkg-config", ] [[package]] --name = "gtk-sys" --version = "0.9.2" -+name = "gtk" -+version = "0.8.1" + name = "gtk-macros" +-version = "0.2.0" ++version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ ++checksum = "da5bf7748fd4cd0b2490df8debcc911809dbcbee4ece9531b96c29a9c729de5a" + + [[package]] + name = "gtk-sys" +-version = "0.9.2" ++version = "0.14.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8c14c8d3da0545785a7c5a120345b3abb534010fb8ae0f2ef3f47c027fba303e" ++dependencies = [ ++ "atk-sys", ++ "cairo-sys-rs", ++ "gdk-pixbuf-sys", ++ "gdk-sys", ++ "gio-sys 0.14.0", ++ "glib-sys 0.14.0", ++ "gobject-sys 0.14.0", ++ "libc", ++ "pango-sys", ++ "system-deps 3.2.0", ++] ++ ++[[package]] ++name = "gtk3-macros" ++version = "0.14.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "21de1da96dc117443fb03c2e270b2d34b7de98d0a79a19bbb689476173745b79" + dependencies = [ - "atk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1561,60 +1575,13 @@ index d02cd43..7077d0e 100644 - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", -+checksum = "87e1e8d70290239c668594002d1b174fcc7d7ef5d26670ee141490ede8facf8f" -+dependencies = [ -+ "atk", -+ "bitflags", -+ "cairo-rs", -+ "cairo-sys-rs", -+ "cc", -+ "gdk", -+ "gdk-pixbuf", -+ "gdk-pixbuf-sys", -+ "gdk-sys", -+ "gio", -+ "gio-sys", -+ "glib", -+ "glib-sys", -+ "gobject-sys", -+ "gtk-sys", -+ "lazy_static", -+ "libc", -+ "pango", -+ "pango-sys", - ] - - [[package]] --name = "h2" --version = "0.2.0-alpha.3" -+name = "gtk-sys" -+version = "0.9.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "53def660c7b48b00b510c81ef2d2fbd3c570f1527081d8d7947f471513e1a4c1" - dependencies = [ -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-core-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-sink-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-util-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", -- "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-codec 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-sync 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "atk-sys", -+ "cairo-sys-rs", -+ "gdk-pixbuf-sys", -+ "gdk-sys", -+ "gio-sys", -+ "glib-sys", -+ "gobject-sys", -+ "libc", -+ "pango-sys", -+ "pkg-config", ++ "anyhow", ++ "heck", ++ "proc-macro-crate", ++ "proc-macro-error", ++ "proc-macro2", ++ "quote", ++ "syn", ] [[package]] @@ -1720,9 +1687,9 @@ index d02cd43..7077d0e 100644 - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "markup5ever 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "proc-macro2 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", + "log", + "mac", + "markup5ever 0.10.1", @@ -1746,34 +1713,48 @@ index d02cd43..7077d0e 100644 ] [[package]] --name = "http-body" --version = "0.2.0-alpha.3" -+name = "http" + name = "http" +-version = "0.2.1" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11" dependencies = [ -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bytes 1.1.0", +- "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bytes 1.0.1", + "fnv", + "itoa", ] [[package]] --name = "httparse" --version = "1.3.4" --source = "registry+https://github.com/rust-lang/crates.io-index" -- --[[package]] --name = "humantime" --version = "1.3.0" + name = "http-client" + version = "1.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bf86227a76b64ebd37d442853370f7177be4fd3ae6f9ff5c9e0349643e1cb332" ++dependencies = [ ++ "futures 0.3.16", ++ "http 0.1.21", ++ "isahc 0.8.2", ++ "js-sys", ++ "wasm-bindgen", ++ "wasm-bindgen-futures", ++ "web-sys", ++] ++ ++[[package]] +name = "http-client" +version = "6.5.1" - source = "registry+https://github.com/rust-lang/crates.io-index" ++source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea880b03c18a7e981d7fb3608b8904a98425d53c440758fcebf7d934aa56547c" dependencies = [ -- "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", +- "isahc 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "js-sys 0.3.37 (registry+https://github.com/rust-lang/crates.io-index)", +- "wasm-bindgen 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", +- "wasm-bindgen-futures 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "web-sys 0.3.37 (registry+https://github.com/rust-lang/crates.io-index)", + "async-std", + "async-trait", + "cfg-if 1.0.0", @@ -1781,38 +1762,14 @@ index d02cd43..7077d0e 100644 + "http-types", + "isahc 0.9.14", + "log", - ] - - [[package]] --name = "hyper" --version = "0.13.0-alpha.4" ++] ++ ++[[package]] +name = "http-types" +version = "2.12.0" - source = "registry+https://github.com/rust-lang/crates.io-index" ++source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad" - dependencies = [ -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-channel-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-core-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-util-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "h2 0.2.0-alpha.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", -- "http-body 0.2.0-alpha.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", -- "pin-project 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-executor 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-net 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-sync 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-timer 0.3.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "tower-make 0.3.0-alpha.2a (registry+https://github.com/rust-lang/crates.io-index)", -- "tower-service 0.3.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "want 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++dependencies = [ + "anyhow", + "async-channel", + "async-std", @@ -1820,27 +1777,22 @@ index d02cd43..7077d0e 100644 + "cookie", + "futures-lite", + "infer", -+ "pin-project-lite 0.2.7", ++ "pin-project-lite", + "rand 0.7.3", + "serde", + "serde_json", + "serde_qs", -+ "serde_urlencoded 0.7.0", ++ "serde_urlencoded", + "url", ] [[package]] --name = "hyper-tls" --version = "0.4.0-alpha.4" -+name = "humantime" -+version = "1.3.0" + name = "humantime" + version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" dependencies = [ -- "hyper 0.13.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-tls 0.3.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "quick-error", ] @@ -1864,23 +1816,18 @@ index d02cd43..7077d0e 100644 -version = "0.2.0" +name = "infer" +version = "0.2.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", --] ++source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" - - [[package]] --name = "indexmap" --version = "1.3.0" ++ ++[[package]] +name = "instant" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d" dependencies = [ -- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 1.0.0", ] @@ -1896,38 +1843,41 @@ index d02cd43..7077d0e 100644 [[package]] name = "isahc" - version = "0.7.6" + version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "17b77027f12e53ae59a379f7074259d32eb10867e6183388020e922832d9c3fb" ++checksum = "c45d8c41e6f0b5aa495fd2577e6068e100f57eb87c4b353b0dab20bb53a56035" dependencies = [ - "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "curl 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", -- "curl-sys 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-io-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-util-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", +- "curl-sys 0.4.31+curl-7.70.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-io 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "sluice 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "sluice 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "bytes 0.4.12", + "crossbeam-channel", -+ "crossbeam-utils 0.6.6", ++ "crossbeam-utils 0.7.2", + "curl", + "curl-sys", -+ "futures-io-preview", -+ "futures-util-preview", ++ "futures-channel", ++ "futures-io", ++ "futures-util", + "http 0.1.21", + "lazy_static", + "log", + "slab", -+ "sluice 0.4.2", -+] -+ -+[[package]] -+name = "isahc" ++ "sluice", + ] + + [[package]] + name = "isahc" +-version = "0.9.3" +version = "0.9.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2948a0ce43e2c2ef11d7edf6816508998d99e13badd1150be0914205df9388a" @@ -1936,17 +1886,45 @@ index d02cd43..7077d0e 100644 + "crossbeam-utils 0.8.5", + "curl", + "curl-sys", ++ "encoding_rs", + "flume", + "futures-lite", + "http 0.2.4", + "log", ++ "mime", + "once_cell", + "slab", -+ "sluice 0.5.5", ++ "sluice", + "tracing", + "tracing-futures", + "url", + "waker-fn", ++] ++ ++[[package]] ++name = "itertools" ++version = "0.10.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" + dependencies = [ +- "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "curl 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", +- "curl-sys 0.4.31+curl-7.70.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-io 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "http 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "mime 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", +- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "sluice 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "tracing 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", +- "tracing-futures 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "either", ] [[package]] @@ -1958,9 +1936,10 @@ index d02cd43..7077d0e 100644 [[package]] name = "javascriptcore-rs" - version = "0.9.0" +-version = "0.9.0" ++version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2104be353e5c19d587e25f36ecb6d59504b5573ad84b96b06650b0cc99d02784" ++checksum = "5ca9c7d1445bba2889672fbadc16c3d5007bfdcf0a15a18a3a50fe9fab2c7427" dependencies = [ - "glib 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "javascriptcore-rs-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1980,19 +1959,19 @@ index d02cd43..7077d0e 100644 [[package]] name = "js-sys" --version = "0.3.33" --source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "wasm-bindgen 0.2.56 (registry+https://github.com/rust-lang/crates.io-index)", +-version = "0.3.37" ++version = "0.3.53" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e4bf49d50e2961077d9c99f4b7997d770a1114f087c3c2e0069b36c13fc2979d" + dependencies = [ +- "wasm-bindgen 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "kernel32-sys" -version = "0.2.2" -+version = "0.3.53" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e4bf49d50e2961077d9c99f4b7997d770a1114f087c3c2e0069b36c13fc2979d" - dependencies = [ +-source = "registry+https://github.com/rust-lang/crates.io-index" +-dependencies = [ - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen", @@ -2018,15 +1997,16 @@ index d02cd43..7077d0e 100644 [[package]] name = "libc" -version = "0.2.66" -+version = "0.2.101" ++version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21" ++checksum = "a1fa8cddc8fbbee11227ef194b5317ed014b8acbf15139bd716a18ad3fe99ec5" [[package]] name = "libhandy" - version = "0.5.0" +-version = "0.5.0" ++version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2aa9f5620e4143358bcd645fe7d7d27b974ed9148cbdd490bc811813899afa07" ++checksum = "5bcf9c79ec810a62f442ffd568d2de233983dc91c160abee4949b67a647024ed" dependencies = [ - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2044,14 +2024,10 @@ index d02cd43..7077d0e 100644 - "pango 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags", + "gdk", -+ "gdk-sys", ++ "gdk-pixbuf", + "gio", -+ "gio-sys", + "glib", -+ "glib-sys", -+ "gobject-sys", + "gtk", -+ "gtk-sys", + "lazy_static", + "libc", + "libhandy-sys", @@ -2060,9 +2036,10 @@ index d02cd43..7077d0e 100644 [[package]] name = "libhandy-sys" - version = "0.5.0" +-version = "0.5.0" ++version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d707af842e918719b71af0ac6cf31d1843f6e8a4d1e9c733b998d8d482e60446" ++checksum = "1938b93a8f29417992c452b7f43e7eff8a9f8d25b7f0bc923ae9d75b50a9cde3" dependencies = [ - "gdk 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2074,21 +2051,21 @@ index d02cd43..7077d0e 100644 - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "gdk", ++ "gdk-pixbuf-sys", + "gdk-sys", -+ "gio", -+ "gio-sys", -+ "glib-sys", -+ "gobject-sys", ++ "gio-sys 0.14.0", ++ "glib-sys 0.14.0", ++ "gobject-sys 0.14.0", + "gtk-sys", + "libc", + "pango-sys", + "pkg-config", ++ "system-deps 3.2.0", ] [[package]] name = "libnghttp2-sys" --version = "0.1.2" +-version = "0.1.3" +version = "0.1.6+1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0af55541a8827e138d59ec9e5877fb6095ece63fb6f4da45e7491b4fbd262855" @@ -2157,9 +2134,9 @@ index d02cd43..7077d0e 100644 [[package]] name = "lock_api" -version = "0.3.2" -+version = "0.4.5" ++version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109" ++checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb" dependencies = [ - "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "scopeguard", @@ -2243,89 +2220,82 @@ index d02cd43..7077d0e 100644 [[package]] -name = "matches" -version = "0.1.8" -+name = "markup5ever_rcdom" -+version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f015da43bcd8d4f144559a3423f4591d69b8ce0652c905374da7205df336ae2b" -+dependencies = [ -+ "html5ever 0.25.1", -+ "markup5ever 0.10.1", -+ "tendril", -+ "xml5ever", -+] - - [[package]] --name = "maybe-uninit" --version = "2.0.0" -+name = "matches" -+version = "0.1.9" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - - [[package]] - name = "memchr" +-source = "registry+https://github.com/rust-lang/crates.io-index" +- +-[[package]] +-name = "memchr" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "memoffset" -version = "0.5.3" -+version = "2.4.1" ++name = "markup5ever_rcdom" ++version = "0.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f015da43bcd8d4f144559a3423f4591d69b8ce0652c905374da7205df336ae2b" + dependencies = [ +- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "html5ever 0.25.1", ++ "markup5ever 0.10.1", ++ "tendril", ++ "xml5ever", + ] + + [[package]] +-name = "migrations_internals" +-version = "1.4.0" ++name = "matches" ++version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ -- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "diesel 1.4.3 (registry+https://github.com/rust-lang/crates.io-index)", -] ++checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" + + [[package]] +-name = "migrations_macros" +-version = "1.4.1" ++name = "maybe-uninit" ++version = "2.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-dependencies = [ +- "migrations_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "proc-macro2 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", +-] ++checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" + + [[package]] +-name = "mime" +-version = "0.3.14" ++name = "memchr" ++version = "2.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" [[package]] - name = "migrations_internals" --version = "1.4.0" +-name = "mime_guess" +-version = "2.0.1" ++name = "memoffset" ++version = "0.6.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" + dependencies = [ +- "mime 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 1.0.1", + ] + + [[package]] +-name = "mio" +-version = "0.6.21" ++name = "migrations_internals" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b4fc84e4af020b837029e017966f86a1c2d5e83e64b589963d5047525995860" dependencies = [ -- "diesel 1.4.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "diesel", - ] - - [[package]] - name = "migrations_macros" --version = "1.4.1" -+version = "1.4.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9753f12909fd8d923f75ae5c3258cae1ed3c8ec052e1b38c93c21a6d157f789c" - dependencies = [ -- "migrations_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "migrations_internals", -+ "proc-macro2", -+ "quote", -+ "syn", - ] - - [[package]] - name = "mime" --version = "0.3.14" -+version = "0.3.16" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" - - [[package]] - name = "mime_guess" --version = "2.0.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "mime 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)", --] -- --[[package]] --name = "mio" --version = "0.6.21" --source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2337,79 +2307,60 @@ index d02cd43..7077d0e 100644 - "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", - "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", --] -- --[[package]] ++ "diesel", + ] + + [[package]] -name = "mio-uds" -version = "0.6.7" --source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ ++name = "migrations_macros" ++version = "1.4.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9753f12909fd8d923f75ae5c3258cae1ed3c8ec052e1b38c93c21a6d157f789c" + dependencies = [ - "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", --] -- --[[package]] ++ "migrations_internals", ++ "proc-macro2", ++ "quote", ++ "syn", + ] + + [[package]] -name = "miow" -version = "0.2.1" --source = "registry+https://github.com/rust-lang/crates.io-index" ++name = "mime" ++version = "0.3.16" + source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -] -- --[[package]] --name = "native-tls" --version = "0.2.3" ++checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" + + [[package]] +-name = "net2" +-version = "0.2.33" ++name = "mime_guess" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212" dependencies = [ -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)", -- "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", -- "schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", -- "security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "mime", + "unicase", ] - [[package]] --name = "net2" --version = "0.2.33" -+name = "miniz_oxide" -+version = "0.4.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "adler", -+ "autocfg 1.0.1", - ] - [[package]] name = "new_debug_unreachable" -version = "1.0.3" --source = "registry+https://github.com/rust-lang/crates.io-index" -- --[[package]] --name = "nom" --version = "4.2.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", --] +checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" [[package]] @@ -2436,9 +2387,9 @@ index d02cd43..7077d0e 100644 [[package]] name = "num-bigint" -version = "0.2.3" -+version = "0.3.3" ++version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5f6f7833f2cbf2360a6cfd58cd41a53aa7a90bd4c202f5b1c7dd2ed73c57b2c3" ++checksum = "7d0a3d5e207573f948a9e5376662aa743a2ea13f7c50a554d7af443a73fbfeba" dependencies = [ - "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2530,38 +2481,17 @@ index d02cd43..7077d0e 100644 ] [[package]] --name = "once_cell" + name = "once_cell" -version = "1.2.0" -+name = "object" -+version = "0.26.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "39f37e50073ccad23b6d09bcb5b263f4e76d3bb6038e4a3c08e52162ffa8abc2" -+dependencies = [ -+ "memchr", -+] - - [[package]] --name = "opaque-debug" --version = "0.2.3" -+name = "once_cell" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" [[package]] --name = "openssl" --version = "0.10.26" -+name = "opaque-debug" + name = "opaque-debug" +-version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", --] +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] @@ -2592,9 +2522,10 @@ index d02cd43..7077d0e 100644 [[package]] name = "pango" - version = "0.8.0" +-version = "0.8.0" ++version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1e9c6b728f1be8edb5f9f981420b651d5ea30bdb9de89f1f1262d0084a020577" ++checksum = "e1fc88307d9797976ea62722ff2ec5de3fae279c6e20100ed3f49ca1a4bf3f96" dependencies = [ - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2605,48 +2536,40 @@ index d02cd43..7077d0e 100644 - "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags", + "glib", -+ "glib-sys", -+ "gobject-sys", -+ "lazy_static", + "libc", ++ "once_cell", + "pango-sys", ] [[package]] name = "pango-sys" - version = "0.9.1" +-version = "0.9.1" ++version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "86b93d84907b3cf0819bff8f13598ba72843bee579d5ebc2502e4b0367b4be7d" ++checksum = "2367099ca5e761546ba1d501955079f097caa186bb53ce0f718dca99ac1942fe" dependencies = [ - "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "glib-sys", -+ "gobject-sys", ++ "glib-sys 0.14.0", ++ "gobject-sys 0.14.0", + "libc", -+ "pkg-config", ++ "system-deps 3.2.0", ] - [[package]] --name = "parking_lot" --version = "0.9.0" ++[[package]] +name = "parking" +version = "2.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "lock_api 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", --] ++source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" - ++ [[package]] name = "parking_lot" -version = "0.10.0" -+version = "0.11.2" ++version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" ++checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" dependencies = [ - "lock_api 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot_core 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2657,17 +2580,16 @@ index d02cd43..7077d0e 100644 [[package]] name = "parking_lot_core" --version = "0.6.2" -+version = "0.8.5" +-version = "0.7.0" ++version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" ++checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", +- "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 1.0.0", + "instant", @@ -2678,64 +2600,60 @@ index d02cd43..7077d0e 100644 ] [[package]] --name = "parking_lot_core" --version = "0.7.0" -+name = "percent-encoding" + name = "percent-encoding" +-version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", -- "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", --] +checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] -name = "percent-encoding" --version = "1.0.1" -+name = "phf" -+version = "0.7.24" +-version = "2.1.0" ++name = "pest" ++version = "2.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" ++dependencies = [ ++ "ucd-trie", ++] + + [[package]] + name = "phf" + version = "0.7.24" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" +dependencies = [ + "phf_shared 0.7.24", +] - - [[package]] --name = "percent-encoding" --version = "2.1.0" ++ ++[[package]] +name = "phf" +version = "0.8.0" - source = "registry+https://github.com/rust-lang/crates.io-index" ++source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" -+dependencies = [ -+ "phf_shared 0.8.0", -+] - - [[package]] --name = "phf" -+name = "phf_codegen" - version = "0.7.24" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" dependencies = [ - "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", -+ "phf_generator 0.7.24", -+ "phf_shared 0.7.24", ++ "phf_shared 0.8.0", ] [[package]] name = "phf_codegen" --version = "0.7.24" -+version = "0.8.0" + version = "0.7.24" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" ++checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" dependencies = [ - "phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "phf_generator 0.7.24", ++ "phf_shared 0.7.24", ++] ++ ++[[package]] ++name = "phf_codegen" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" ++dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", ] @@ -2745,7 +2663,9 @@ index d02cd43..7077d0e 100644 version = "0.7.24" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" -+dependencies = [ + dependencies = [ +- "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.24", + "rand 0.6.5", +] @@ -2755,9 +2675,7 @@ index d02cd43..7077d0e 100644 +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" - dependencies = [ -- "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++dependencies = [ + "phf_shared 0.8.0", + "rand 0.7.3", ] @@ -2778,30 +2696,30 @@ index d02cd43..7077d0e 100644 +checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" dependencies = [ - "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "siphasher 0.3.7", ++ "siphasher 0.3.6", ] [[package]] name = "pin-project" --version = "0.4.6" +-version = "0.4.17" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08" dependencies = [ -- "pin-project-internal 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "pin-project-internal 0.4.17 (registry+https://github.com/rust-lang/crates.io-index)", + "pin-project-internal", ] [[package]] name = "pin-project-internal" --version = "0.4.6" +-version = "0.4.17" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389" dependencies = [ -- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "proc-macro2 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2", + "quote", + "syn", @@ -2810,12 +2728,6 @@ index d02cd43..7077d0e 100644 [[package]] name = "pin-project-lite" -version = "0.1.1" -+version = "0.1.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" -+ -+[[package]] -+name = "pin-project-lite" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" @@ -2857,12 +2769,11 @@ index d02cd43..7077d0e 100644 + "opaque-debug", + "universal-hash", +] - - [[package]] - name = "ppv-lite86" --version = "0.2.6" ++ ++[[package]] ++name = "ppv-lite86" +version = "0.2.10" - source = "registry+https://github.com/rust-lang/crates.io-index" ++source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" [[package]] @@ -2886,100 +2797,135 @@ index d02cd43..7077d0e 100644 ] [[package]] - name = "proc-macro-hack" +-name = "proc-macro-hack" -version = "0.5.11" ++name = "proc-macro-crate" ++version = "1.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "41fdbd1df62156fbc5945f4762632564d7d038153091c3fcf1067f6aef7cff92" + dependencies = [ +- "proc-macro2 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thiserror", ++ "toml", + ] + + [[package]] +-name = "proc-macro-nested" +-version = "0.1.3" ++name = "proc-macro-error" ++version = "1.0.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" ++dependencies = [ ++ "proc-macro-error-attr", ++ "proc-macro2", ++ "quote", ++ "syn", ++ "version_check", ++] + + [[package]] +-name = "proc-macro2" +-version = "0.4.30" ++name = "proc-macro-error-attr" ++version = "1.0.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" + dependencies = [ +- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2", ++ "quote", ++ "version_check", + ] + + [[package]] +-name = "proc-macro2" +-version = "1.0.17" ++name = "proc-macro-hack" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ -- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -] +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] - name = "proc-macro-nested" --version = "0.1.3" --source = "registry+https://github.com/rust-lang/crates.io-index" -- --[[package]] --name = "proc-macro2" --version = "0.4.30" --source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", --] +-name = "quick-error" +-version = "1.2.2" ++name = "proc-macro-nested" +version = "0.1.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" + source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" [[package]] - name = "proc-macro2" --version = "1.0.6" -+version = "1.0.29" +-name = "quote" +-version = "0.6.13" ++name = "proc-macro2" ++version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d" ++checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612" dependencies = [ -- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid", ] - [[package]] - name = "quick-error" --version = "1.2.2" ++[[package]] ++name = "quick-error" +version = "1.2.3" - source = "registry+https://github.com/rust-lang/crates.io-index" ++source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - ++ [[package]] name = "quote" --version = "0.6.13" +-version = "1.0.2" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" dependencies = [ -- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", +- "proc-macro2 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2", ] [[package]] --name = "quote" --version = "1.0.2" -+name = "r2d2" + name = "r2d2" +-version = "0.8.7" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "545c5bc2b880973c9c10e4067418407a0ccaa3091781d1671d46eb35107cb26f" dependencies = [ -- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "scheduled-thread-pool 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "log", + "parking_lot", + "scheduled-thread-pool", ] [[package]] --name = "r2d2" --version = "0.8.7" -+name = "rand" -+version = "0.3.23" + name = "rand" + version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" dependencies = [ -- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "scheduled-thread-pool 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "libc", + "rand 0.4.6", ] [[package]] name = "rand" --version = "0.3.23" -+version = "0.4.6" + version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" dependencies = [ +- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "fuchsia-cprng", + "libc", + "rand_core 0.3.1", @@ -2989,16 +2935,10 @@ index d02cd43..7077d0e 100644 [[package]] name = "rand" --version = "0.4.6" -+version = "0.6.5" + version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" - dependencies = [ -- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++dependencies = [ + "autocfg 0.1.7", + "libc", + "rand_chacha 0.1.1", @@ -3010,14 +2950,84 @@ index d02cd43..7077d0e 100644 + "rand_pcg 0.1.2", + "rand_xorshift", + "winapi", - ] - - [[package]] - name = "rand" --version = "0.6.5" ++] ++ ++[[package]] ++name = "rand" +version = "0.7.3" - source = "registry+https://github.com/rust-lang/crates.io-index" ++source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" ++dependencies = [ ++ "getrandom 0.1.16", ++ "libc", ++ "rand_chacha 0.2.2", ++ "rand_core 0.5.1", ++ "rand_hc 0.2.0", ++ "rand_pcg 0.2.1", ++] ++ ++[[package]] ++name = "rand" ++version = "0.8.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" ++dependencies = [ ++ "libc", ++ "rand_chacha 0.3.1", ++ "rand_core 0.6.3", ++ "rand_hc 0.3.1", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" ++dependencies = [ ++ "autocfg 0.1.7", ++ "rand_core 0.3.1", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" ++dependencies = [ ++ "ppv-lite86", ++ "rand_core 0.5.1", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" ++dependencies = [ ++ "ppv-lite86", ++ "rand_core 0.6.3", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" ++dependencies = [ ++ "rand_core 0.4.2", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" ++ ++[[package]] ++name = "rand_core" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" dependencies = [ - "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3031,127 +3041,52 @@ index d02cd43..7077d0e 100644 - "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "getrandom 0.1.16", -+ "libc", -+ "rand_chacha 0.2.2", -+ "rand_core 0.5.1", -+ "rand_hc 0.2.0", -+ "rand_pcg 0.2.1", ] [[package]] - name = "rand" --version = "0.7.2" -+version = "0.8.4" +-name = "rand_chacha" +-version = "0.1.1" ++name = "rand_core" ++version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" - dependencies = [ -- "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", -+ "rand_chacha 0.3.1", -+ "rand_core 0.6.3", -+ "rand_hc 0.3.1", - ] - - [[package]] - name = "rand_chacha" - version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" ++checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ - "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 0.1.7", -+ "rand_core 0.3.1", - ] - - [[package]] - name = "rand_chacha" --version = "0.2.1" -+version = "0.2.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" - dependencies = [ -- "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "ppv-lite86", -+ "rand_core 0.5.1", -+] -+ -+[[package]] -+name = "rand_chacha" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -+dependencies = [ -+ "ppv-lite86", -+ "rand_core 0.6.3", - ] - - [[package]] - name = "rand_core" - version = "0.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" - dependencies = [ -- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.2", - ] - - [[package]] - name = "rand_core" - version = "0.4.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - - [[package]] - name = "rand_core" - version = "0.5.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -+dependencies = [ -+ "getrandom 0.1.16", -+] -+ -+[[package]] -+name = "rand_core" -+version = "0.6.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" - dependencies = [ -- "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", + "getrandom 0.2.3", ] [[package]] - name = "rand_hc" - version = "0.1.0" +-name = "rand_core" +-version = "0.3.1" ++name = "rand_hc" ++version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" dependencies = [ -- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.3.1", ] [[package]] - name = "rand_hc" - version = "0.2.0" +-name = "rand_core" +-version = "0.4.2" ++name = "rand_hc" ++version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] -+ -+[[package]] -+name = "rand_hc" + + [[package]] + name = "rand_hc" +-version = "0.1.0" +version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" + source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" dependencies = [ -- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.6.3", ] @@ -3204,7 +3139,9 @@ index d02cd43..7077d0e 100644 version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" -+dependencies = [ + dependencies = [ +- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.7", + "rand_core 0.4.2", +] @@ -3214,9 +3151,7 @@ index d02cd43..7077d0e 100644 +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" - dependencies = [ -- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++dependencies = [ + "rand_core 0.5.1", ] @@ -3244,19 +3179,23 @@ index d02cd43..7077d0e 100644 name = "read-it-later" version = "0.0.2" dependencies = [ +- "anyhow 1.0.31 (registry+https://github.com/rust-lang/crates.io-index)", - "async-std 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cairo-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", - "diesel 1.4.3 (registry+https://github.com/rust-lang/crates.io-index)", - "diesel_migrations 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk-pixbuf 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gettext-rs 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "gio 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gtk 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "gtk-macros 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "html2pango 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "http-client 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "isahc 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libhandy 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3270,27 +3209,30 @@ index d02cd43..7077d0e 100644 - "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", - "strum 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", - "strum_macros 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "surf 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", - "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "wallabag-api 0.1.2 (git+https://github.com/swalladge/wallabag-api.git?rev=71a77358d7d573102894af591ca082175a6a8a93)", +- "wallabag-api 0.3.0 (git+https://github.com/swalladge/wallabag-api.git?rev=d2bbebbe76f44edc074e3b2f5313bb8861b6cbe4)", - "webkit2gtk 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow", + "async-std", + "cairo-rs", + "chrono", + "diesel", + "diesel_migrations", -+ "failure", ++ "futures 0.3.16", + "gdk", + "gdk-pixbuf", + "gettext-rs", + "gio", + "glib", + "gtk", ++ "gtk-macros", + "html2pango", ++ "http-client 1.1.1", ++ "isahc 0.9.14", + "lazy_static", + "libhandy", + "log", ++ "once_cell", + "pretty_env_logger", + "regex", + "rust-crypto", @@ -3299,10 +3241,8 @@ index d02cd43..7077d0e 100644 + "serde", + "serde_derive", + "serde_json", -+ "strum", -+ "strum_macros", -+ "surf 1.0.3", -+ "tokio", ++ "strum 0.16.0", ++ "strum_macros 0.16.0", + "url", + "wallabag-api", + "webkit2gtk", @@ -3311,77 +3251,34 @@ index d02cd43..7077d0e 100644 [[package]] name = "redox_syscall" -version = "0.1.56" --source = "registry+https://github.com/rust-lang/crates.io-index" -- --[[package]] --name = "regex" --version = "1.3.1" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" ++dependencies = [ ++ "bitflags", ++] + + [[package]] + name = "regex" +-version = "1.3.1" ++version = "1.5.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" dependencies = [ - "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", - "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags", - ] - - [[package]] --name = "regex-syntax" --version = "0.6.12" --source = "registry+https://github.com/rust-lang/crates.io-index" -- --[[package]] --name = "remove_dir_all" --version = "0.5.2" -+name = "regex" -+version = "1.5.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" - dependencies = [ -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "aho-corasick", + "memchr", + "regex-syntax", ] [[package]] --name = "reqwest" --version = "0.10.0-alpha.1" -+name = "regex-syntax" + name = "regex-syntax" +-version = "0.6.12" +version = "0.6.25" source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-core-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-util-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", -- "http-body 0.2.0-alpha.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "hyper 0.13.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "hyper-tls 0.4.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "js-sys 0.3.33 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "mime 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", -- "mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-executor 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-tls 0.3.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "wasm-bindgen 0.2.56 (registry+https://github.com/rust-lang/crates.io-index)", -- "wasm-bindgen-futures 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)", -- "web-sys 0.3.33 (registry+https://github.com/rust-lang/crates.io-index)", -- "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", --] +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" [[package]] @@ -3399,16 +3296,14 @@ index d02cd43..7077d0e 100644 + "libc", + "rand 0.3.23", + "rustc-serialize", -+ "time 0.1.43", ++ "time 0.1.44", ] - [[package]] - name = "rustc-demangle" +-[[package]] +-name = "rustc-demangle" -version = "0.1.16" -+version = "0.1.21" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" - +-source = "registry+https://github.com/rust-lang/crates.io-index" +- [[package]] name = "rustc-serialize" version = "0.3.24" @@ -3420,9 +3315,18 @@ index d02cd43..7077d0e 100644 version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" ++dependencies = [ ++ "semver 0.9.0", ++] ++ ++[[package]] ++name = "rustc_version" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" dependencies = [ - "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "semver", ++ "semver 0.11.0", ] [[package]] @@ -3480,8 +3384,10 @@ index d02cd43..7077d0e 100644 [[package]] name = "secret-service" -version = "1.0.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ ++version = "1.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d752040301c251d653aa740dec847e95767ce312cfc469bee85eb13cbf81d8a" + dependencies = [ - "aes 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "block-modes 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "dbus 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3490,27 +3396,6 @@ index d02cd43..7077d0e 100644 - "num 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", - "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", --] -- --[[package]] --name = "security-framework" --version = "0.3.4" --source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", --] -- --[[package]] --name = "security-framework-sys" --version = "0.3.3" -+version = "1.1.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6d752040301c251d653aa740dec847e95767ce312cfc469bee85eb13cbf81d8a" - dependencies = [ -- "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "aes", + "block-modes", + "dbus", @@ -3526,9 +3411,18 @@ index d02cd43..7077d0e 100644 version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" ++dependencies = [ ++ "semver-parser 0.7.0", ++] ++ ++[[package]] ++name = "semver" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" dependencies = [ - "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "semver-parser", ++ "semver-parser 0.10.2", ] [[package]] @@ -3536,13 +3430,22 @@ index d02cd43..7077d0e 100644 version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" ++ ++[[package]] ++name = "semver-parser" ++version = "0.10.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" ++dependencies = [ ++ "pest", ++] [[package]] name = "serde" -version = "1.0.104" -+version = "1.0.130" ++version = "1.0.129" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" ++checksum = "d1f72836d2aa753853178eda473a3b9d8e4eefdaf20523b919677e6de489f8f1" dependencies = [ - "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive", @@ -3551,13 +3454,13 @@ index d02cd43..7077d0e 100644 [[package]] name = "serde_derive" -version = "1.0.104" -+version = "1.0.130" ++version = "1.0.129" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" ++checksum = "e57ae87ad533d9a56427558b516d0adac283614e347abf85b0dc0cbbf0a249f3" dependencies = [ -- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "proc-macro2 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2", + "quote", + "syn", @@ -3566,9 +3469,9 @@ index d02cd43..7077d0e 100644 [[package]] name = "serde_json" -version = "1.0.44" -+version = "1.0.67" ++version = "1.0.66" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a7f9e390c27c3c0ce8bc5d725f6e4d30a29d26659494aa4b17535f7522c5c950" ++checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127" +dependencies = [ + "itoa", + "ryu", @@ -3591,20 +3494,9 @@ index d02cd43..7077d0e 100644 [[package]] name = "serde_urlencoded" - version = "0.6.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" -+dependencies = [ -+ "dtoa", -+ "itoa", -+ "serde", -+ "url", -+] -+ -+[[package]] -+name = "serde_urlencoded" +-version = "0.6.1" +version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" + source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" dependencies = [ - "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3626,9 +3518,9 @@ index d02cd43..7077d0e 100644 [[package]] name = "sha2" -version = "0.8.0" -+version = "0.9.6" ++version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9204c41a1597a8c5af23c82d1c921cb01ec0a4c59e07a9c7306062829a3903f3" ++checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12" dependencies = [ - "block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3649,9 +3541,9 @@ index d02cd43..7077d0e 100644 + +[[package]] +name = "siphasher" -+version = "0.3.7" ++version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "533494a8f9b724d33625ab53c6c4800f7cc445895924a8ef649222dcb76e938b" ++checksum = "729a25c17d72b06c68cb47955d44fda88ad2d3e7d77e025663fdd69b93dd71a1" [[package]] name = "slab" @@ -3662,27 +3554,15 @@ index d02cd43..7077d0e 100644 [[package]] name = "sluice" - version = "0.4.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0a7d06dfb3e8743bc19e6de8a302277471d08077d68946b307280496dc5a3531" - dependencies = [ -- "futures-channel-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-core-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-io-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -+ "futures-channel-preview", -+ "futures-core-preview", -+ "futures-io-preview", - ] - - [[package]] --name = "smallvec" --version = "0.6.13" -+name = "sluice" +-version = "0.5.2" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5" dependencies = [ -- "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-io 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "async-channel", + "futures-core", + "futures-io", @@ -3712,9 +3592,43 @@ index d02cd43..7077d0e 100644 [[package]] name = "soup-sys" - version = "0.9.0" +-version = "0.9.0" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3c7adf08565630bbb71f955f11f8a68464817ded2703a3549747c235b58a13e" ++dependencies = [ ++ "bitflags", ++ "gio-sys 0.10.1", ++ "glib-sys 0.10.1", ++ "gobject-sys 0.10.0", ++ "libc", ++ "pkg-config", ++ "system-deps 1.3.2", ++] ++ ++[[package]] ++name = "spinning_top" ++version = "0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "75adad84ee84b521fb2cca2d4fd0f1dab1d8d026bda3c5bea4ca63b5f9f9293c" ++dependencies = [ ++ "lock_api", ++] ++ ++[[package]] ++name = "standback" ++version = "0.2.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" ++dependencies = [ ++ "version_check", ++] ++ ++[[package]] ++name = "stdweb" ++version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "48a2f246b51c81d4baa1ce611240c2f6e0323ae75f3b6cc9d2d2911e0567962c" ++checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" dependencies = [ - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3722,86 +3636,31 @@ index d02cd43..7077d0e 100644 - "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags", -+ "gio-sys", -+ "glib-sys", -+ "gobject-sys", -+ "libc", -+ "pkg-config", - ] - - [[package]] --name = "sourcefile" --version = "0.1.4" -+name = "spinning_top" -+version = "0.2.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "75adad84ee84b521fb2cca2d4fd0f1dab1d8d026bda3c5bea4ca63b5f9f9293c" -+dependencies = [ -+ "lock_api", -+] - - [[package]] --name = "string" --version = "0.2.1" -+name = "standback" -+version = "0.2.17" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" - dependencies = [ -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "version_check", - ] - - [[package]] --name = "string_cache" --version = "0.7.5" -+name = "stdweb" -+version = "0.4.20" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" - dependencies = [ -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "new_debug_unreachable 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", -- "precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -- "string_cache_codegen 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "discard", -+ "rustc_version", ++ "rustc_version 0.2.3", + "stdweb-derive", + "stdweb-internal-macros", + "stdweb-internal-runtime", + "wasm-bindgen", ] - [[package]] --name = "string_cache_codegen" --version = "0.4.4" ++[[package]] +name = "stdweb-derive" +version = "0.5.3" - source = "registry+https://github.com/rust-lang/crates.io-index" ++source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" - dependencies = [ -- "phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", -- "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", -- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++dependencies = [ + "proc-macro2", + "quote", + "serde", + "serde_derive", + "syn", - ] - - [[package]] --name = "string_cache_shared" --version = "0.3.0" ++] ++ ++[[package]] +name = "stdweb-internal-macros" +version = "0.2.9" - source = "registry+https://github.com/rust-lang/crates.io-index" ++source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" +dependencies = [ + "base-x", @@ -3813,27 +3672,19 @@ index d02cd43..7077d0e 100644 + "sha1", + "syn", +] - - [[package]] --name = "strum" --version = "0.16.0" ++ ++[[package]] +name = "stdweb-internal-runtime" +version = "0.1.5" - source = "registry+https://github.com/rust-lang/crates.io-index" ++source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - ++ [[package]] --name = "strum_macros" --version = "0.16.0" -+name = "string_cache" -+version = "0.7.5" + name = "string_cache" + version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89c058a82f9fd69b1becf8c274f412281038877c553182f1d02eb027045a2d67" - dependencies = [ -- "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ++dependencies = [ + "lazy_static", + "new_debug_unreachable", + "phf_shared 0.7.24", @@ -3841,63 +3692,52 @@ index d02cd43..7077d0e 100644 + "serde", + "string_cache_codegen 0.4.4", + "string_cache_shared", - ] - - [[package]] --name = "subtle" --version = "1.0.0" ++] ++ ++[[package]] +name = "string_cache" +version = "0.8.1" - source = "registry+https://github.com/rust-lang/crates.io-index" ++source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ddb1139b5353f96e429e1a5e19fbaf663bddedaa06d1dbd49f82e352601209a" -+dependencies = [ + dependencies = [ +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "new_debug_unreachable 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", +- "precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", +- "string_cache_codegen 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static", + "new_debug_unreachable", + "phf_shared 0.8.0", + "precomputed-hash", + "serde", -+] + ] [[package]] --name = "surf" --version = "1.0.3" -+name = "string_cache_codegen" -+version = "0.4.4" + name = "string_cache_codegen" + version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f45ed1b65bf9a4bf2f7b7dc59212d1926e9eaf00fa998988e420fd124467c6" - dependencies = [ -- "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", -- "isahc 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "js-sys 0.3.33 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "mime 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", -- "mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "wasm-bindgen 0.2.56 (registry+https://github.com/rust-lang/crates.io-index)", -- "wasm-bindgen-futures 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)", -- "web-sys 0.3.33 (registry+https://github.com/rust-lang/crates.io-index)", ++dependencies = [ + "phf_generator 0.7.24", + "phf_shared 0.7.24", + "proc-macro2", + "quote", + "string_cache_shared", - ] - - [[package]] --name = "syn" --version = "0.15.44" ++] ++ ++[[package]] +name = "string_cache_codegen" +version = "0.5.1" - source = "registry+https://github.com/rust-lang/crates.io-index" ++source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f24c8e5e19d22a726626f1a5e16fe15b132dcf21d10177fa5a45ce7962996b97" dependencies = [ -- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", +- "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", +- "proc-macro2 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_generator 0.8.0", + "phf_shared 0.8.0", + "proc-macro2", @@ -3905,46 +3745,63 @@ index d02cd43..7077d0e 100644 ] [[package]] --name = "syn" --version = "1.0.11" -+name = "string_cache_shared" -+version = "0.3.0" + name = "string_cache_shared" + version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", --] +checksum = "b1884d1bc09741d466d9b14e6d37ac89d6909cbcac41dd9ae982d4d063bbedfc" [[package]] --name = "synstructure" --version = "0.12.3" -+name = "strum" -+version = "0.16.0" + name = "strum" + version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", --] +checksum = "6138f8f88a16d90134763314e3fc76fa3ed6a7db4725d6acf9a3ef95a3188d22" ++ ++[[package]] ++name = "strum" ++version = "0.18.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b" ++ ++[[package]] ++name = "strum" ++version = "0.21.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2" [[package]] --name = "tempfile" --version = "3.1.0" -+name = "strum_macros" -+version = "0.16.0" + name = "strum_macros" + version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0054a7df764039a6cd8592b9de84be4bec368ff081d203a7d5371cbfa8e65c81" ++dependencies = [ ++ "heck", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "strum_macros" ++version = "0.18.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c" ++dependencies = [ ++ "heck", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "strum_macros" ++version = "0.21.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec" dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", -- "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "proc-macro2 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", + "heck", + "proc-macro2", + "quote", @@ -3952,213 +3809,178 @@ index d02cd43..7077d0e 100644 ] [[package]] --name = "tendril" --version = "0.4.1" -+name = "subtle" + name = "subtle" +-version = "1.0.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "futf 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "utf-8 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", --] +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] --name = "termcolor" --version = "1.0.5" -+name = "surf" -+version = "1.0.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "741a8008f8a833ef16f47df94a30754478fb2c2bf822b9c2e6f7f09203b97ace" - dependencies = [ -- "wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "futures-preview", -+ "http 0.1.21", -+ "isahc 0.7.6", -+ "js-sys", -+ "log", -+ "mime", -+ "mime_guess", -+ "serde", -+ "serde_json", -+ "serde_urlencoded 0.6.1", -+ "url", -+ "wasm-bindgen", -+ "wasm-bindgen-futures 0.3.27", -+ "web-sys", - ] - - [[package]] --name = "thread_local" --version = "0.3.6" -+name = "surf" + name = "surf" +-version = "2.0.0-alpha.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73f856d60bdb4679fc9ec516c34093484e963431b5016a8429f85a8e74b5ccaa" dependencies = [ -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", +- "http-client 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "isahc 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "js-sys 0.3.37 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "mime 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", +- "mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "wasm-bindgen 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", +- "wasm-bindgen-futures 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "web-sys 0.3.37 (registry+https://github.com/rust-lang/crates.io-index)", + "async-std", + "async-trait", + "cfg-if 1.0.0", + "encoding_rs", + "futures-util", + "getrandom 0.2.3", -+ "http-client", ++ "http-client 6.5.1", + "http-types", + "log", + "mime_guess", + "once_cell", -+ "pin-project-lite 0.2.7", ++ "pin-project-lite", + "serde", + "serde_json", + "web-sys", ] [[package]] --name = "time" --version = "0.1.42" -+name = "syn" -+version = "1.0.76" + name = "syn" +-version = "0.15.44" ++version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c6f107db402c2c2055242dbf4d2af0e69197202e9faacbef9571bbe47f5a1b84" ++checksum = "b7f58f7e8eaa0009c5fec437aabf511bd9933e4b2d7407bd05273c01a8906ea7" dependencies = [ -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2", + "quote", + "unicode-xid", ] [[package]] --name = "tokio" --version = "0.2.0-alpha.6" -+name = "synstructure" -+version = "0.12.5" +-name = "syn" +-version = "1.0.25" ++name = "system-deps" ++version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "474aaa926faa1603c40b7885a9eaea29b444d1cb2850cb7c0e37bb1a4182f4fa" ++checksum = "0f3ecc17269a19353b3558b313bba738b25d82993e30d62a18406a24aba4649b" dependencies = [ -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-core-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-sink-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-util-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-codec 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-executor 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-fs 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-macros 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-net 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-sync 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-timer 0.3.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "tracing-core 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2", -+ "quote", -+ "syn", -+ "unicode-xid", +- "proc-macro2 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "heck", ++ "pkg-config", ++ "strum 0.18.0", ++ "strum_macros 0.18.0", ++ "thiserror", ++ "toml", ++ "version-compare 0.0.10", ] [[package]] --name = "tokio-codec" --version = "0.2.0-alpha.6" -+name = "tendril" +-name = "synstructure" +-version = "0.12.3" ++name = "system-deps" ++version = "3.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "480c269f870722b3b08d2f13053ce0c2ab722839f472863c3e2d61ff3a1c2fa6" + dependencies = [ +- "proc-macro2 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow", ++ "cfg-expr", ++ "heck", ++ "itertools", ++ "pkg-config", ++ "strum 0.21.0", ++ "strum_macros 0.21.1", ++ "thiserror", ++ "toml", ++ "version-compare 0.0.11", + ] + + [[package]] + name = "tendril" +-version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9ef557cb397a4f0a5a3a628f06515f78563f2209e64d47055d9dc6052bf5e33" dependencies = [ -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-core-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-sink-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "futf 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "utf-8 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", + "futf", + "mac", + "utf-8", ] [[package]] --name = "tokio-executor" --version = "0.2.0-alpha.6" -+name = "termcolor" + name = "termcolor" +-version = "1.0.5" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" dependencies = [ -- "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-core-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-util-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-sync 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "tracing 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-util", ] [[package]] --name = "tokio-fs" --version = "0.2.0-alpha.6" +-name = "thread_local" +-version = "0.3.6" +name = "thiserror" -+version = "1.0.28" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "283d5230e63df9608ac7d9691adc1dfb6e701225436eb64d0b9a7f0a5a04f6ec" - dependencies = [ -- "futures-core-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-util-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-executor 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-sync 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", ++version = "1.0.26" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2" ++dependencies = [ + "thiserror-impl", - ] - - [[package]] --name = "tokio-io" --version = "0.1.12" ++] ++ ++[[package]] +name = "thiserror-impl" -+version = "1.0.28" ++version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fa3884228611f5cd3608e2d409bf7dce832e4eb3135e3f11addbd7e41bd68e71" ++checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745" dependencies = [ -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2", + "quote", + "syn", ] [[package]] --name = "tokio-io" --version = "0.2.0-alpha.6" -+name = "time" -+version = "0.1.43" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" - dependencies = [ -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-core-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "pin-project 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + name = "time" +-version = "0.1.42" ++version = "0.1.44" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" ++dependencies = [ + "libc", ++ "wasi 0.10.0+wasi-snapshot-preview1", + "winapi", - ] - - [[package]] --name = "tokio-macros" --version = "0.2.0-alpha.6" ++] ++ ++[[package]] +name = "time" +version = "0.2.27" - source = "registry+https://github.com/rust-lang/crates.io-index" ++source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" - dependencies = [ -- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ++dependencies = [ + "const_fn", + "libc", + "standback", @@ -4166,140 +3988,101 @@ index d02cd43..7077d0e 100644 + "time-macros", + "version_check", + "winapi", - ] - - [[package]] --name = "tokio-net" --version = "0.2.0-alpha.6" ++] ++ ++[[package]] +name = "time-macros" +version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" ++source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" - dependencies = [ -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-core-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-sink-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-util-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", -- "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-codec 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-executor 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-sync 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "tracing 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", ++dependencies = [ + "proc-macro-hack", + "time-macros-impl", - ] - - [[package]] --name = "tokio-sync" --version = "0.2.0-alpha.6" ++] ++ ++[[package]] +name = "time-macros-impl" +version = "0.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" ++source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" - dependencies = [ -- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-core-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-sink-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-util-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", ++dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", + "standback", + "syn", - ] - - [[package]] --name = "tokio-timer" --version = "0.3.0-alpha.6" ++] ++ ++[[package]] +name = "tinyvec" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338" dependencies = [ -- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-core-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-util-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-executor 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-sync 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tinyvec_macros", ] - [[package]] --name = "tokio-tls" --version = "0.3.0-alpha.6" ++[[package]] +name = "tinyvec_macros" +version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", --] ++source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - ++ [[package]] --name = "tower-make" --version = "0.3.0-alpha.2a" -+name = "tokio" -+version = "0.2.25" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" - dependencies = [ -- "tokio-io 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "tower-service 0.3.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bytes 0.5.6", -+ "pin-project-lite 0.1.12", - ] - - [[package]] --name = "tower-service" --version = "0.3.0-alpha.2" -+name = "tokio-io" + name = "tokio-io" +-version = "0.1.12" +version = "0.1.13" - source = "registry+https://github.com/rust-lang/crates.io-index" ++source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" +dependencies = [ + "bytes 0.4.12", -+ "futures", ++ "futures 0.1.31", + "log", +] ++ ++[[package]] ++name = "toml" ++version = "0.5.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" + dependencies = [ +- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde", + ] [[package]] name = "tracing" --version = "0.1.11" +-version = "0.1.14" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "tracing-attributes 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "tracing-core 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "tracing-attributes 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "tracing-core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 1.0.0", + "log", -+ "pin-project-lite 0.2.7", ++ "pin-project-lite", + "tracing-attributes", + "tracing-core", ] [[package]] name = "tracing-attributes" --version = "0.1.6" +-version = "0.1.8" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2" dependencies = [ +- "proc-macro2 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2", + "quote", + "syn", @@ -4307,7 +4090,7 @@ index d02cd43..7077d0e 100644 [[package]] name = "tracing-core" --version = "0.1.8" +-version = "0.1.10" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ca517f43f0fb96e0c3072ed5c275fe5eece87e8cb52f4a77b69226d3b1c9df8" @@ -4317,23 +4100,30 @@ index d02cd43..7077d0e 100644 ] [[package]] --name = "try-lock" --version = "0.2.2" -+name = "tracing-futures" + name = "tracing-futures" +-version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -+dependencies = [ + dependencies = [ +- "pin-project 0.4.17 (registry+https://github.com/rust-lang/crates.io-index)", +- "tracing 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", + "pin-project", + "tracing", -+] + ] [[package]] name = "typenum" -version = "1.11.2" -+version = "1.14.0" ++version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec" ++checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" ++ ++[[package]] ++name = "ucd-trie" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" [[package]] name = "unicase" @@ -4376,40 +4166,32 @@ index d02cd43..7077d0e 100644 [[package]] name = "unicode-xid" -version = "0.1.0" --source = "registry+https://github.com/rust-lang/crates.io-index" -- --[[package]] --name = "unicode-xid" --version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" [[package]] --name = "url" --version = "1.7.2" +-name = "unicode-xid" +-version = "0.2.0" +name = "universal-hash" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" - dependencies = [ -- "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++dependencies = [ + "generic-array", + "subtle", - ] ++] [[package]] name = "url" --version = "2.1.0" +-version = "1.7.2" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" dependencies = [ -- "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "form_urlencoded", + "idna", + "matches", @@ -4418,114 +4200,122 @@ index d02cd43..7077d0e 100644 ] [[package]] - name = "utf-8" --version = "0.7.5" +-name = "url" +-version = "2.1.0" ++name = "utf-8" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - - [[package]] --name = "uuid" --version = "0.7.4" ++ ++[[package]] +name = "value-bag" +version = "1.0.0-alpha.7" - source = "registry+https://github.com/rust-lang/crates.io-index" ++source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd320e1520f94261153e96f7534476ad869c14022aee1e59af7c778075d840ae" dependencies = [ -- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ctor", + "version_check", ] [[package]] - name = "vcpkg" --version = "0.2.8" +-name = "utf-8" +-version = "0.7.5" ++name = "vcpkg" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + [[package]] +-name = "vcpkg" +-version = "0.2.8" ++name = "version-compare" ++version = "0.0.10" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d63556a25bae6ea31b52e640d7c41d1ab27faba4ccb600013837a3d0b3994ca1" ++ ++[[package]] ++name = "version-compare" ++version = "0.0.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" + [[package]] name = "version_check" --version = "0.1.5" +-version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" - - [[package]] --name = "version_check" --version = "0.9.1" ++ ++[[package]] +name = "waker-fn" +version = "1.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" ++source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] name = "wallabag-api" --version = "0.1.2" --source = "git+https://github.com/swalladge/wallabag-api.git?rev=71a77358d7d573102894af591ca082175a6a8a93#71a77358d7d573102894af591ca082175a6a8a93" -+version = "0.3.0" +-version = "0.3.0" +-source = "git+https://github.com/swalladge/wallabag-api.git?rev=d2bbebbe76f44edc074e3b2f5313bb8861b6cbe4#d2bbebbe76f44edc074e3b2f5313bb8861b6cbe4" ++version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0d0da697e1785ea7d4bcd55f9c433c74ff42c47a9ab171f4d4603525b5c0b0cb" ++checksum = "e7574c7c89ca85e354fdcb9e448d3ca206c045383a7969b2253c183a641a78ca" dependencies = [ - "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "reqwest 0.10.0-alpha.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "surf 2.0.0-alpha.0 (registry+https://github.com/rust-lang/crates.io-index)", + "chrono", + "log", + "serde", + "serde_json", -+ "serde_urlencoded 0.6.1", -+ "surf 2.3.1", ++ "serde_urlencoded", ++ "surf", ] - [[package]] --name = "want" --version = "0.3.0" ++[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" - source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", --] ++source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - - [[package]] - name = "wasi" --version = "0.7.0" -+version = "0.10.2+wasi-snapshot-preview1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" - ++ ++[[package]] ++name = "wasi" ++version = "0.10.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" ++ [[package]] name = "wasm-bindgen" --version = "0.2.56" +-version = "0.2.60" +version = "0.2.76" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce9b1b516211d33767048e5d47fa2a381ed8b76fc48d2ce4aa39877f9f183e0" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "wasm-bindgen-macro 0.2.56 (registry+https://github.com/rust-lang/crates.io-index)", +- "wasm-bindgen-macro 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 1.0.0", + "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" --version = "0.2.56" +-version = "0.2.60" +version = "0.2.76" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe8dc78e2326ba5f845f4b5bf548401604fa20b1dd1d365fb73b6c1d6364041" dependencies = [ -- "bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "bumpalo 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "proc-macro2 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "wasm-bindgen-shared 0.2.56 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", +- "wasm-bindgen-shared 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "bumpalo", + "lazy_static", + "log", @@ -4537,38 +4327,15 @@ index d02cd43..7077d0e 100644 [[package]] name = "wasm-bindgen-futures" - version = "0.3.27" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "83420b37346c311b9ed822af41ec2e82839bfe99867ec6c54e2da43b7538771c" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-channel-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-util-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "js-sys 0.3.33 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "wasm-bindgen 0.2.56 (registry+https://github.com/rust-lang/crates.io-index)", -- "web-sys 0.3.33 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.10", -+ "futures", -+ "futures-channel-preview", -+ "futures-util-preview", -+ "js-sys", -+ "lazy_static", -+ "wasm-bindgen", -+ "web-sys", - ] - - [[package]] --name = "wasm-bindgen-macro" --version = "0.2.56" -+name = "wasm-bindgen-futures" +-version = "0.4.10" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95fded345a6559c2cfee778d562300c581f7d4ff3edb9b0d230d69800d213972" dependencies = [ -- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "wasm-bindgen-macro-support 0.2.56 (registry+https://github.com/rust-lang/crates.io-index)", +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "js-sys 0.3.37 (registry+https://github.com/rust-lang/crates.io-index)", +- "wasm-bindgen 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", +- "web-sys 0.3.37 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 1.0.0", + "js-sys", + "wasm-bindgen", @@ -4576,67 +4343,53 @@ index d02cd43..7077d0e 100644 ] [[package]] --name = "wasm-bindgen-macro-support" --version = "0.2.56" -+name = "wasm-bindgen-macro" + name = "wasm-bindgen-macro" +-version = "0.2.60" +version = "0.2.76" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44468aa53335841d9d6b6c023eaab07c0cd4bddbcfdee3e2bb1e8d2cb8069fef" dependencies = [ -- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "wasm-bindgen-backend 0.2.56 (registry+https://github.com/rust-lang/crates.io-index)", -- "wasm-bindgen-shared 0.2.56 (registry+https://github.com/rust-lang/crates.io-index)", +- "wasm-bindgen-macro-support 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "quote", + "wasm-bindgen-macro-support", ] [[package]] --name = "wasm-bindgen-shared" --version = "0.2.56" -+name = "wasm-bindgen-macro-support" + name = "wasm-bindgen-macro-support" +-version = "0.2.60" +version = "0.2.76" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0195807922713af1e67dc66132c7328206ed9766af3858164fb583eedc25fbad" -+dependencies = [ + dependencies = [ +- "proc-macro2 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", +- "wasm-bindgen-backend 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", +- "wasm-bindgen-shared 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", -+] + ] [[package]] --name = "wasm-bindgen-webidl" --version = "0.2.56" -+name = "wasm-bindgen-shared" + name = "wasm-bindgen-shared" +-version = "0.2.60" +version = "0.2.76" source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", -- "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "wasm-bindgen-backend 0.2.56 (registry+https://github.com/rust-lang/crates.io-index)", -- "weedle 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", --] +checksum = "acdb075a845574a1fa5f09fd77e43f7747599301ea3417a9fbffdeedfc1f4a29" [[package]] name = "web-sys" --version = "0.3.33" +-version = "0.3.37" +version = "0.3.53" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "224b2f6b67919060055ef1a67807367c2066ed520c3862cc013d26cf893a783c" dependencies = [ -- "anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", -- "js-sys 0.3.33 (registry+https://github.com/rust-lang/crates.io-index)", -- "sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "wasm-bindgen 0.2.56 (registry+https://github.com/rust-lang/crates.io-index)", -- "wasm-bindgen-webidl 0.2.56 (registry+https://github.com/rust-lang/crates.io-index)", +- "js-sys 0.3.37 (registry+https://github.com/rust-lang/crates.io-index)", +- "wasm-bindgen 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "js-sys", + "wasm-bindgen", ] @@ -4644,9 +4397,9 @@ index d02cd43..7077d0e 100644 [[package]] name = "webkit2gtk" -version = "0.9.0" -+version = "0.9.2" ++version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "af1de552309714f28c3242b0084f6cdcab4a8d19de849505202c49e7cfdf57a9" ++checksum = "e3e47b7f870883fc21612d2a51b74262f7f2cc5371f1621370817292a35300a9" dependencies = [ - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cairo-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4667,22 +4420,24 @@ index d02cd43..7077d0e 100644 + "gdk", + "gdk-sys", + "gio", -+ "gio-sys", ++ "gio-sys 0.14.0", + "glib", -+ "glib-sys", -+ "gobject-sys", ++ "glib-sys 0.14.0", ++ "gobject-sys 0.14.0", + "gtk", + "gtk-sys", + "javascriptcore-rs", + "libc", ++ "once_cell", + "webkit2gtk-sys", ] [[package]] name = "webkit2gtk-sys" - version = "0.11.0" +-version = "0.11.0" ++version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7ed60661b81f0cc92f3c2043d83262e3a1ac253b08a616550a9fc008ae28c185" ++checksum = "b66ccc9f0cb4de7c3b92376a5bf64e7ddffb33852f092721731a039ec38dda98" dependencies = [ - "atk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4703,36 +4458,31 @@ index d02cd43..7077d0e 100644 + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", -+ "gio-sys", -+ "glib-sys", -+ "gobject-sys", ++ "gio-sys 0.14.0", ++ "glib-sys 0.14.0", ++ "gobject-sys 0.14.0", + "gtk-sys", + "javascriptcore-rs-sys", + "libc", + "pango-sys", + "pkg-config", + "soup-sys", ++ "system-deps 3.2.0", ] [[package]] --name = "weedle" --version = "0.10.0" +-name = "winapi" +-version = "0.2.8" +name = "wepoll-ffi" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" - dependencies = [ -- "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++dependencies = [ + "cc", - ] ++] [[package]] name = "winapi" --version = "0.2.8" --source = "registry+https://github.com/rust-lang/crates.io-index" -- --[[package]] --name = "winapi" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4775,25 +4525,17 @@ index d02cd43..7077d0e 100644 [[package]] -name = "wincolor" -version = "1.0.2" --source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", --] -- --[[package]] --name = "winreg" --version = "0.6.2" +name = "xml5ever" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b1b52e6e8614d4a58b8e70cf51ec0cc21b256ad8206708bcff8139b5bbd6a59" dependencies = [ - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "log", + "mac", + "markup5ever 0.10.1", -+ "time 0.1.43", ++ "time 0.1.44", ] - -[[package]] @@ -4811,7 +4553,7 @@ index d02cd43..7077d0e 100644 -"checksum aesni 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2f70a6b5f971e473091ab7cfb5ffac6cde81666c4556751d8d5620ead8abf100" -"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" -"checksum ammonia 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "384d704f242a0a9faf793fff775a0be6ab9aa27edabffa097331d73779142520" --"checksum anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "9267dff192e68f3399525901e709a48c1d3982c9c072fa32f2127a0cb0babf14" +-"checksum anyhow 1.0.31 (registry+https://github.com/rust-lang/crates.io-index)" = "85bb70cc08ec97ca5450e6eba421deeea5f172c0fc61f78b5357b2a8e8be195f" -"checksum async-std 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0bf6039b315300e057d198b9d3ab92ee029e31c759b7f1afae538145e6f18a3e" -"checksum async-task 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de6bd58f7b9cc49032559422595c81cbfcf04db2f2133592f70af19e258a1ced" -"checksum atk 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "444daefa55f229af145ea58d77efd23725024ee1f6f3102743709aa6b18c663e" @@ -4820,35 +4562,30 @@ index d02cd43..7077d0e 100644 -"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" -"checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea" -"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" --"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" -"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-cipher-trait 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1c924d49bd09e7c06003acda26cd9742e796e34282ec6c1189404dee0c1f4774" -"checksum block-modes 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "31aa8410095e39fdb732909fb5730a48d5bd7c2e3cd76bd1b07b3dbea130c529" -"checksum block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" --"checksum bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad807f2fc2bf185eeb98ff3a901bd46dc5ad58163d0fa4577ba0d25674d71708" +-"checksum bumpalo 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "12ae9db68ad7fac5fe51304d20f016c911539251075a214f8e663babefa35187" -"checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" -"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" -"checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" --"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" +-"checksum bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1" -"checksum cairo-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0b528aca2ef1026235d0122495dbaee0b09479f77c51f6df8d9bb9cb1c6d6f87" -"checksum cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ff65ba02cac715be836f63429ab00a767d48336efc5497c5637afb53b4f14d63" -"checksum cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)" = "f52a465a666ca3d838ebbf08b241383421412fe7ebb463527bba275526d89f76" -"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -"checksum chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "31850b4a4d6bae316f7a09e691c944c28299298837edc0a03f755618c23cbc01" -"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" --"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" --"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" --"checksum crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa" -"checksum crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "acec9a3b0b3559f15aee4f90746c4e5e293b701c0f7d3925d24e01645267b68c" -"checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca" -"checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac" --"checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" -"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" -"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4" -"checksum crypto-mac 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" -"checksum curl 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)" = "06aa71e9208a54def20792d877bc663d6aae0732b9852e612c4a933177c31283" --"checksum curl-sys 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)" = "0c38ca47d60b86d0cc9d42caa90a0885669c2abc9791f871c81f58cdf39e979b" +-"checksum curl-sys 0.4.31+curl-7.70.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dcd62757cc4f5ab9404bc6ca9f0ae447e729a1403948ce5106bd588ceac6a3b0" -"checksum dbus 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4a0c10ea61042b7555729ab0608727bbbb06ce709c11e6047cfa4e10f6d052d" -"checksum diesel 1.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9d7cc03b910de9935007861dce440881f69102aaaedfd4bc5a6f40340ca5840c" -"checksum diesel_derives 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3" @@ -4861,35 +4598,27 @@ index d02cd43..7077d0e 100644 -"checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" -"checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" -"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" --"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" --"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" -"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" -"checksum futf 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7c9c1ce3fa9336301af935ab852c437817d14cd33690446569392e65170aac3b" -"checksum futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)" = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef" --"checksum futures-channel 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fcae98ca17d102fd8a3603727b9259fcf7fa4239b603d2142926189bc8999b86" --"checksum futures-channel-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)" = "d5e5f4df964fa9c1c2f8bddeb5c3611631cacd93baf810fc8bb2fb4b495c263a" --"checksum futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "79564c427afefab1dfb3298535b21eda083ef7935b4f0ecbfcb121f0aec10866" --"checksum futures-core-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)" = "b35b6263fb1ef523c3056565fa67b1d16f0a8604ff12b11b08c25f28a734c60a" --"checksum futures-executor 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1e274736563f686a837a0568b478bdabfeaec2dca794b5649b04e2fe1627c231" --"checksum futures-executor-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)" = "75236e88bd9fe88e5e8bfcd175b665d0528fe03ca4c5207fabc028c8f9d93e98" --"checksum futures-io 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e676577d229e70952ab25f3945795ba5b16d63ca794ca9d2c860e5595d20b5ff" --"checksum futures-io-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)" = "f4914ae450db1921a56c91bde97a27846287d062087d4a652efc09bb3a01ebda" +-"checksum futures 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5c329ae8753502fb44ae4fc2b622fa2a94652c41e795143765ba0927f92ab780" +-"checksum futures-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0c77d04ce8edd9cb903932b608268b3fffec4163dc053b3b402bf47eac1f1a8" +-"checksum futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f25592f769825e89b92358db00d26f965761e094951ac44d3663ef25b7ac464a" +-"checksum futures-executor 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f674f3e1bcb15b37284a90cedf55afdba482ab061c407a9c0ebbd0f3109741ba" +-"checksum futures-io 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a638959aa96152c7a4cddf50fcb1e3fede0583b27157c26e67d6f99904090dc6" -"checksum futures-macro 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "9a5081aa3de1f7542a794a397cde100ed903b0630152d0973479018fd85423a7" --"checksum futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)" = "3b1dce2a0267ada5c6ff75a8ba864b4e679a9e2aa44262af7a3b5516d530d76e" --"checksum futures-sink-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)" = "86f148ef6b69f75bb610d4f9a2336d4fc88c4b5b67129d1a340dd0fd362efeec" +-"checksum futures-sink 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3466821b4bc114d95b087b850a724c6f83115e929bc88f1fa98a3304a944c8a6" -"checksum futures-task 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7b0a34e53cf6cdcd0178aa573aed466b646eb3db769570841fda0c7ede375a27" -"checksum futures-timer 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a1de7508b218029b0f01662ed8f61b1c964b3ae99d6f25462d0f55a595109df6" --"checksum futures-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d66274fb76985d3c62c886d1da7ac4c0903a8c9f754e8fe0f35a6a6cc39e76" --"checksum futures-util-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)" = "5ce968633c17e5f97936bd2797b6e38fb56cf16a7422319f7ec2e30d3c470e8d" +-"checksum futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "22766cf25d64306bedf0384da004d05c9974ab104fcc4528f1236181c18004c5" -"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" -"checksum gdk 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2739c12374f83bad563ee839c2b3ea5c60391465a254fd4a54b6e3e9648dc61f" -"checksum gdk-pixbuf 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e248220c46b329b097d4b158d2717f8c688f16dd76d0399ace82b3e98062bdd7" -"checksum gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d8991b060a9e9161bafd09bf4a202e6fd404f5b4dd1a08d53a1e84256fb34ab0" -"checksum gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6adf679e91d1bff0c06860287f80403e7db54c2d2424dce0a470023b56c88fbb" -"checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" --"checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407" -"checksum gettext-rs 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "df454a42d8a718280c78666efe0707c120873736961ae91ead898f17ac66ce7c" -"checksum gettext-sys 0.19.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e034c4ba5bb796730a6cc5eb0d654c16885006a7c3d6c6603581ed809434f153" -"checksum gio 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "879a5eb1a91623819d658669104fb587c1ae68695d50947f3e4949a00c6bc218" @@ -4898,8 +4627,8 @@ index d02cd43..7077d0e 100644 -"checksum glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "95856f3802f446c05feffa5e24859fe6a183a7cb849c8449afc35c86b1e316e2" -"checksum gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31d1a804f62034eccf370006ccaef3708a71c31d561fee88564abe71177553d9" -"checksum gtk 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7cd1d646cc9a2cb795f33b538779a3f22e71dc172f2aba08a41e84a2f72c0dec" +-"checksum gtk-macros 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1874c48e670519ce192093ac906c08a6dde7cb2d18b28722ef237726a39c3a63" -"checksum gtk-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53def660c7b48b00b510c81ef2d2fbd3c570f1527081d8d7947f471513e1a4c1" --"checksum h2 0.2.0-alpha.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0f107db1419ef8271686187b1a5d47c6431af4a7f4d98b495e7b7fc249bb0a78" -"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" -"checksum hermit-abi 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f629dc602392d3ec14bfc8a09b5e644d7ffd725102b48b81e59f90f2633621d7" -"checksum hkdf 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "35e8f9d776bbe83f1ff24951f7cc19140fb7ff8d0378463c4c4955f6b0d3e503" @@ -4908,27 +4637,25 @@ index d02cd43..7077d0e 100644 -"checksum html5ever 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5ce65ac8028cf5a287a7dbf6c4e0a6cf2dcf022ed5b167a81bae66ebf599a8b7" -"checksum html5ever 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)" = "025483b0a1e4577bb28578318c886ee5f817dda6eb62473269349044406644cb" -"checksum http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0" --"checksum http-body 0.2.0-alpha.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1f3aef6f3de2bd8585f5b366f3f550b5774500b4764d00cf00f903c95749eec3" --"checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" +-"checksum http 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9" +-"checksum http-client 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bf86227a76b64ebd37d442853370f7177be4fd3ae6f9ff5c9e0349643e1cb332" -"checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" --"checksum hyper 0.13.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)" = "2d05aa523087ac0b9d8b93dd80d5d482a697308ed3b0dca7b0667511a7fa7cdc" --"checksum hyper-tls 0.4.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)" = "47cb3975f80cc809efe5dfcc52b73c9b281fde33f2df35a2e5f79f35e384ae7f" -"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -"checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" --"checksum indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2" -"checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" --"checksum isahc 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "17b77027f12e53ae59a379f7074259d32eb10867e6183388020e922832d9c3fb" +-"checksum isahc 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c45d8c41e6f0b5aa495fd2577e6068e100f57eb87c4b353b0dab20bb53a56035" +-"checksum isahc 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "098c47b6176a9b667292810105999d6029d8338819f299584677e8a125e549c2" -"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" -"checksum javascriptcore-rs 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2104be353e5c19d587e25f36ecb6d59504b5573ad84b96b06650b0cc99d02784" -"checksum javascriptcore-rs-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3f46ada8a08dcd75a10afae872fbfb51275df4a8ae0d46b8cc7c708f08dd2998" --"checksum js-sys 0.3.33 (registry+https://github.com/rust-lang/crates.io-index)" = "367647c532db6f1555d7151e619540ec5f713328235b8c062c6b4f63e84adfe3" +-"checksum js-sys 0.3.37 (registry+https://github.com/rust-lang/crates.io-index)" = "6a27d435371a2fa5b6d2b028a74bbdb1234f308da363226a2854ca3ff8ba7055" -"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -"checksum kv-log-macro 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c54d9f465d530a752e6ebdc217e081a7a614b48cb200f6f0aee21ba6bc9aabb" -"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" -"checksum libhandy 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2aa9f5620e4143358bcd645fe7d7d27b974ed9148cbdd490bc811813899afa07" -"checksum libhandy-sys 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d707af842e918719b71af0ac6cf31d1843f6e8a4d1e9c733b998d8d482e60446" --"checksum libnghttp2-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02254d44f4435dd79e695f2c2b83cd06a47919adea30216ceaf0c57ca0a72463" +-"checksum libnghttp2-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b359f5ec8106bc297694c9a562ace312be2cfd17a5fc68dc12249845aa144b11" -"checksum libsqlite3-sys 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5e5b95e89c330291768dc840238db7f9e204fd208511ab6319b56193a7f2ae25" -"checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" -"checksum linkify 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9ce9439c6f4a1092dc1861272bef01034891da39f13aa1cdcf40ca3e4081de5f" @@ -4940,7 +4667,6 @@ index d02cd43..7077d0e 100644 -"checksum markup5ever 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f1af46a727284117e09780d05038b1ce6fc9c76cc6df183c3dae5a8955a25e21" -"checksum markup5ever 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "65381d9d47506b8592b97c4efd936afcf673b09b059f2bef39c7211ee78b9d03" -"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" --"checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" -"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" -"checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9" -"checksum migrations_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8089920229070f914b9ce9b07ef60e175b2b9bc2d35c3edd8bf4433604e863b9" @@ -4950,10 +4676,8 @@ index d02cd43..7077d0e 100644 -"checksum mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)" = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f" -"checksum mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "966257a94e196b11bb43aca423754d87429960a768de9414f3691d6957abf125" -"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" --"checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e" -"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" -"checksum new_debug_unreachable 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f40f005c60db6e03bae699e414c58bf9aa7ea02a2d0b9bfbcf19286cc4c82b30" --"checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" -"checksum num 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cf4825417e1e1406b3782a8ce92f4d53f26ec055e3622e1881ca8e9f5f9e08db" -"checksum num-bigint 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f9c3f34cdd24f334cb265d9bf8bfa8a241920d026916785747a92f0e55541a1a" -"checksum num-complex 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fcb0cf31fb3ff77e6d2a6ebd6800df7fdcd106f2ad89113c9130bcd07f93dffc" @@ -4964,14 +4688,11 @@ index d02cd43..7077d0e 100644 -"checksum num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72" -"checksum once_cell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "891f486f630e5c5a4916c7e16c4b24a53e78c860b646e9f8e005e4f16847bfed" -"checksum opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" --"checksum openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)" = "3a3cc5799d98e1088141b8e01ff760112bbd9f19d850c124500566ca6901a585" -"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" -"checksum openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)" = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f" -"checksum pango 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9c6b728f1be8edb5f9f981420b651d5ea30bdb9de89f1f1262d0084a020577" -"checksum pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "86b93d84907b3cf0819bff8f13598ba72843bee579d5ebc2502e4b0367b4be7d" -"checksum parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "92e98c49ab0b7ce5b222f2cc9193fc4efe11c6d0bd4f648e374684a6857b1cfc" --"checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" --"checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" -"checksum parking_lot_core 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7582838484df45743c8434fbff785e8edf260c28748353d44bc0da32e0ceabf1" -"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" @@ -4979,18 +4700,17 @@ index d02cd43..7077d0e 100644 -"checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" -"checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" -"checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" --"checksum pin-project 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "94b90146c7216e4cb534069fb91366de4ea0ea353105ee45ed297e2d1619e469" --"checksum pin-project-internal 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "44ca92f893f0656d3cba8158dd0f2b99b94de256a4a54e870bd6922fcc6c8355" +-"checksum pin-project 0.4.17 (registry+https://github.com/rust-lang/crates.io-index)" = "edc93aeee735e60ecb40cf740eb319ff23eab1c5748abfdb5c180e4ce49f7791" +-"checksum pin-project-internal 0.4.17 (registry+https://github.com/rust-lang/crates.io-index)" = "e58db2081ba5b4c93bd6be09c40fd36cb9193a8336c384f3b40012e531aa7e40" -"checksum pin-project-lite 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f0af6cbca0e6e3ce8692ee19fb8d734b641899e07b68eb73e9bbbd32f1703991" -"checksum pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587" -"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" --"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" -"checksum precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" -"checksum pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "717ee476b1690853d222af4634056d830b5197ffd747726a9a1eee6da9f49074" -"checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5" -"checksum proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "369a6ed065f249a159e06c45752c780bda2fb53c995718f9e484d08daa9eb42e" -"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" --"checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27" +-"checksum proc-macro2 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "1502d12e458c49a4c9cbff560d0fe0060c252bc29799ed94ca2ed4bb665a0101" -"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" -"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" -"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" @@ -4998,14 +4718,10 @@ index d02cd43..7077d0e 100644 -"checksum rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)" = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" -"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" --"checksum rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412" -"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" --"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" -"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" --"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" --"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" -"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" @@ -5015,8 +4731,6 @@ index d02cd43..7077d0e 100644 -"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" -"checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" -"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" --"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" --"checksum reqwest 0.10.0-alpha.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3d75dbf305ed1eb54d3c8564e3b746012166b40ec0841381df92b50a2052db71" -"checksum rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)" = "f76d05d3993fd5f4af9434e8e436db163a12a9d40e1a58a726f27a01dfd12a2a" -"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" -"checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" @@ -5027,8 +4741,6 @@ index d02cd43..7077d0e 100644 -"checksum scheduled-thread-pool 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f5de7bc31f28f8e6c28df5e1bf3d10610f5fdc14cc95f272853512c70a2bd779" -"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" -"checksum secret-service 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "655a7a4e6eecc8c68f00be6813c161dcd45e430f4a719dde46dcc3f3afd8014f" --"checksum security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8ef2429d7cefe5fd28bd1d2ed41c944547d4ff84776f5935b456da44593a16df" --"checksum security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895" -"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" @@ -5038,45 +4750,29 @@ index d02cd43..7077d0e 100644 -"checksum sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b4d8bfd0e469f417657573d8451fb33d16cfe0989359b93baf3a1ffc639543d" -"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" -"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" --"checksum sluice 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0a7d06dfb3e8743bc19e6de8a302277471d08077d68946b307280496dc5a3531" --"checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" +-"checksum sluice 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fed13b7cb46f13a15db2c4740f087a848acc8b31af89f95844d40137451f89b1" -"checksum smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44e59e0c9fa00817912ae6e4e6e3c4fe04455e75699d06eedc7d85917ed8e8f4" -"checksum socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85" -"checksum soup-sys 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "48a2f246b51c81d4baa1ce611240c2f6e0323ae75f3b6cc9d2d2911e0567962c" --"checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3" --"checksum string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d" -"checksum string_cache 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "89c058a82f9fd69b1becf8c274f412281038877c553182f1d02eb027045a2d67" -"checksum string_cache_codegen 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0f45ed1b65bf9a4bf2f7b7dc59212d1926e9eaf00fa998988e420fd124467c6" -"checksum string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b1884d1bc09741d466d9b14e6d37ac89d6909cbcac41dd9ae982d4d063bbedfc" -"checksum strum 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6138f8f88a16d90134763314e3fc76fa3ed6a7db4725d6acf9a3ef95a3188d22" -"checksum strum_macros 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0054a7df764039a6cd8592b9de84be4bec368ff081d203a7d5371cbfa8e65c81" -"checksum subtle 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" --"checksum surf 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "741a8008f8a833ef16f47df94a30754478fb2c2bf822b9c2e6f7f09203b97ace" +-"checksum surf 2.0.0-alpha.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1640fa223ab85a28abd533ad229cc840336acb1d65a5e3f8d86daa9d8f930061" -"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" --"checksum syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "dff0acdb207ae2fe6d5976617f887eb1e35a2ba52c13c7234c790960cdad9238" +-"checksum syn 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "f14a640819f79b72a710c0be059dce779f9339ae046c8bef12c361d56702146f" -"checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" --"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" -"checksum tendril 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "707feda9f2582d5d680d733e38755547a3e8fb471e7ba11452ecfd9ce93a5d3b" -"checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e" -"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" -"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" --"checksum tokio 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1f17f5d6ab0f35c1506678b28fb1798bdf74fcb737e9843c7b17b73e426eba38" --"checksum tokio-codec 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9f5d22fd1e84bd4045d28813491cb7d7caae34d45c80517c2213f09a85e8787a" --"checksum tokio-executor 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9ee9ceecf69145923834ea73f32ba40c790fd877b74a7817dd0b089f1eb9c7c8" --"checksum tokio-fs 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bf85e16971e06e680c622e0c1b455be94b086275c5ddcd6d4a83a2bfbb83cda" -"checksum tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5090db468dad16e1a7a54c8c67280c5e4b544f3d3e018f0b913b400261f85926" --"checksum tokio-io 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)" = "112784d5543df30660b04a72ca423bfbd90e8bb32f94dcf610f15401218b22c5" --"checksum tokio-macros 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)" = "86b616374bcdadd95974e1f0dfca07dc913f1163c53840c0d664aca35114964e" --"checksum tokio-net 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a441682cd32f3559383112c4a7f372f5c9fa1950c5cf8c8dd05274a2ce8c2654" --"checksum tokio-sync 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4f1aaeb685540f7407ea0e27f1c9757d258c7c6bf4e3eb19da6fc59b747239d2" --"checksum tokio-timer 0.3.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b97c1587fe71018eb245a4a9daa13a5a3b681bbc1f7fdadfe24720e141472c13" --"checksum tokio-tls 0.3.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)" = "566b4086589c7eebb86aa625d302ab80720ef2aa088649dcae18ec4d754cbd16" --"checksum tower-make 0.3.0-alpha.2a (registry+https://github.com/rust-lang/crates.io-index)" = "316d47dd40cde4ac5d88110eaf9a10a4e2a68612d9c056cd2aa24e37dcb484cd" --"checksum tower-service 0.3.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)" = "63ff37396cd966ce43bea418bfa339f802857495f797dafa00bea5b7221ebdfa" --"checksum tracing 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "6de6a8590a29d3f401eab60470c699efa0adf7b4f0352055bf24df2b69849b40" --"checksum tracing-attributes 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04cfd395def5a60236e187e1ff905cb55668a59f29928dec05e6e1b1fd2ac1f3" --"checksum tracing-core 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "d7fb511ac6ca1d031c5cfc26d8c38da9d88e91d2bd5b38b60cf8dc1b8b5c211f" --"checksum try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" +-"checksum tracing 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c6b59d116d218cb2d990eb06b77b64043e0268ef7323aae63d8b30ae462923" +-"checksum tracing-attributes 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "99bbad0de3fd923c9c3232ead88510b783e5a4d16a6154adffa3d53308de984c" +-"checksum tracing-core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0aa83a9a47081cd522c09c81b31aec2c9273424976f922ad61c053b58350b715" +-"checksum tracing-futures 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c" -"checksum typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9" -"checksum unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" @@ -5087,24 +4783,18 @@ index d02cd43..7077d0e 100644 -"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" -"checksum url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "75b414f6c464c879d7f9babf951f23bc3743fb7313c081b2e6ca719067ea9d61" -"checksum utf-8 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "05e42f7c18b8f902290b009cde6d651262f956c98bc51bca4cd1d511c9cd85c7" --"checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" -"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" --"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" -"checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce" --"checksum wallabag-api 0.1.2 (git+https://github.com/swalladge/wallabag-api.git?rev=71a77358d7d573102894af591ca082175a6a8a93)" = "" --"checksum want 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" --"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d" --"checksum wasm-bindgen 0.2.56 (registry+https://github.com/rust-lang/crates.io-index)" = "99de4b68939a880d530aed51289a7c7baee154e3ea8ac234b542c49da7134aaf" --"checksum wasm-bindgen-backend 0.2.56 (registry+https://github.com/rust-lang/crates.io-index)" = "b58e66a093a7b7571cb76409763c495b8741ac4319ac20acc2b798f6766d92ee" --"checksum wasm-bindgen-futures 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)" = "83420b37346c311b9ed822af41ec2e82839bfe99867ec6c54e2da43b7538771c" --"checksum wasm-bindgen-macro 0.2.56 (registry+https://github.com/rust-lang/crates.io-index)" = "a80f89daea7b0a67b11f6e9f911422ed039de9963dce00048a653b63d51194bf" --"checksum wasm-bindgen-macro-support 0.2.56 (registry+https://github.com/rust-lang/crates.io-index)" = "4f9dbc3734ad6cff6b76b75b7df98c06982becd0055f651465a08f769bca5c61" --"checksum wasm-bindgen-shared 0.2.56 (registry+https://github.com/rust-lang/crates.io-index)" = "d907984f8506b3554eab48b8efff723e764ddbf76d4cd4a3fe4196bc00c49a70" --"checksum wasm-bindgen-webidl 0.2.56 (registry+https://github.com/rust-lang/crates.io-index)" = "f85a3825a459cf6a929d03bacb54dca37a614d43032ad1343ef2d4822972947d" --"checksum web-sys 0.3.33 (registry+https://github.com/rust-lang/crates.io-index)" = "2fb60433d0dc12c803b9b017b3902d80c9451bab78d27bc3210bf2a7b96593f1" +-"checksum wallabag-api 0.3.0 (git+https://github.com/swalladge/wallabag-api.git?rev=d2bbebbe76f44edc074e3b2f5313bb8861b6cbe4)" = "" +-"checksum wasm-bindgen 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)" = "2cc57ce05287f8376e998cbddfb4c8cb43b84a7ec55cf4551d7c00eef317a47f" +-"checksum wasm-bindgen-backend 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)" = "d967d37bf6c16cca2973ca3af071d0a2523392e4a594548155d89a678f4237cd" +-"checksum wasm-bindgen-futures 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "7add542ea1ac7fdaa9dc25e031a6af33b7d63376292bd24140c637d00d1c312a" +-"checksum wasm-bindgen-macro 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)" = "8bd151b63e1ea881bb742cd20e1d6127cef28399558f3b5d415289bc41eee3a4" +-"checksum wasm-bindgen-macro-support 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)" = "d68a5b36eef1be7868f668632863292e37739656a80fc4b9acec7b0bd35a4931" +-"checksum wasm-bindgen-shared 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)" = "daf76fe7d25ac79748a37538b7daeed1c7a6867c92d3245c12c6222e4a20d639" +-"checksum web-sys 0.3.37 (registry+https://github.com/rust-lang/crates.io-index)" = "2d6f51648d8c56c366144378a33290049eafdd784071077f6fe37dae64c1c4cb" -"checksum webkit2gtk 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d88f8ec7f54b941a98b8921a27b0965347005ec4177737e5015f2b1c5baee794" -"checksum webkit2gtk-sys 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7ed60661b81f0cc92f3c2043d83262e3a1ac253b08a616550a9fc008ae28c185" --"checksum weedle 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3bb43f70885151e629e2a19ce9e50bd730fd436cfd4b666894c9ce4de9141164" -"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" -"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" -"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" @@ -5112,18 +4802,1110 @@ index d02cd43..7077d0e 100644 -"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9" -"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -"checksum wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "96f5016b18804d24db43cebf3c77269e7569b8954a8464501c216cc5e070eaa9" --"checksum winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" -"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" diff --git a/Cargo.toml b/Cargo.toml -index 9f06f63..9efc85f 100644 +index 5a4f00b..e010fa7 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -19,7 +19,7 @@ lazy_static = "1.3" +@@ -5,21 +5,21 @@ authors = ["Bilal Elmoussaoui "] + edition = "2018" + + [dependencies] +-gtk = { version = "0.8", features = ["v3_22"] } +-glib = "0.9" +-gio = { version = "0.8", features = ["v2_56"] } +-cairo-rs = "0.8" +-gdk = "0.12" +-gdk-pixbuf = "0.8" ++gtk = { version = "0.14", features = ["v3_22"] } ++glib = "0.14" ++gio = { version = "0.14", features = ["v2_64"] } ++cairo-rs = "0.14" ++gdk = "0.14" ++gdk-pixbuf = "0.14" + log = "0.4" +-libhandy = "0.5" +-webkit2gtk = { version = "0.9", features = ["v2_6"] } ++libhandy = "0.8" ++webkit2gtk = { version = "0.14", features = ["v2_6"] } + gettext-rs= { version = "0.4", features = ["gettext-system"] } + lazy_static = "1.3" serde = "1.0" serde_json = "1.0" serde_derive = "1.0" --wallabag-api = { git= "https://github.com/swalladge/wallabag-api.git", rev = "71a77358d7d573102894af591ca082175a6a8a93" } -+wallabag-api = "0.3.0" +-wallabag-api = { git = "https://github.com/swalladge/wallabag-api.git", rev = "d2bbebbe76f44edc074e3b2f5313bb8861b6cbe4" } ++wallabag-api = "0.4.1" pretty_env_logger = "0.3" diesel = { version = "1.4", features = ["sqlite", "r2d2", "chrono"] } - diesel_migrations = { version = "1.4" , features = ["sqlite"] } + diesel_migrations = { version = "1.4", features = ["sqlite"] } +@@ -36,5 +36,6 @@ html2pango = "0.3" + rust-crypto = "0.2" + async-std = "1.4" + futures = { version = "0.3", features = [ "thread-pool" ] } +-gtk-macros = "0.2" ++gtk-macros = "0.3" + http-client = { version = "1.1", features = ["native_client"] } ++once_cell = "1.8.0" +diff --git a/data/resources/ui/articles_list.ui b/data/resources/ui/articles_list.ui +index 611b362..cae1e3b 100644 +--- a/data/resources/ui/articles_list.ui ++++ b/data/resources/ui/articles_list.ui +@@ -3,11 +3,9 @@ + + + +- ++ + True + False +- 800 +- 800 + + + True +diff --git a/data/resources/ui/login.ui.in b/data/resources/ui/login.ui.in +index d7c03be..f0935d6 100644 +--- a/data/resources/ui/login.ui.in ++++ b/data/resources/ui/login.ui.in +@@ -20,11 +20,9 @@ + + + +- ++ + True + False +- 450 +- 450 + + + True +@@ -111,7 +109,7 @@ + True + False + Instance URL +- ++ + + True + True +@@ -127,7 +125,7 @@ + True + True + Client ID +- ++ + + True + True +@@ -142,7 +140,7 @@ + True + True + Client Secret +- ++ + + True + True +@@ -159,7 +157,7 @@ + True + True + Username +- ++ + + True + True +@@ -174,7 +172,7 @@ + True + True + Password +- ++ + + True + True +diff --git a/data/resources/ui/settings.ui b/data/resources/ui/settings.ui +index aa16664..0cf5ffb 100644 +--- a/data/resources/ui/settings.ui ++++ b/data/resources/ui/settings.ui +@@ -18,7 +18,7 @@ + + Enable dark mode + True +- ++ + + True + center +@@ -44,7 +44,7 @@ + + Username + True +- ++ + + True + True +@@ -58,7 +58,7 @@ + + Email + True +- ++ + + True + True +@@ -72,7 +72,7 @@ + + Created At + True +- ++ + + True + False +@@ -86,7 +86,7 @@ + + Updated At + True +- ++ + + True + False +diff --git a/data/resources/ui/window.ui.in b/data/resources/ui/window.ui.in +index 709d455..68961ae 100644 +--- a/data/resources/ui/window.ui.in ++++ b/data/resources/ui/window.ui.in +@@ -258,11 +258,9 @@ + + + +- ++ + True + False +- 500 +- 500 + True + + +diff --git a/meson.build b/meson.build +index f11aa4f..b10ef62 100644 +--- a/meson.build ++++ b/meson.build +@@ -11,7 +11,7 @@ dependency('glib-2.0', version: '>= 2.56') + dependency('gio-2.0', version: '>= 2.56') + dependency('gdk-pixbuf-2.0') + dependency('gtk+-3.0', version: '>= 3.24.7') +-dependency('libhandy-0.0', version: '>= 0.0.10') ++dependency('libhandy-1', version: '>= 0.0.10') + + version = meson.project_version() + version_array = version.split('.') +diff --git a/src/application.rs b/src/application.rs +index 71cfd2f..cb127d1 100644 +--- a/src/application.rs ++++ b/src/application.rs +@@ -11,7 +11,6 @@ use futures::executor::ThreadPool; + use gio::prelude::*; + use glib::{Receiver, Sender}; + use gtk::prelude::*; +-use std::env; + use std::{cell::RefCell, rc::Rc}; + use url::Url; + +@@ -40,7 +39,7 @@ pub struct Application { + + impl Application { + pub fn new() -> Rc { +- let app = gtk::Application::new(Some(config::APP_ID), gio::ApplicationFlags::FLAGS_NONE).unwrap(); ++ let app = gtk::Application::new(Some(config::APP_ID), gio::ApplicationFlags::FLAGS_NONE); + + let (sender, r) = glib::MainContext::channel(glib::PRIORITY_DEFAULT); + let receiver = RefCell::new(Some(r)); +@@ -68,8 +67,7 @@ impl Application { + let receiver = self.receiver.borrow_mut().take().unwrap(); + receiver.attach(None, move |action| app.do_action(action)); + +- let args: Vec = env::args().collect(); +- self.app.run(&args); ++ self.app.run(); + } + + fn init(&self) { +@@ -129,7 +127,7 @@ impl Application { + clone!(@strong self.window.widget as window, @strong self.client as client => move |_, _| { + let settings_widget = SettingsWidget::new(client.clone()); + settings_widget.widget.set_transient_for(Some(&window)); +- let size = window.get_size(); ++ let size = window.size(); + settings_widget.widget.resize(size.0, size.1); + settings_widget.widget.show(); + }) +@@ -139,11 +137,13 @@ impl Application { + self.app, + "about", + clone!(@strong self.window.widget as window => move |_, _| { +- let builder = gtk::Builder::new_from_resource("/com/belmoussaoui/ReadItLater/about_dialog.ui"); ++ let builder = gtk::Builder::from_resource("/com/belmoussaoui/ReadItLater/about_dialog.ui"); + get_widget!(builder, gtk::AboutDialog, about_dialog); + + about_dialog.set_transient_for(Some(&window)); +- about_dialog.connect_response(|dialog, _| dialog.destroy()); ++ unsafe { ++ about_dialog.connect_response(|dialog, _| dialog.destroy()); ++ } + about_dialog.show(); + }) + ); +@@ -192,19 +192,19 @@ impl Application { + window.present(); + }); + +- if let Some(gtk_settings) = gtk::Settings::get_default() { ++ if let Some(gtk_settings) = gtk::Settings::default() { + SettingsManager::bind_property(Key::DarkMode, >k_settings, "gtk-application-prefer-dark-theme"); + } + } + + fn setup_css(&self) { +- if let Some(theme) = gtk::IconTheme::get_default() { ++ if let Some(theme) = gtk::IconTheme::default() { + theme.add_resource_path("/com/belmoussaoui/ReadItLater/icons"); + } + + let p = gtk::CssProvider::new(); + gtk::CssProvider::load_from_resource(&p, "/com/belmoussaoui/ReadItLater/style.css"); +- if let Some(screen) = gdk::Screen::get_default() { ++ if let Some(screen) = gdk::Screen::default() { + gtk::StyleContext::add_provider_for_screen(&screen, &p, 500); + } + } +@@ -213,7 +213,7 @@ impl Application { + * Auth + */ + fn init_client(&self) { +- let username = SettingsManager::get_string(Key::Username); ++ let username = SettingsManager::string(Key::Username); + match SecretManager::is_logged(&username) { + Ok(config) => { + send!(self.sender, Action::SetView(View::Articles)); +@@ -227,7 +227,7 @@ impl Application { + send!(self.sender, Action::SetView(View::Syncing(true))); + let client = self.client.clone(); + let sender = self.sender.clone(); +- let logged_username = SettingsManager::get_string(Key::Username); ++ let logged_username = SettingsManager::string(Key::Username); + + spawn!(async move { + let mut client = client.lock().await; +@@ -261,7 +261,7 @@ impl Application { + } + + fn logout(&self) -> Result<()> { +- let username = SettingsManager::get_string(Key::Username); ++ let username = SettingsManager::string(Key::Username); + database::wipe()?; + self.window.articles_view.clear(); + if SecretManager::logout(&username).is_ok() { +@@ -275,7 +275,7 @@ impl Application { + fn sync(&self) { + send!(self.sender, Action::SetView(View::Syncing(true))); + let mut since = Utc.timestamp(0, 0); +- let last_sync = SettingsManager::get_integer(Key::LatestSync); ++ let last_sync = SettingsManager::integer(Key::LatestSync); + if last_sync != 0 { + since = Utc.timestamp(last_sync.into(), 0); + } +diff --git a/src/database.rs b/src/database.rs +index b9722b4..7b4a98b 100644 +--- a/src/database.rs ++++ b/src/database.rs +@@ -8,7 +8,7 @@ use std::{fs, fs::File}; + type Pool = r2d2::Pool>; + + lazy_static! { +- static ref DB_PATH: PathBuf = glib::get_user_data_dir().unwrap().join("read-it-later"); ++ static ref DB_PATH: PathBuf = glib::user_cache_dir().join("read-it-later"); + static ref POOL: Pool = init_pool().expect("Failed to create a Pool"); + } + +diff --git a/src/main.rs b/src/main.rs +index 0e36028..5b93108 100644 +--- a/src/main.rs ++++ b/src/main.rs +@@ -16,7 +16,7 @@ extern crate strum_macros; + extern crate gtk_macros; + + use gettextrs::*; +-use libhandy::Column; ++use libhandy; + + mod application; + mod config; +@@ -27,7 +27,6 @@ mod settings; + mod static_resources; + mod views; + mod widgets; +-mod window_state; + + use application::Application; + +@@ -44,7 +43,7 @@ fn main() { + glib::set_application_name(&format!("Read It Later{}", config::NAME_SUFFIX)); + + static_resources::init().expect("Failed to initialize the resource file."); +- Column::new(); // Due to libhandy not having a main func :( ++ libhandy::init(); + webkit2gtk::WebView::new(); + + let app = Application::new(); +diff --git a/src/meson.build b/src/meson.build +index d515ced..f523525 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -67,7 +67,6 @@ sources = files( + 'main.rs', + 'schema.rs', + 'static_resources.rs', +- 'window_state.rs', + ) + + custom_target('cargo-build', +diff --git a/src/models/article.rs b/src/models/article.rs +index 78f27aa..cafe87f 100644 +--- a/src/models/article.rs ++++ b/src/models/article.rs +@@ -177,7 +177,7 @@ impl Article { + preview_image.download(client).await?; + } + +- return Ok(Some(gdk_pixbuf::Pixbuf::new_from_file(&preview_image.cache)?)); ++ return Ok(Some(gdk_pixbuf::Pixbuf::from_file(&preview_image.cache)?)); + } + Ok(None) + } +diff --git a/src/models/client_manager.rs b/src/models/client_manager.rs +index f747c1b..e043e86 100644 +--- a/src/models/client_manager.rs ++++ b/src/models/client_manager.rs +@@ -48,7 +48,7 @@ impl ClientManager { + debug!("[Client] Saving url {}", url); + if let Some(client) = self.client.clone() { + let mut client = client.lock().await; +- let new_entry = NewEntry::new_with_url(url.into_string()); ++ let new_entry = NewEntry::new_with_url(url.into()); + if let Ok(entry) = client.create_entry(&new_entry).await { + let article = Article::from(entry); + send!(self.sender, Action::Articles(Box::new(ArticleAction::Add(article)))); +diff --git a/src/models/object_wrapper.rs b/src/models/object_wrapper.rs +index e0d6f34..3b9b50c 100644 +--- a/src/models/object_wrapper.rs ++++ b/src/models/object_wrapper.rs +@@ -5,42 +5,26 @@ + // https://github.com/gtk-rs/examples/blob/master/src/bin/listbox_model.rs + // Source https://gitlab.gnome.org/World/Shortwave/blob/master/src/model/object_wrapper.rs + +-use gtk::prelude::*; ++use gtk::{glib, prelude::*}; + use serde::de::DeserializeOwned; + +-use glib::subclass; + use glib::subclass::prelude::*; +-use glib::translate::*; ++use glib::{ParamSpec, Value}; + + mod imp { + use super::*; + use std::cell::RefCell; + ++ #[derive(Default)] + pub struct ObjectWrapper { + data: RefCell>, + } + +- static PROPERTIES: [subclass::Property; 1] = [subclass::Property("data", |name| { +- glib::ParamSpec::string( +- name, +- "Data", +- "Data", +- None, // Default value +- glib::ParamFlags::READWRITE, +- ) +- })]; +- ++ #[glib::object_subclass] + impl ObjectSubclass for ObjectWrapper { + const NAME: &'static str = "ObjectWrapper"; ++ type Type = super::ObjectWrapper; + type ParentType = glib::Object; +- type Instance = subclass::simple::InstanceStruct; +- type Class = subclass::simple::ClassStruct; +- +- glib_object_subclass!(); +- +- fn class_init(klass: &mut Self::Class) { +- klass.install_properties(&PROPERTIES); +- } + + fn new() -> Self { + Self { data: RefCell::new(None) } +@@ -48,13 +32,24 @@ mod imp { + } + + impl ObjectImpl for ObjectWrapper { +- glib_object_impl!(); +- +- fn set_property(&self, _obj: &glib::Object, id: usize, value: &glib::Value) { +- let prop = &PROPERTIES[id]; ++ fn properties() -> &'static [glib::ParamSpec] { ++ use once_cell::sync::Lazy; ++ static PROPERTIES: Lazy> = Lazy::new(|| { ++ vec![glib::ParamSpec::new_string( ++ "data", ++ "Data", ++ "Data", ++ None, // Default value ++ glib::ParamFlags::READWRITE, ++ )] ++ }); ++ ++ PROPERTIES.as_ref() ++ } + +- match *prop { +- subclass::Property("data", ..) => { ++ fn set_property(&self, _obj: &Self::Type, _id: usize, value: &Value, pspec: &ParamSpec) { ++ match pspec.name() { ++ "data" => { + let data = value.get().expect("Failed to get `data` property"); + self.data.replace(data); + } +@@ -62,23 +57,17 @@ mod imp { + } + } + +- fn get_property(&self, _obj: &glib::Object, id: usize) -> Result { +- let prop = &PROPERTIES[id]; +- +- match *prop { +- subclass::Property("data", ..) => Ok(self.data.borrow().to_value()), ++ fn property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { ++ match pspec.name() { ++ "data" => self.data.borrow().to_value(), + _ => unimplemented!(), + } + } + } + } + +-glib_wrapper! { +- pub struct ObjectWrapper(Object, subclass::simple::ClassStruct, ObjectWrapperClass>); +- +- match fn { +- get_type => || imp::ObjectWrapper::get_type().to_glib(), +- } ++glib::wrapper! { ++ pub struct ObjectWrapper(ObjectSubclass); + } + + impl ObjectWrapper { +@@ -86,17 +75,14 @@ impl ObjectWrapper { + where + O: serde::ser::Serialize, + { +- glib::Object::new(Self::static_type(), &[("data", &serde_json::to_string(&object).unwrap())]) +- .unwrap() +- .downcast() +- .unwrap() ++ glib::Object::new(&[("data", &serde_json::to_string(&object).unwrap())]).unwrap() + } + + pub fn deserialize(&self) -> O + where + O: DeserializeOwned, + { +- let data = self.get_property("data").unwrap().get::().unwrap(); +- serde_json::from_str(&data.unwrap()).unwrap() ++ let data = self.property("data").unwrap().get::().unwrap(); ++ serde_json::from_str(&data).unwrap() + } + } +diff --git a/src/models/preview_image.rs b/src/models/preview_image.rs +index 0a7668f..3b9b7c4 100644 +--- a/src/models/preview_image.rs ++++ b/src/models/preview_image.rs +@@ -7,7 +7,7 @@ use std::rc::Rc; + use url::Url; + + lazy_static! { +- pub static ref CACHE_DIR: PathBuf = glib::get_user_cache_dir().unwrap().join("read-it-later"); ++ pub static ref CACHE_DIR: PathBuf = glib::user_cache_dir().join("read-it-later"); + } + + pub struct PreviewImage { +@@ -17,7 +17,7 @@ pub struct PreviewImage { + + impl PreviewImage { + pub fn new(url: Url) -> Self { +- let cache = PreviewImage::get_cache_of(&url.clone().into_string()); ++ let cache = PreviewImage::get_cache_of(&String::from(url.clone())); + Self { url, cache } + } + +diff --git a/src/settings/settings_manager.rs b/src/settings/settings_manager.rs +index 0484672..a2ed150 100644 +--- a/src/settings/settings_manager.rs ++++ b/src/settings/settings_manager.rs +@@ -18,12 +18,12 @@ impl SettingsManager { + + pub fn bind_property>(key: Key, object: &P, property: &str) { + let settings = Self::get_settings(); +- settings.bind(key.to_string().as_str(), object, property, gio::SettingsBindFlags::DEFAULT); ++ settings.bind(key.to_string().as_str(), object, property).build(); + } + +- pub fn get_string(key: Key) -> String { ++ pub fn string(key: Key) -> String { + let settings = Self::get_settings(); +- settings.get_string(&key.to_string()).unwrap().to_string() ++ settings.string(&key.to_string()).to_string() + } + + pub fn set_string(key: Key, value: String) { +@@ -33,21 +33,14 @@ impl SettingsManager { + } + } + +- pub fn get_boolean(key: Key) -> bool { ++ pub fn boolean(key: Key) -> bool { + let settings = Self::get_settings(); +- settings.get_boolean(&key.to_string()) ++ settings.boolean(&key.to_string()) + } + +- pub fn set_boolean(key: Key, value: bool) { ++ pub fn integer(key: Key) -> i32 { + let settings = Self::get_settings(); +- if let Err(err) = settings.set_boolean(&key.to_string(), value) { +- error!("Failed to save {} setting due to {}", key.to_string(), err); +- } +- } +- +- pub fn get_integer(key: Key) -> i32 { +- let settings = Self::get_settings(); +- settings.get_int(&key.to_string()) ++ settings.int(&key.to_string()) + } + + pub fn set_integer(key: Key, value: i32) { +diff --git a/src/static_resources.rs.in b/src/static_resources.rs.in +index 9ffb7bb..6fb8d29 100644 +--- a/src/static_resources.rs.in ++++ b/src/static_resources.rs.in +@@ -10,7 +10,7 @@ pub(crate) fn init() -> Result<(), Error> { + + // Create Resource it will live as long the value lives. + let gbytes = Bytes::from_static(res_bytes.as_ref()); +- let resource = Resource::new_from_data(&gbytes)?; ++ let resource = Resource::from_data(&gbytes)?; + + // Register the resource so it won't be dropped and will continue to live in + // memory. +diff --git a/src/views/articles_list.rs b/src/views/articles_list.rs +index 16d6771..8d270ff 100644 +--- a/src/views/articles_list.rs ++++ b/src/views/articles_list.rs +@@ -57,7 +57,7 @@ impl ArticlesListView { + } + + pub fn len(&self) -> u32 { +- self.model.get_n_items() ++ self.model.n_items() + } + + pub fn delete(&self, article: &Article) { +@@ -86,7 +86,7 @@ impl ArticlesListView { + + fn index(&self, article: &Article) -> Option { + for i in 0..self.len() { +- let gobject = self.model.get_object(i).unwrap(); ++ let gobject = self.model.item(i).unwrap(); + let a: Article = gobject.downcast_ref::().unwrap().deserialize(); + + if article.id == a.id { +diff --git a/src/widgets/articles/index.rs b/src/widgets/articles/index.rs +index 19ba129..665652e 100644 +--- a/src/widgets/articles/index.rs ++++ b/src/widgets/articles/index.rs +@@ -3,7 +3,8 @@ use gio::prelude::*; + use glib::Sender; + use gtk::prelude::*; + use std::{cell::RefCell, rc::Rc}; +-use webkit2gtk::{ContextMenuExt, ContextMenuItemExt, WebView, WebViewExt}; ++use webkit2gtk::traits::{ContextMenuExt, ContextMenuItemExt, WebViewExt}; ++use webkit2gtk::WebView; + + use crate::models::{Article, ArticleAction}; + use crate::settings::{Key, SettingsManager}; +@@ -18,7 +19,7 @@ pub struct ArticleWidget { + + impl ArticleWidget { + pub fn new(sender: Sender) -> Rc { +- let builder = gtk::Builder::new_from_resource("/com/belmoussaoui/ReadItLater/article.ui"); ++ let builder = gtk::Builder::from_resource("/com/belmoussaoui/ReadItLater/article.ui"); + get_widget!(builder, gtk::Box, article); + + let actions = gio::SimpleActionGroup::new(); +@@ -48,8 +49,8 @@ impl ArticleWidget { + get_widget!(self.builder, WebView, webview); + + webview.connect_context_menu(move |_, context_menu, _, _| { +- for menu_item in context_menu.get_items() { +- let action = menu_item.get_stock_action(); ++ for menu_item in context_menu.items() { ++ let action = menu_item.stock_action(); + + if forbidden_actions.contains(&action) { + // Remove forbidden actions +@@ -62,8 +63,8 @@ impl ArticleWidget { + // Progress bar + get_widget!(self.builder, gtk::Revealer, revealer); + get_widget!(self.builder, gtk::ProgressBar, progressbar); +- webview.connect_property_estimated_load_progress_notify(move |webview| { +- let progress = webview.get_estimated_load_progress(); ++ webview.connect_estimated_load_progress_notify(move |webview| { ++ let progress = webview.estimated_load_progress(); + revealer.set_reveal_child(true); + progressbar.set_fraction(progress); + if (progress - 1.0).abs() < std::f64::EPSILON { +@@ -91,7 +92,7 @@ impl ArticleWidget { + if let Some(article) = aw.article.borrow().clone() { + glib::idle_add(clone!(@strong article => move || { + let article_url = article.url.clone(); +- let screen = gdk::Screen::get_default().unwrap(); ++ let screen = gdk::Screen::default().unwrap(); + if let Err(err_msg) = gtk::show_uri(Some(&screen), &article_url.unwrap(), 0) { + error!("Failed to open the uri {} in the default browser", err_msg); + } +@@ -106,7 +107,7 @@ impl ArticleWidget { + "archive", + false, + clone!(@strong aw, @strong self.sender as sender => move |action, _|{ +- let state = action.get_state().unwrap(); ++ let state = action.state().unwrap(); + let action_state: bool = state.get().unwrap(); + let is_archived = !action_state; + action.set_state(&is_archived.to_variant()); +@@ -121,7 +122,7 @@ impl ArticleWidget { + "favorite", + false, + clone!(@strong aw, @strong self.sender as sender => move |action, _|{ +- let state = action.get_state().unwrap(); ++ let state = action.state().unwrap(); + let action_state: bool = state.get().unwrap(); + let is_starred = !action_state; + action.set_state(&is_starred.to_variant()); +@@ -153,7 +154,7 @@ impl ArticleWidget { + } + + let mut layout_css = load_resource("layout.css")?; +- if SettingsManager::get_boolean(Key::DarkMode) { ++ if SettingsManager::boolean(Key::DarkMode) { + layout_css.push_str(&load_resource("layout-dark.css")?); + } + layout_html = layout_html.replace("{css}", &layout_css); +@@ -167,7 +168,7 @@ impl ArticleWidget { + } + + pub fn load_resource(file: &str) -> Result { +- let file = gio::File::new_for_uri(&format!("resource:///com/belmoussaoui/ReadItLater/{}", file)); ++ let file = gio::File::for_uri(&format!("resource:///com/belmoussaoui/ReadItLater/{}", file)); + let (bytes, _) = file.load_bytes(gio::NONE_CANCELLABLE)?; + String::from_utf8(bytes.to_vec()).map_err(From::from) + } +diff --git a/src/widgets/articles/list.rs b/src/widgets/articles/list.rs +index 9fae278..9b7851f 100644 +--- a/src/widgets/articles/list.rs ++++ b/src/widgets/articles/list.rs +@@ -7,7 +7,7 @@ use super::row::ArticleRow; + use crate::models::{Article, ArticleAction, ObjectWrapper}; + + pub struct ArticlesListWidget { +- pub widget: libhandy::Column, ++ pub widget: libhandy::Clamp, + builder: gtk::Builder, + sender: Sender, + client: Rc, +@@ -15,8 +15,8 @@ pub struct ArticlesListWidget { + + impl ArticlesListWidget { + pub fn new(sender: Sender, client: Rc) -> Self { +- let builder = gtk::Builder::new_from_resource("/com/belmoussaoui/ReadItLater/articles_list.ui"); +- get_widget!(builder, libhandy::Column, articles_list); ++ let builder = gtk::Builder::from_resource("/com/belmoussaoui/ReadItLater/articles_list.ui"); ++ get_widget!(builder, libhandy::Clamp, articles_list); + + Self { + builder, +@@ -34,13 +34,13 @@ impl ArticlesListWidget { + empty_image.set_from_icon_name(Some(icon), gtk::IconSize::Dialog); + + get_widget!(self.builder, gtk::Stack, stack); +- if model.get_n_items() == 0 { ++ if model.n_items() == 0 { + stack.set_visible_child_name("empty"); + } else { + stack.set_visible_child_name("articles"); + } + model.connect_items_changed(move |model, _, _, _| { +- if model.get_n_items() == 0 { ++ if model.n_items() == 0 { + stack.set_visible_child_name("empty"); + } else { + stack.set_visible_child_name("articles"); +diff --git a/src/widgets/articles/preview.rs b/src/widgets/articles/preview.rs +index ff85a08..d35f9de 100644 +--- a/src/widgets/articles/preview.rs ++++ b/src/widgets/articles/preview.rs +@@ -13,7 +13,7 @@ pub struct ArticlePreviewImage { + + impl ArticlePreviewImage { + pub fn new() -> Rc { +- let builder = gtk::Builder::new_from_resource("/com/belmoussaoui/ReadItLater/article_preview.ui"); ++ let builder = gtk::Builder::from_resource("/com/belmoussaoui/ReadItLater/article_preview.ui"); + get_widget!(builder, gtk::Stack, article_preview); + get_widget!(builder, gtk::DrawingArea, image); + let pixbuf = Rc::new(RefCell::new(None)); +@@ -37,28 +37,28 @@ impl ArticlePreviewImage { + self.widget.set_visible_child_name("loading"); + + self.image.connect_draw(move |dr, ctx| { +- let width = dr.get_allocated_width(); +- let height = dr.get_allocated_height(); ++ let width = dr.allocated_width(); ++ let height = dr.allocated_height(); + +- let style = dr.get_style_context(); ++ let style = dr.style_context(); + gtk::render_background(&style, ctx, 0.0, 0.0, width.into(), height.into()); + gtk::render_frame(&style, ctx, 0.0, 0.0, width.into(), height.into()); + + match &*d.pixbuf.borrow() { + Some(pixbuf) => { +- match pixbuf.get_width().cmp(&width) { ++ match pixbuf.width().cmp(&width) { + std::cmp::Ordering::Greater => { + let pixbuf = pixbuf.scale_simple(width, height, gdk_pixbuf::InterpType::Bilinear).unwrap(); + ctx.set_source_pixbuf(&pixbuf, 0.0, 0.0); + } + std::cmp::Ordering::Less => { +- ctx.set_source_pixbuf(&pixbuf, (width - pixbuf.get_width()) as f64, 0.0); ++ ctx.set_source_pixbuf(&pixbuf, (width - pixbuf.width()) as f64, 0.0); + } + std::cmp::Ordering::Equal => { + ctx.set_source_pixbuf(&pixbuf, 0.0, 0.0); + } + }; +- ctx.paint(); ++ ctx.paint().unwrap(); + + gtk::Inhibit(false) + } +diff --git a/src/widgets/articles/row.rs b/src/widgets/articles/row.rs +index c5f9dd2..977a0df 100644 +--- a/src/widgets/articles/row.rs ++++ b/src/widgets/articles/row.rs +@@ -17,7 +17,7 @@ pub struct ArticleRow { + + impl ArticleRow { + pub fn new(article: Article, client: Rc, sender: Sender) -> Self { +- let builder = gtk::Builder::new_from_resource("/com/belmoussaoui/ReadItLater/article_row.ui"); ++ let builder = gtk::Builder::from_resource("/com/belmoussaoui/ReadItLater/article_row.ui"); + get_widget!(builder, gtk::ListBoxRow, article_row); + let preview_image = ArticlePreviewImage::new(); + +diff --git a/src/widgets/login.rs b/src/widgets/login.rs +index 2c234be..999631b 100644 +--- a/src/widgets/login.rs ++++ b/src/widgets/login.rs +@@ -3,14 +3,14 @@ use std::rc::Rc; + use wallabag_api::types::Config; + + pub struct LoginWidget { +- pub widget: libhandy::Column, ++ pub widget: libhandy::Clamp, + pub builder: gtk::Builder, + } + + impl LoginWidget { + pub fn new() -> Rc { +- let builder = gtk::Builder::new_from_resource("/com/belmoussaoui/ReadItLater/login.ui"); +- get_widget!(builder, libhandy::Column, login); ++ let builder = gtk::Builder::from_resource("/com/belmoussaoui/ReadItLater/login.ui"); ++ get_widget!(builder, libhandy::Clamp, login); + + let login_widget = Rc::new(Self { widget: login, builder }); + +@@ -25,20 +25,20 @@ impl LoginWidget { + get_widget!(self.builder, gtk::Entry, username_entry); + get_widget!(self.builder, gtk::Entry, password_entry); + +- let instance = instance_entry.get_text()?; ++ let instance = instance_entry.text(); + let instance = instance.trim_end_matches('/').to_string(); + if let Err(err) = url::Url::parse(&instance) { + error!("The instance url is invalid {}", err); +- instance_entry.get_style_context().add_class("error"); ++ instance_entry.style_context().add_class("error"); + return None; + } +- instance_entry.get_style_context().remove_class("error"); ++ instance_entry.style_context().remove_class("error"); + + Some(Config { +- client_id: client_id_entry.get_text()?.to_string(), +- client_secret: client_secret_entry.get_text()?.to_string(), +- username: username_entry.get_text()?.to_string(), +- password: password_entry.get_text()?.to_string(), ++ client_id: client_id_entry.text().to_string(), ++ client_secret: client_secret_entry.text().to_string(), ++ username: username_entry.text().to_string(), ++ password: password_entry.text().to_string(), + base_url: instance, + }) + } +@@ -54,8 +54,8 @@ impl LoginWidget { + + fn init(&self) { + get_widget!(self.builder, gtk::TreeStore, instances_store); +- instances_store.insert_with_values(None, None, &[0], &[&"https://app.wallabag.it/"]); +- instances_store.insert_with_values(None, None, &[0], &[&"https://framabag.org"]); ++ instances_store.insert_with_values(None, None, &[(0, &"https://app.wallabag.it/")]); ++ instances_store.insert_with_values(None, None, &[(0, &"https://framabag.org")]); + + get_widget!(self.builder, gtk::ListBox, entries_listbox); + entries_listbox.set_header_func(Some(Box::new(move |row: >k::ListBoxRow, row1: Option<>k::ListBoxRow>| { +diff --git a/src/widgets/settings.rs b/src/widgets/settings.rs +index ae2ab76..2bde0d9 100644 +--- a/src/widgets/settings.rs ++++ b/src/widgets/settings.rs +@@ -22,7 +22,7 @@ pub struct SettingsWidget { + + impl SettingsWidget { + pub fn new(client: Arc>) -> Rc { +- let builder = gtk::Builder::new_from_resource("/com/belmoussaoui/ReadItLater/settings.ui"); ++ let builder = gtk::Builder::from_resource("/com/belmoussaoui/ReadItLater/settings.ui"); + get_widget!(builder, libhandy::PreferencesWindow, settings_window); + + let window = Rc::new(Self { +@@ -36,12 +36,7 @@ impl SettingsWidget { + } + + fn init(&self, settings: Rc, client: Arc>) { +- self.widget.connect_key_press_event(|w, k| { +- if k.get_keyval() == gdk::enums::key::Escape { +- w.destroy(); +- } +- gtk::Inhibit(false) +- }); ++ self.widget.connect_key_press_event(|_w, _k| gtk::Inhibit(false)); + + let (sender, receiver) = glib::MainContext::channel(glib::PRIORITY_DEFAULT); + receiver.attach(None, move |action| settings.do_action(action)); +diff --git a/src/widgets/window.rs b/src/widgets/window.rs +index d540433..0adc1f7 100644 +--- a/src/widgets/window.rs ++++ b/src/widgets/window.rs +@@ -1,14 +1,12 @@ + use gio::prelude::*; + use glib::Sender; + use gtk::prelude::*; +-use libhandy::prelude::*; + use url::Url; + + use crate::application::Action; + use crate::config::PROFILE; + use crate::models::{Article, ArticlesManager}; + use crate::views::{ArticleView, ArticlesView, LoginView}; +-use crate::window_state; + + #[derive(Copy, Clone, Debug, PartialEq)] + pub enum View { +@@ -31,11 +29,11 @@ pub struct Window { + + impl Window { + pub fn new(sender: Sender) -> Self { +- let builder = gtk::Builder::new_from_resource("/com/belmoussaoui/ReadItLater/window.ui"); ++ let builder = gtk::Builder::from_resource("/com/belmoussaoui/ReadItLater/window.ui"); + get_widget!(builder, gtk::ApplicationWindow, window); + + if PROFILE == "Devel" { +- window.get_style_context().add_class("devel"); ++ window.style_context().add_class("devel"); + } + let actions = gio::SimpleActionGroup::new(); + +@@ -73,10 +71,11 @@ impl Window { + notification_label.set_text(&message); + notification.set_reveal_child(true); + +- gtk::timeout_add_seconds(5, move || { +- notification.set_reveal_child(false); +- glib::Continue(false) +- }); ++ // let time = std::time::Duration::new(5, 0); ++ // glib::timeout_add(time, move || { ++ // notification.set_reveal_child(false); ++ // glib::Continue(false) ++ // }); + } + + pub fn previous_view(&self) { +@@ -109,10 +108,11 @@ impl Window { + loading_progress.set_fraction(0.0); // Reset the fraction + } else { + loading_progress.pulse(); +- gtk::timeout_add(200, move || { +- loading_progress.pulse(); +- glib::Continue(loading_progress.get_visible()) +- }); ++ // let time = std::time::Duration::new(0, 200); ++ // glib::timeout_add(time, || { ++ // loading_progress.pulse(); ++ // glib::Continue(loading_progress.get_visible()) ++ // }); + } + } + View::NewArticle => { +@@ -127,43 +127,35 @@ impl Window { + + fn init(&self) { + // setup app menu +- let menu_builder = gtk::Builder::new_from_resource("/com/belmoussaoui/ReadItLater/menu.ui"); ++ let menu_builder = gtk::Builder::from_resource("/com/belmoussaoui/ReadItLater/menu.ui"); + get_widget!(menu_builder, gtk::PopoverMenu, popover_menu); + get_widget!(self.builder, gtk::MenuButton, appmenu_button); + appmenu_button.set_popover(Some(&popover_menu)); +- // load latest window state +- window_state::load(&self.widget); +- +- // save window state on delete event +- self.widget.connect_delete_event(move |window, _| { +- window_state::save(&window); +- Inhibit(false) +- }); + + get_widget!(self.builder, libhandy::Squeezer, squeezer); + get_widget!(self.builder, gtk::Stack, headerbar_stack); + get_widget!(self.builder, libhandy::ViewSwitcherBar, switcher_bar); + get_widget!(self.builder, gtk::Label, title_label); + +- squeezer.connect_property_visible_child_notify(move |squeezer| { +- let visible_headerbar_stack = headerbar_stack.get_visible_child_name(); +- if let Some(visible_child) = squeezer.get_visible_child() { ++ squeezer.connect_visible_child_notify(move |squeezer| { ++ let visible_headerbar_stack = headerbar_stack.visible_child_name(); ++ if let Some(visible_child) = squeezer.visible_child() { + switcher_bar.set_reveal(visible_child == title_label && visible_headerbar_stack == Some("articles".into())); + } + }); + self.widget.connect_size_allocate(move |widget, allocation| { + if allocation.width <= 450 { +- widget.get_style_context().add_class("sm"); +- widget.get_style_context().remove_class("md"); +- widget.get_style_context().remove_class("lg"); ++ widget.style_context().add_class("sm"); ++ widget.style_context().remove_class("md"); ++ widget.style_context().remove_class("lg"); + } else if allocation.width <= 600 { +- widget.get_style_context().add_class("md"); +- widget.get_style_context().remove_class("sm"); +- widget.get_style_context().remove_class("lg"); ++ widget.style_context().add_class("md"); ++ widget.style_context().remove_class("sm"); ++ widget.style_context().remove_class("lg"); + } else { +- widget.get_style_context().add_class("lg"); +- widget.get_style_context().remove_class("sm"); +- widget.get_style_context().remove_class("md"); ++ widget.style_context().add_class("lg"); ++ widget.style_context().remove_class("sm"); ++ widget.style_context().remove_class("md"); + } + }); + } +@@ -185,8 +177,8 @@ impl Window { + main_stack.add_named(&self.article_view.get_widget(), &self.article_view.name); + self.widget.insert_action_group("article", self.article_view.get_actions()); + +- main_stack.connect_property_visible_child_name_notify(clone!(@strong self.article_view as article_view => move |stack| { +- if let Some(view_name) = stack.get_visible_child_name() { ++ main_stack.connect_visible_child_name_notify(clone!(@strong self.article_view as article_view => move |stack| { ++ if let Some(view_name) = stack.visible_child_name() { + article_view.set_enable_actions(view_name == "article"); + } + })); +@@ -194,7 +186,7 @@ impl Window { + get_widget!(self.builder, gtk::Button, save_article_btn); + get_widget!(self.builder, gtk::Entry, article_url_entry); + save_article_btn.connect_clicked(clone!(@strong self.sender as sender => move |_| { +- if let Ok(url) = Url::parse(&article_url_entry.get_text().unwrap()) { ++ if let Ok(url) = Url::parse(&article_url_entry.text()) { + send!(sender, Action::SaveArticle(url)); + article_url_entry.set_text(""); + } +@@ -210,7 +202,7 @@ impl Window { + notification.set_reveal_child(false); + }); + +- let builder = gtk::Builder::new_from_resource("/com/belmoussaoui/ReadItLater/shortcuts.ui"); ++ let builder = gtk::Builder::from_resource("/com/belmoussaoui/ReadItLater/shortcuts.ui"); + get_widget!(builder, gtk::ShortcutsWindow, shortcuts); + self.widget.set_help_overlay(Some(&shortcuts)); + +diff --git a/src/window_state.rs b/src/window_state.rs +deleted file mode 100644 +index 595cf2f..0000000 +--- a/src/window_state.rs ++++ /dev/null +@@ -1,34 +0,0 @@ +-use crate::settings::{Key, SettingsManager}; +-use gtk::prelude::GtkWindowExt; +- +-pub fn load(window: >k::ApplicationWindow) { +- let width = SettingsManager::get_integer(Key::WindowWidth); +- let height = SettingsManager::get_integer(Key::WindowHeight); +- +- if width > -1 && height > -1 { +- window.resize(width, height); +- } +- +- let x = SettingsManager::get_integer(Key::WindowX); +- let y = SettingsManager::get_integer(Key::WindowY); +- let is_maximized = SettingsManager::get_boolean(Key::IsMaximized); +- +- if x > -1 && y > -1 { +- window.move_(x, y); +- } else if is_maximized { +- window.maximize(); +- } +-} +- +-pub fn save(window: >k::ApplicationWindow) { +- let size = window.get_size(); +- let position = window.get_position(); +- +- SettingsManager::set_integer(Key::WindowWidth, size.0); +- SettingsManager::set_integer(Key::WindowHeight, size.1); +- +- SettingsManager::set_boolean(Key::IsMaximized, window.is_maximized()); +- +- SettingsManager::set_integer(Key::WindowX, position.0); +- SettingsManager::set_integer(Key::WindowY, position.1); +-} +-- +2.31.1 + diff --git a/testing/read-it-later/0002-Cargo-Update-most-remainig-dependencies.patch b/testing/read-it-later/0002-Cargo-Update-most-remainig-dependencies.patch new file mode 100644 index 00000000000..68e19eeb066 --- /dev/null +++ b/testing/read-it-later/0002-Cargo-Update-most-remainig-dependencies.patch @@ -0,0 +1,1711 @@ +From 996503891628cd998868d699d76985ba5e07d84c Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 25 Aug 2021 20:04:37 +1000 +Subject: [PATCH 2/4] Cargo: Update most remainig dependencies + +Signed-off-by: Alistair Francis +--- + Cargo.lock | 917 +++++++++++++++++++++++++++++----------------------- + Cargo.toml | 24 +- + src/main.rs | 4 +- + 3 files changed, 528 insertions(+), 417 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index f74e3e9..42f21e6 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -71,7 +71,7 @@ version = "3.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "2e445c26125ff80316eaea16e812d717b147b82a68682bd4730f74d4845c8b35" + dependencies = [ +- "html5ever 0.25.1", ++ "html5ever", + "lazy_static", + "maplit", + "markup5ever_rcdom", +@@ -86,6 +86,12 @@ version = "1.0.43" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "28ae2b3dec75a406790005a200b1bd89785afc02517a00ca99ecfe093ee9e6cf" + ++[[package]] ++name = "arrayvec" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" ++ + [[package]] + name = "async-channel" + version = "1.6.1" +@@ -97,6 +103,16 @@ dependencies = [ + "futures-core", + ] + ++[[package]] ++name = "async-dup" ++version = "1.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7427a12b8dc09291528cfb1da2447059adb4a257388c2acd6497a79d55cf6f7c" ++dependencies = [ ++ "futures-io", ++ "simple-mutex", ++] ++ + [[package]] + name = "async-executor" + version = "1.4.1" +@@ -127,6 +143,24 @@ dependencies = [ + "once_cell", + ] + ++[[package]] ++name = "async-h1" ++version = "2.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cc5142de15b549749cce62923a50714b0d7b77f5090ced141599e78899865451" ++dependencies = [ ++ "async-channel", ++ "async-dup", ++ "async-std", ++ "byte-pool", ++ "futures-core", ++ "http-types", ++ "httparse", ++ "lazy_static", ++ "log", ++ "pin-project", ++] ++ + [[package]] + name = "async-io" + version = "1.6.0" +@@ -164,6 +198,18 @@ dependencies = [ + "event-listener", + ] + ++[[package]] ++name = "async-native-tls" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9e9e7a929bd34c68a82d58a4de7f86fffdaf97fb2af850162a7bb19dd7269b33" ++dependencies = [ ++ "async-std", ++ "native-tls", ++ "thiserror", ++ "url", ++] ++ + [[package]] + name = "async-std" + version = "1.9.0" +@@ -174,7 +220,7 @@ dependencies = [ + "async-global-executor", + "async-io", + "async-lock", +- "crossbeam-utils 0.8.5", ++ "crossbeam-utils", + "futures-channel", + "futures-core", + "futures-io", +@@ -249,12 +295,6 @@ dependencies = [ + "winapi", + ] + +-[[package]] +-name = "autocfg" +-version = "0.1.7" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" +- + [[package]] + name = "autocfg" + version = "1.0.1" +@@ -279,6 +319,12 @@ version = "1.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + ++[[package]] ++name = "block" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" ++ + [[package]] + name = "block-buffer" + version = "0.9.0" +@@ -325,20 +371,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" + + [[package]] +-name = "byteorder" +-version = "1.4.3" ++name = "byte-pool" ++version = "0.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" ++checksum = "f8c7230ddbb427b1094d477d821a99f3f54d36333178eeb806e279bcdcecf0ca" ++dependencies = [ ++ "crossbeam-queue", ++ "stable_deref_trait", ++] + + [[package]] +-name = "bytes" +-version = "0.4.12" ++name = "byteorder" ++version = "1.4.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" +-dependencies = [ +- "byteorder", +- "iovec", +-] ++checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + + [[package]] + name = "bytes" +@@ -397,12 +443,6 @@ dependencies = [ + "smallvec", + ] + +-[[package]] +-name = "cfg-if" +-version = "0.1.10" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +- + [[package]] + name = "cfg-if" + version = "1.0.0" +@@ -433,21 +473,23 @@ dependencies = [ + ] + + [[package]] +-name = "cloudabi" +-version = "0.0.3" ++name = "concurrent-queue" ++version = "1.2.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" ++checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3" + dependencies = [ +- "bitflags", ++ "cache-padded", + ] + + [[package]] +-name = "concurrent-queue" +-version = "1.2.2" ++name = "config" ++version = "0.10.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3" ++checksum = "19b076e143e1d9538dde65da30f8481c2a6c44040edb8e02b9bf1351edb92ce3" + dependencies = [ +- "cache-padded", ++ "lazy_static", ++ "nom", ++ "serde", + ] + + [[package]] +@@ -456,6 +498,12 @@ version = "0.4.8" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f92cfa0fd5690b3cf8c1ef2cabbd9b7ef22fa53cf5e1f92b05103f6d5d1cf6e7" + ++[[package]] ++name = "convert_case" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" ++ + [[package]] + name = "cookie" + version = "0.14.4" +@@ -473,6 +521,22 @@ dependencies = [ + "version_check", + ] + ++[[package]] ++name = "core-foundation" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" ++dependencies = [ ++ "core-foundation-sys", ++ "libc", ++] ++ ++[[package]] ++name = "core-foundation-sys" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" ++ + [[package]] + name = "cpufeatures" + version = "0.1.5" +@@ -489,24 +553,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" + + [[package]] +-name = "crossbeam-channel" +-version = "0.4.4" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" +-dependencies = [ +- "crossbeam-utils 0.7.2", +- "maybe-uninit", +-] +- +-[[package]] +-name = "crossbeam-utils" +-version = "0.7.2" ++name = "crossbeam-queue" ++version = "0.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" ++checksum = "9b10ddc024425c88c2ad148c1b0fd53f4c6d38db9697c9f1588381212fa657c9" + dependencies = [ +- "autocfg 1.0.1", +- "cfg-if 0.1.10", +- "lazy_static", ++ "cfg-if", ++ "crossbeam-utils", + ] + + [[package]] +@@ -515,7 +568,7 @@ version = "0.8.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" + dependencies = [ +- "cfg-if 1.0.0", ++ "cfg-if", + "lazy_static", + ] + +@@ -529,6 +582,33 @@ dependencies = [ + "subtle", + ] + ++[[package]] ++name = "cssparser" ++version = "0.27.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" ++dependencies = [ ++ "cssparser-macros", ++ "dtoa-short", ++ "itoa", ++ "matches", ++ "phf", ++ "proc-macro2", ++ "quote", ++ "smallvec", ++ "syn", ++] ++ ++[[package]] ++name = "cssparser-macros" ++version = "0.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e" ++dependencies = [ ++ "quote", ++ "syn", ++] ++ + [[package]] + name = "ctor" + version = "0.1.20" +@@ -585,7 +665,7 @@ version = "4.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" + dependencies = [ +- "cfg-if 1.0.0", ++ "cfg-if", + "num_cpus", + ] + +@@ -598,6 +678,33 @@ dependencies = [ + "libc", + ] + ++[[package]] ++name = "deadpool" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3d126179d86aee4556e54f5f3c6bf6d9884e7cc52cef82f77ee6f90a7747616d" ++dependencies = [ ++ "async-trait", ++ "config", ++ "crossbeam-queue", ++ "num_cpus", ++ "serde", ++ "tokio", ++] ++ ++[[package]] ++name = "derive_more" ++version = "0.99.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "40eebddd2156ce1bb37b20bbe5151340a31828b1f2d22ba4141f3531710e38df" ++dependencies = [ ++ "convert_case", ++ "proc-macro2", ++ "quote", ++ "rustc_version 0.3.3", ++ "syn", ++] ++ + [[package]] + name = "diesel" + version = "1.4.7" +@@ -647,6 +754,21 @@ version = "1.0.4" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" + ++[[package]] ++name = "dtoa" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" ++ ++[[package]] ++name = "dtoa-short" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bde03329ae10e79ede66c9ce4dc930aa8599043b0743008548680f25b91502d6" ++dependencies = [ ++ "dtoa", ++] ++ + [[package]] + name = "either" + version = "1.6.1" +@@ -659,14 +781,14 @@ version = "0.8.28" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065" + dependencies = [ +- "cfg-if 1.0.0", ++ "cfg-if", + ] + + [[package]] + name = "env_logger" +-version = "0.6.2" ++version = "0.7.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3" ++checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" + dependencies = [ + "atty", + "humantime", +@@ -717,6 +839,21 @@ version = "1.0.7" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + ++[[package]] ++name = "foreign-types" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" ++dependencies = [ ++ "foreign-types-shared", ++] ++ ++[[package]] ++name = "foreign-types-shared" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" ++ + [[package]] + name = "form_urlencoded" + version = "1.0.1" +@@ -743,12 +880,6 @@ dependencies = [ + "new_debug_unreachable", + ] + +-[[package]] +-name = "futures" +-version = "0.1.31" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" +- + [[package]] + name = "futures" + version = "0.3.16" +@@ -819,7 +950,7 @@ version = "0.3.16" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57" + dependencies = [ +- "autocfg 1.0.1", ++ "autocfg", + "proc-macro-hack", + "proc-macro2", + "quote", +@@ -844,8 +975,7 @@ version = "0.3.16" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78" + dependencies = [ +- "autocfg 1.0.1", +- "futures 0.1.31", ++ "autocfg", + "futures-channel", + "futures-core", + "futures-io", +@@ -858,7 +988,15 @@ dependencies = [ + "proc-macro-hack", + "proc-macro-nested", + "slab", +- "tokio-io", ++] ++ ++[[package]] ++name = "fxhash" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" ++dependencies = [ ++ "byteorder", + ] + + [[package]] +@@ -941,7 +1079,7 @@ version = "0.1.16" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" + dependencies = [ +- "cfg-if 1.0.0", ++ "cfg-if", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", + ] +@@ -952,16 +1090,16 @@ version = "0.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" + dependencies = [ +- "cfg-if 1.0.0", ++ "cfg-if", + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + ] + + [[package]] + name = "gettext-rs" +-version = "0.4.4" ++version = "0.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "df454a42d8a718280c78666efe0707c120873736961ae91ead898f17ac66ce7c" ++checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" + dependencies = [ + "gettext-sys", + "locale_config", +@@ -969,11 +1107,12 @@ dependencies = [ + + [[package]] + name = "gettext-sys" +-version = "0.19.9" ++version = "0.21.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e034c4ba5bb796730a6cc5eb0d654c16885006a7c3d6c6603581ed809434f153" ++checksum = "afa9e06ab9e7514cc9ae668ea3b71ea1536259d767dff0289ac23ad134f99929" + dependencies = [ + "cc", ++ "temp-dir", + ] + + [[package]] +@@ -1220,13 +1359,13 @@ dependencies = [ + + [[package]] + name = "html2pango" +-version = "0.3.3" ++version = "0.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "469b284033c3c93e7df758d316cb2e0da4408e4138d5add903b8be356a841738" ++checksum = "a2a7f65103a4da1b629f519474a51ae89077c61f88954eb9e6df7b22e1a7fd98" + dependencies = [ + "ammonia", + "anyhow", +- "html5ever 0.25.1", ++ "html5ever", + "lazy_static", + "linkify", + "maplit", +@@ -1234,20 +1373,6 @@ dependencies = [ + "regex", + ] + +-[[package]] +-name = "html5ever" +-version = "0.24.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "025483b0a1e4577bb28578318c886ee5f817dda6eb62473269349044406644cb" +-dependencies = [ +- "log", +- "mac", +- "markup5ever 0.9.0", +- "proc-macro2", +- "quote", +- "syn", +-] +- + [[package]] + name = "html5ever" + version = "0.25.1" +@@ -1256,23 +1381,12 @@ checksum = "aafcf38a1a36118242d29b92e1b08ef84e67e4a5ed06e0a80be20e6a32bfed6b" + dependencies = [ + "log", + "mac", +- "markup5ever 0.10.1", ++ "markup5ever", + "proc-macro2", + "quote", + "syn", + ] + +-[[package]] +-name = "http" +-version = "0.1.21" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0" +-dependencies = [ +- "bytes 0.4.12", +- "fnv", +- "itoa", +-] +- + [[package]] + name = "http" + version = "0.2.4" +@@ -1284,34 +1398,27 @@ dependencies = [ + "itoa", + ] + +-[[package]] +-name = "http-client" +-version = "1.1.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bf86227a76b64ebd37d442853370f7177be4fd3ae6f9ff5c9e0349643e1cb332" +-dependencies = [ +- "futures 0.3.16", +- "http 0.1.21", +- "isahc 0.8.2", +- "js-sys", +- "wasm-bindgen", +- "wasm-bindgen-futures", +- "web-sys", +-] +- + [[package]] + name = "http-client" + version = "6.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ea880b03c18a7e981d7fb3608b8904a98425d53c440758fcebf7d934aa56547c" + dependencies = [ ++ "async-h1", ++ "async-native-tls", + "async-std", + "async-trait", +- "cfg-if 1.0.0", ++ "cfg-if", + "dashmap", ++ "deadpool", ++ "futures", + "http-types", +- "isahc 0.9.14", ++ "isahc", ++ "js-sys", + "log", ++ "wasm-bindgen", ++ "wasm-bindgen-futures", ++ "web-sys", + ] + + [[package]] +@@ -1336,6 +1443,12 @@ dependencies = [ + "url", + ] + ++[[package]] ++name = "httparse" ++version = "1.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" ++ + [[package]] + name = "humantime" + version = "1.3.0" +@@ -1368,37 +1481,7 @@ version = "0.1.10" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d" + dependencies = [ +- "cfg-if 1.0.0", +-] +- +-[[package]] +-name = "iovec" +-version = "0.1.4" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +-dependencies = [ +- "libc", +-] +- +-[[package]] +-name = "isahc" +-version = "0.8.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c45d8c41e6f0b5aa495fd2577e6068e100f57eb87c4b353b0dab20bb53a56035" +-dependencies = [ +- "bytes 0.4.12", +- "crossbeam-channel", +- "crossbeam-utils 0.7.2", +- "curl", +- "curl-sys", +- "futures-channel", +- "futures-io", +- "futures-util", +- "http 0.1.21", +- "lazy_static", +- "log", +- "slab", +- "sluice", ++ "cfg-if", + ] + + [[package]] +@@ -1408,13 +1491,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e2948a0ce43e2c2ef11d7edf6816508998d99e13badd1150be0914205df9388a" + dependencies = [ + "bytes 0.5.6", +- "crossbeam-utils 0.8.5", ++ "crossbeam-utils", + "curl", + "curl-sys", + "encoding_rs", + "flume", + "futures-lite", +- "http 0.2.4", ++ "http", + "log", + "mime", + "once_cell", +@@ -1469,6 +1552,18 @@ dependencies = [ + "wasm-bindgen", + ] + ++[[package]] ++name = "kuchiki" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358" ++dependencies = [ ++ "cssparser", ++ "html5ever", ++ "matches", ++ "selectors", ++] ++ + [[package]] + name = "kv-log-macro" + version = "1.0.7" +@@ -1484,6 +1579,19 @@ version = "1.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + ++[[package]] ++name = "lexical-core" ++version = "0.7.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" ++dependencies = [ ++ "arrayvec", ++ "bitflags", ++ "cfg-if", ++ "ryu", ++ "static_assertions", ++] ++ + [[package]] + name = "libc" + version = "0.2.100" +@@ -1569,11 +1677,13 @@ dependencies = [ + + [[package]] + name = "locale_config" +-version = "0.2.3" ++version = "0.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "73ac19ebe45489e5d53b4346d8b90bb3dd03275c5fdf2ce22a982516d86b535c" ++checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" + dependencies = [ + "lazy_static", ++ "objc", ++ "objc-foundation", + "regex", + "winapi", + ] +@@ -1593,7 +1703,7 @@ version = "0.4.14" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" + dependencies = [ +- "cfg-if 1.0.0", ++ "cfg-if", + "value-bag", + ] + +@@ -1603,6 +1713,15 @@ version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" + ++[[package]] ++name = "malloc_buf" ++version = "0.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" ++dependencies = [ ++ "libc", ++] ++ + [[package]] + name = "maplit" + version = "1.0.2" +@@ -1611,32 +1730,15 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + + [[package]] + name = "markup5ever" +-version = "0.9.0" ++version = "0.10.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "65381d9d47506b8592b97c4efd936afcf673b09b059f2bef39c7211ee78b9d03" ++checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" + dependencies = [ + "log", +- "phf 0.7.24", +- "phf_codegen 0.7.24", +- "serde", +- "serde_derive", +- "serde_json", +- "string_cache 0.7.5", +- "string_cache_codegen 0.4.4", +- "tendril", +-] +- +-[[package]] +-name = "markup5ever" +-version = "0.10.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" +-dependencies = [ +- "log", +- "phf 0.8.0", +- "phf_codegen 0.8.0", +- "string_cache 0.8.1", +- "string_cache_codegen 0.5.1", ++ "phf", ++ "phf_codegen", ++ "string_cache", ++ "string_cache_codegen", + "tendril", + ] + +@@ -1646,8 +1748,8 @@ version = "0.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f015da43bcd8d4f144559a3423f4591d69b8ce0652c905374da7205df336ae2b" + dependencies = [ +- "html5ever 0.25.1", +- "markup5ever 0.10.1", ++ "html5ever", ++ "markup5ever", + "tendril", + "xml5ever", + ] +@@ -1658,12 +1760,6 @@ version = "0.1.9" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" + +-[[package]] +-name = "maybe-uninit" +-version = "2.0.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" +- + [[package]] + name = "memchr" + version = "2.4.1" +@@ -1676,7 +1772,7 @@ version = "0.6.4" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" + dependencies = [ +- "autocfg 1.0.1", ++ "autocfg", + ] + + [[package]] +@@ -1716,12 +1812,47 @@ dependencies = [ + "unicase", + ] + ++[[package]] ++name = "native-tls" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d" ++dependencies = [ ++ "lazy_static", ++ "libc", ++ "log", ++ "openssl", ++ "openssl-probe", ++ "openssl-sys", ++ "schannel", ++ "security-framework", ++ "security-framework-sys", ++ "tempfile", ++] ++ + [[package]] + name = "new_debug_unreachable" + version = "1.0.4" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" + ++[[package]] ++name = "nodrop" ++version = "0.1.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" ++ ++[[package]] ++name = "nom" ++version = "5.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" ++dependencies = [ ++ "lexical-core", ++ "memchr", ++ "version_check", ++] ++ + [[package]] + name = "num" + version = "0.3.1" +@@ -1742,7 +1873,7 @@ version = "0.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7d0a3d5e207573f948a9e5376662aa743a2ea13f7c50a554d7af443a73fbfeba" + dependencies = [ +- "autocfg 1.0.1", ++ "autocfg", + "num-integer", + "num-traits", + ] +@@ -1762,7 +1893,7 @@ version = "0.1.44" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" + dependencies = [ +- "autocfg 1.0.1", ++ "autocfg", + "num-traits", + ] + +@@ -1772,7 +1903,7 @@ version = "0.1.42" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59" + dependencies = [ +- "autocfg 1.0.1", ++ "autocfg", + "num-integer", + "num-traits", + ] +@@ -1783,7 +1914,7 @@ version = "0.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" + dependencies = [ +- "autocfg 1.0.1", ++ "autocfg", + "num-bigint", + "num-integer", + "num-traits", +@@ -1795,7 +1926,7 @@ version = "0.2.14" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" + dependencies = [ +- "autocfg 1.0.1", ++ "autocfg", + ] + + [[package]] +@@ -1808,6 +1939,35 @@ dependencies = [ + "libc", + ] + ++[[package]] ++name = "objc" ++version = "0.2.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" ++dependencies = [ ++ "malloc_buf", ++] ++ ++[[package]] ++name = "objc-foundation" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" ++dependencies = [ ++ "block", ++ "objc", ++ "objc_id", ++] ++ ++[[package]] ++name = "objc_id" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" ++dependencies = [ ++ "objc", ++] ++ + [[package]] + name = "once_cell" + version = "1.8.0" +@@ -1820,6 +1980,20 @@ version = "0.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + ++[[package]] ++name = "openssl" ++version = "0.10.36" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8d9facdb76fec0b73c406f125d44d86fdad818d66fef0531eec9233ca425ff4a" ++dependencies = [ ++ "bitflags", ++ "cfg-if", ++ "foreign-types", ++ "libc", ++ "once_cell", ++ "openssl-sys", ++] ++ + [[package]] + name = "openssl-probe" + version = "0.1.4" +@@ -1832,7 +2006,7 @@ version = "0.9.66" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "1996d2d305e561b70d1ee0c53f1542833f4e1ac6ce9a6708b6ff2738ca67dc82" + dependencies = [ +- "autocfg 1.0.1", ++ "autocfg", + "cc", + "libc", + "pkg-config", +@@ -1887,7 +2061,7 @@ version = "0.8.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" + dependencies = [ +- "cfg-if 1.0.0", ++ "cfg-if", + "instant", + "libc", + "redox_syscall", +@@ -1910,32 +2084,15 @@ dependencies = [ + "ucd-trie", + ] + +-[[package]] +-name = "phf" +-version = "0.7.24" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" +-dependencies = [ +- "phf_shared 0.7.24", +-] +- + [[package]] + name = "phf" + version = "0.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" + dependencies = [ +- "phf_shared 0.8.0", +-] +- +-[[package]] +-name = "phf_codegen" +-version = "0.7.24" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" +-dependencies = [ +- "phf_generator 0.7.24", +- "phf_shared 0.7.24", ++ "phf_macros", ++ "phf_shared", ++ "proc-macro-hack", + ] + + [[package]] +@@ -1944,18 +2101,8 @@ version = "0.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" + dependencies = [ +- "phf_generator 0.8.0", +- "phf_shared 0.8.0", +-] +- +-[[package]] +-name = "phf_generator" +-version = "0.7.24" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" +-dependencies = [ +- "phf_shared 0.7.24", +- "rand 0.6.5", ++ "phf_generator", ++ "phf_shared", + ] + + [[package]] +@@ -1964,17 +2111,22 @@ version = "0.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" + dependencies = [ +- "phf_shared 0.8.0", ++ "phf_shared", + "rand 0.7.3", + ] + + [[package]] +-name = "phf_shared" +-version = "0.7.24" ++name = "phf_macros" ++version = "0.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" ++checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" + dependencies = [ +- "siphasher 0.2.3", ++ "phf_generator", ++ "phf_shared", ++ "proc-macro-hack", ++ "proc-macro2", ++ "quote", ++ "syn", + ] + + [[package]] +@@ -1983,7 +2135,7 @@ version = "0.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" + dependencies = [ +- "siphasher 0.3.6", ++ "siphasher", + ] + + [[package]] +@@ -2030,7 +2182,7 @@ version = "2.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "92341d779fa34ea8437ef4d82d440d5e1ce3f3ff7f824aa64424cd481f9a1f25" + dependencies = [ +- "cfg-if 1.0.0", ++ "cfg-if", + "libc", + "log", + "wepoll-ffi", +@@ -2062,11 +2214,10 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + + [[package]] + name = "pretty_env_logger" +-version = "0.3.1" ++version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "717ee476b1690853d222af4634056d830b5197ffd747726a9a1eee6da9f49074" ++checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d" + dependencies = [ +- "chrono", + "env_logger", + "log", + ] +@@ -2175,25 +2326,6 @@ dependencies = [ + "winapi", + ] + +-[[package]] +-name = "rand" +-version = "0.6.5" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" +-dependencies = [ +- "autocfg 0.1.7", +- "libc", +- "rand_chacha 0.1.1", +- "rand_core 0.4.2", +- "rand_hc 0.1.0", +- "rand_isaac", +- "rand_jitter", +- "rand_os", +- "rand_pcg 0.1.2", +- "rand_xorshift", +- "winapi", +-] +- + [[package]] + name = "rand" + version = "0.7.3" +@@ -2205,7 +2337,7 @@ dependencies = [ + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc 0.2.0", +- "rand_pcg 0.2.1", ++ "rand_pcg", + ] + + [[package]] +@@ -2220,16 +2352,6 @@ dependencies = [ + "rand_hc 0.3.1", + ] + +-[[package]] +-name = "rand_chacha" +-version = "0.1.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" +-dependencies = [ +- "autocfg 0.1.7", +- "rand_core 0.3.1", +-] +- + [[package]] + name = "rand_chacha" + version = "0.2.2" +@@ -2283,15 +2405,6 @@ dependencies = [ + "getrandom 0.2.3", + ] + +-[[package]] +-name = "rand_hc" +-version = "0.1.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" +-dependencies = [ +- "rand_core 0.3.1", +-] +- + [[package]] + name = "rand_hc" + version = "0.2.0" +@@ -2310,50 +2423,6 @@ dependencies = [ + "rand_core 0.6.3", + ] + +-[[package]] +-name = "rand_isaac" +-version = "0.1.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" +-dependencies = [ +- "rand_core 0.3.1", +-] +- +-[[package]] +-name = "rand_jitter" +-version = "0.1.4" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" +-dependencies = [ +- "libc", +- "rand_core 0.4.2", +- "winapi", +-] +- +-[[package]] +-name = "rand_os" +-version = "0.1.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" +-dependencies = [ +- "cloudabi", +- "fuchsia-cprng", +- "libc", +- "rand_core 0.4.2", +- "rdrand", +- "winapi", +-] +- +-[[package]] +-name = "rand_pcg" +-version = "0.1.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" +-dependencies = [ +- "autocfg 0.1.7", +- "rand_core 0.4.2", +-] +- + [[package]] + name = "rand_pcg" + version = "0.2.1" +@@ -2363,15 +2432,6 @@ dependencies = [ + "rand_core 0.5.1", + ] + +-[[package]] +-name = "rand_xorshift" +-version = "0.1.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" +-dependencies = [ +- "rand_core 0.3.1", +-] +- + [[package]] + name = "rdrand" + version = "0.4.0" +@@ -2391,7 +2451,7 @@ dependencies = [ + "chrono", + "diesel", + "diesel_migrations", +- "futures 0.3.16", ++ "futures", + "gdk", + "gdk-pixbuf", + "gettext-rs", +@@ -2400,8 +2460,8 @@ dependencies = [ + "gtk", + "gtk-macros", + "html2pango", +- "http-client 1.1.1", +- "isahc 0.9.14", ++ "http-client", ++ "isahc", + "lazy_static", + "libhandy", + "log", +@@ -2414,8 +2474,8 @@ dependencies = [ + "serde", + "serde_derive", + "serde_json", +- "strum 0.16.0", +- "strum_macros 0.16.0", ++ "strum 0.21.0", ++ "strum_macros 0.21.1", + "url", + "wallabag-api", + "webkit2gtk", +@@ -2447,6 +2507,15 @@ version = "0.6.25" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" + ++[[package]] ++name = "remove_dir_all" ++version = "0.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" ++dependencies = [ ++ "winapi", ++] ++ + [[package]] + name = "rust-crypto" + version = "0.2.36" +@@ -2492,11 +2561,12 @@ checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" + + [[package]] + name = "sanitize_html" +-version = "0.6.0" ++version = "0.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "422bdfab5da6695bdc9f28a25087f6a01bf35c0ce2f51eeb2608db8b464a60a8" ++checksum = "2cd7ea46188a5c6961a44b4c25ed280ea85a1e0b6a129f9bbd81bbf87261c52b" + dependencies = [ +- "html5ever 0.24.1", ++ "html5ever", ++ "kuchiki", + "lazy_static", + "regex", + ] +@@ -2542,6 +2612,49 @@ dependencies = [ + "sha2", + ] + ++[[package]] ++name = "security-framework" ++version = "2.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "23a2ac85147a3a11d77ecf1bc7166ec0b92febfa4461c37944e180f319ece467" ++dependencies = [ ++ "bitflags", ++ "core-foundation", ++ "core-foundation-sys", ++ "libc", ++ "security-framework-sys", ++] ++ ++[[package]] ++name = "security-framework-sys" ++version = "2.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7e4effb91b4b8b6fb7732e670b6cee160278ff8e6bf485c7805d9e319d76e284" ++dependencies = [ ++ "core-foundation-sys", ++ "libc", ++] ++ ++[[package]] ++name = "selectors" ++version = "0.22.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" ++dependencies = [ ++ "bitflags", ++ "cssparser", ++ "derive_more", ++ "fxhash", ++ "log", ++ "matches", ++ "phf", ++ "phf_codegen", ++ "precomputed-hash", ++ "servo_arc", ++ "smallvec", ++ "thin-slice", ++] ++ + [[package]] + name = "semver" + version = "0.9.0" +@@ -2629,6 +2742,16 @@ dependencies = [ + "serde", + ] + ++[[package]] ++name = "servo_arc" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" ++dependencies = [ ++ "nodrop", ++ "stable_deref_trait", ++] ++ + [[package]] + name = "sha1" + version = "0.6.0" +@@ -2642,17 +2765,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12" + dependencies = [ + "block-buffer", +- "cfg-if 1.0.0", ++ "cfg-if", + "cpufeatures", + "digest", + "opaque-debug", + ] + + [[package]] +-name = "siphasher" +-version = "0.2.3" ++name = "simple-mutex" ++version = "1.1.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" ++checksum = "38aabbeafa6f6dead8cebf246fe9fae1f9215c8d29b3a69f93bd62a9e4a3dcd6" ++dependencies = [ ++ "event-listener", ++] + + [[package]] + name = "siphasher" +@@ -2717,6 +2843,12 @@ dependencies = [ + "lock_api", + ] + ++[[package]] ++name = "stable_deref_trait" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" ++ + [[package]] + name = "standback" + version = "0.2.17" +@@ -2726,6 +2858,12 @@ dependencies = [ + "version_check", + ] + ++[[package]] ++name = "static_assertions" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" ++ + [[package]] + name = "stdweb" + version = "0.4.20" +@@ -2775,21 +2913,6 @@ version = "0.1.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" + +-[[package]] +-name = "string_cache" +-version = "0.7.5" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "89c058a82f9fd69b1becf8c274f412281038877c553182f1d02eb027045a2d67" +-dependencies = [ +- "lazy_static", +- "new_debug_unreachable", +- "phf_shared 0.7.24", +- "precomputed-hash", +- "serde", +- "string_cache_codegen 0.4.4", +- "string_cache_shared", +-] +- + [[package]] + name = "string_cache" + version = "0.8.1" +@@ -2798,48 +2921,23 @@ checksum = "8ddb1139b5353f96e429e1a5e19fbaf663bddedaa06d1dbd49f82e352601209a" + dependencies = [ + "lazy_static", + "new_debug_unreachable", +- "phf_shared 0.8.0", ++ "phf_shared", + "precomputed-hash", + "serde", + ] + +-[[package]] +-name = "string_cache_codegen" +-version = "0.4.4" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f0f45ed1b65bf9a4bf2f7b7dc59212d1926e9eaf00fa998988e420fd124467c6" +-dependencies = [ +- "phf_generator 0.7.24", +- "phf_shared 0.7.24", +- "proc-macro2", +- "quote", +- "string_cache_shared", +-] +- + [[package]] + name = "string_cache_codegen" + version = "0.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f24c8e5e19d22a726626f1a5e16fe15b132dcf21d10177fa5a45ce7962996b97" + dependencies = [ +- "phf_generator 0.8.0", +- "phf_shared 0.8.0", ++ "phf_generator", ++ "phf_shared", + "proc-macro2", + "quote", + ] + +-[[package]] +-name = "string_cache_shared" +-version = "0.3.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b1884d1bc09741d466d9b14e6d37ac89d6909cbcac41dd9ae982d4d063bbedfc" +- +-[[package]] +-name = "strum" +-version = "0.16.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6138f8f88a16d90134763314e3fc76fa3ed6a7db4725d6acf9a3ef95a3188d22" +- + [[package]] + name = "strum" + version = "0.18.0" +@@ -2852,18 +2950,6 @@ version = "0.21.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2" + +-[[package]] +-name = "strum_macros" +-version = "0.16.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0054a7df764039a6cd8592b9de84be4bec368ff081d203a7d5371cbfa8e65c81" +-dependencies = [ +- "heck", +- "proc-macro2", +- "quote", +- "syn", +-] +- + [[package]] + name = "strum_macros" + version = "0.18.0" +@@ -2902,11 +2988,11 @@ checksum = "73f856d60bdb4679fc9ec516c34093484e963431b5016a8429f85a8e74b5ccaa" + dependencies = [ + "async-std", + "async-trait", +- "cfg-if 1.0.0", ++ "cfg-if", + "encoding_rs", + "futures-util", + "getrandom 0.2.3", +- "http-client 6.5.1", ++ "http-client", + "http-types", + "log", + "mime_guess", +@@ -2961,6 +3047,26 @@ dependencies = [ + "version-compare 0.0.11", + ] + ++[[package]] ++name = "temp-dir" ++version = "0.1.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" ++ ++[[package]] ++name = "tempfile" ++version = "3.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "rand 0.8.4", ++ "redox_syscall", ++ "remove_dir_all", ++ "winapi", ++] ++ + [[package]] + name = "tendril" + version = "0.4.2" +@@ -2981,6 +3087,12 @@ dependencies = [ + "winapi-util", + ] + ++[[package]] ++name = "thin-slice" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" ++ + [[package]] + name = "thiserror" + version = "1.0.26" +@@ -3066,14 +3178,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + + [[package]] +-name = "tokio-io" +-version = "0.1.13" ++name = "tokio" ++version = "1.10.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" ++checksum = "92036be488bb6594459f2e03b60e42df6f937fe6ca5c5ffdcb539c6b84dc40f5" + dependencies = [ +- "bytes 0.4.12", +- "futures 0.1.31", +- "log", ++ "autocfg", ++ "pin-project-lite", + ] + + [[package]] +@@ -3091,7 +3202,7 @@ version = "0.1.26" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d" + dependencies = [ +- "cfg-if 1.0.0", ++ "cfg-if", + "log", + "pin-project-lite", + "tracing-attributes", +@@ -3277,7 +3388,7 @@ version = "0.2.76" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8ce9b1b516211d33767048e5d47fa2a381ed8b76fc48d2ce4aa39877f9f183e0" + dependencies = [ +- "cfg-if 1.0.0", ++ "cfg-if", + "wasm-bindgen-macro", + ] + +@@ -3302,7 +3413,7 @@ version = "0.4.26" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "95fded345a6559c2cfee778d562300c581f7d4ff3edb9b0d230d69800d213972" + dependencies = [ +- "cfg-if 1.0.0", ++ "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +@@ -3441,6 +3552,6 @@ checksum = "0b1b52e6e8614d4a58b8e70cf51ec0cc21b256ad8206708bcff8139b5bbd6a59" + dependencies = [ + "log", + "mac", +- "markup5ever 0.10.1", ++ "markup5ever", + "time 0.1.44", + ] +diff --git a/Cargo.toml b/Cargo.toml +index e010fa7..51e5850 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -14,28 +14,28 @@ gdk-pixbuf = "0.14" + log = "0.4" + libhandy = "0.8" + webkit2gtk = { version = "0.14", features = ["v2_6"] } +-gettext-rs= { version = "0.4", features = ["gettext-system"] } +-lazy_static = "1.3" ++gettext-rs= { version = "0.7", features = ["gettext-system"] } ++lazy_static = "1.4" + serde = "1.0" + serde_json = "1.0" + serde_derive = "1.0" + wallabag-api = "0.4.1" +-pretty_env_logger = "0.3" ++pretty_env_logger = "0.4" + diesel = { version = "1.4", features = ["sqlite", "r2d2", "chrono"] } + diesel_migrations = { version = "1.4", features = ["sqlite"] } + anyhow = "1.0" + isahc = "0.9" +-sanitize_html = "0.6" +-regex = "1.3" ++sanitize_html = "0.7" ++regex = "1.5" + secret-service = "1.0" + chrono = "0.4" +-url = "2.1" +-strum = "0.16" +-strum_macros = "0.16" +-html2pango = "0.3" ++url = "2.2" ++strum = "0.21" ++strum_macros = "0.21" ++html2pango = "0.4" + rust-crypto = "0.2" +-async-std = "1.4" ++async-std = "1.9" + futures = { version = "0.3", features = [ "thread-pool" ] } + gtk-macros = "0.3" +-http-client = { version = "1.1", features = ["native_client"] } +-once_cell = "1.8.0" ++http-client = { version = "6.5", features = ["native_client"] } ++once_cell = "1.8" +diff --git a/src/main.rs b/src/main.rs +index 5b93108..4d2b34c 100644 +--- a/src/main.rs ++++ b/src/main.rs +@@ -36,8 +36,8 @@ fn main() { + gtk::init().expect("Unable to start GTK3"); + // Prepare i18n + setlocale(LocaleCategory::LcAll, ""); +- bindtextdomain(config::GETTEXT_PACKAGE, config::LOCALEDIR); +- textdomain(config::GETTEXT_PACKAGE); ++ bindtextdomain(config::GETTEXT_PACKAGE, config::LOCALEDIR).unwrap(); ++ textdomain(config::GETTEXT_PACKAGE).unwrap(); + + glib::set_prgname(Some("read-it-later")); + glib::set_application_name(&format!("Read It Later{}", config::NAME_SUFFIX)); +-- +2.31.1 + diff --git a/testing/read-it-later/0003-gitlab-ci.yml-Update-the-containers.patch b/testing/read-it-later/0003-gitlab-ci.yml-Update-the-containers.patch new file mode 100644 index 00000000000..e27c4b9d1f5 --- /dev/null +++ b/testing/read-it-later/0003-gitlab-ci.yml-Update-the-containers.patch @@ -0,0 +1,43 @@ +From b0049b419efb41f05c0350dbf42fe5924e9312f8 Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 25 Aug 2021 20:26:18 +1000 +Subject: [PATCH 3/4] gitlab-ci.yml: Update the containers + +Signed-off-by: Alistair Francis +--- + .gitlab-ci.yml | 4 ++-- + build-aux/com.belmoussaoui.ReadItLaterDevel.json | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml +index aa093aa..bbfb685 100644 +--- a/.gitlab-ci.yml ++++ b/.gitlab-ci.yml +@@ -1,9 +1,9 @@ + include: + - project: 'gnome/citemplates' +- file: 'flatpak/flatpak-ci-initiative-sdk-extensions.yml' ++ file: 'flatpak/flatpak_ci_initiative.yml' + + flatpak: +- image: 'registry.gitlab.gnome.org/gnome/gnome-runtime-images/rust_bundle:3.36' ++ image: 'registry.gitlab.gnome.org/gnome/gnome-runtime-images/rust_bundle:40' + variables: + BUNDLE: "read-it-later-nightly.flatpak" + MANIFEST_PATH: "build-aux/com.belmoussaoui.ReadItLaterDevel.json" +diff --git a/build-aux/com.belmoussaoui.ReadItLaterDevel.json b/build-aux/com.belmoussaoui.ReadItLaterDevel.json +index 7e6171b..0eef02f 100644 +--- a/build-aux/com.belmoussaoui.ReadItLaterDevel.json ++++ b/build-aux/com.belmoussaoui.ReadItLaterDevel.json +@@ -1,7 +1,7 @@ + { + "app-id": "com.belmoussaoui.ReadItLaterDevel", + "runtime": "org.gnome.Platform", +- "runtime-version": "3.36", ++ "runtime-version": "40", + "sdk": "org.gnome.Sdk", + "sdk-extensions": ["org.freedesktop.Sdk.Extension.rust-stable"], + "command": "read-it-later", +-- +2.31.1 + diff --git a/testing/read-it-later/0004-Cargo.toml-Update-isahc.patch b/testing/read-it-later/0004-Cargo.toml-Update-isahc.patch new file mode 100644 index 00000000000..3dd6f52bede --- /dev/null +++ b/testing/read-it-later/0004-Cargo.toml-Update-isahc.patch @@ -0,0 +1,114 @@ +From b958ed12ae15ee681f1c208b6962bd3d558134cc Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 25 Aug 2021 21:01:40 +1000 +Subject: [PATCH 4/4] Cargo.toml: Update isahc + +Update isahc. As part of this we need to convert copy_to_file() to not +be async due to: https://github.com/sagebind/isahc/issues/283 + +Signed-off-by: Alistair Francis +--- + Cargo.lock | 30 +++++++++++++++++++++++++++--- + Cargo.toml | 2 +- + src/models/preview_image.rs | 4 ++-- + 3 files changed, 30 insertions(+), 6 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 42f21e6..ec3602a 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1413,7 +1413,7 @@ dependencies = [ + "deadpool", + "futures", + "http-types", +- "isahc", ++ "isahc 0.9.14", + "js-sys", + "log", + "wasm-bindgen", +@@ -1494,13 +1494,37 @@ dependencies = [ + "crossbeam-utils", + "curl", + "curl-sys", +- "encoding_rs", + "flume", + "futures-lite", + "http", + "log", ++ "once_cell", ++ "slab", ++ "sluice", ++ "tracing", ++ "tracing-futures", ++ "url", ++ "waker-fn", ++] ++ ++[[package]] ++name = "isahc" ++version = "1.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "431445cb4ba85a80cb1438a9ae8042dadb78ae4046ecee89ad027b614aa0ddb7" ++dependencies = [ ++ "async-channel", ++ "crossbeam-utils", ++ "curl", ++ "curl-sys", ++ "encoding_rs", ++ "event-listener", ++ "futures-lite", ++ "http", ++ "log", + "mime", + "once_cell", ++ "polling", + "slab", + "sluice", + "tracing", +@@ -2461,7 +2485,7 @@ dependencies = [ + "gtk-macros", + "html2pango", + "http-client", +- "isahc", ++ "isahc 1.5.0", + "lazy_static", + "libhandy", + "log", +diff --git a/Cargo.toml b/Cargo.toml +index 51e5850..ed29a18 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -24,7 +24,7 @@ pretty_env_logger = "0.4" + diesel = { version = "1.4", features = ["sqlite", "r2d2", "chrono"] } + diesel_migrations = { version = "1.4", features = ["sqlite"] } + anyhow = "1.0" +-isahc = "0.9" ++isahc = "1.5" + sanitize_html = "0.7" + regex = "1.5" + secret-service = "1.0" +diff --git a/src/models/preview_image.rs b/src/models/preview_image.rs +index 3b9b7c4..b9900e7 100644 +--- a/src/models/preview_image.rs ++++ b/src/models/preview_image.rs +@@ -1,7 +1,7 @@ + use anyhow::Result; + use crypto::digest::Digest; + use crypto::sha1::Sha1; +-use isahc::ResponseExt; ++use isahc::prelude::*; + use std::path::PathBuf; + use std::rc::Rc; + use url::Url; +@@ -33,7 +33,7 @@ impl PreviewImage { + } + + pub async fn download(&self, client: Rc) -> Result<()> { +- if let Ok(mut resp) = client.get_async(&self.url.to_string()).await { ++ if let Ok(mut resp) = client.get(&self.url.to_string()) { + info!("Downloading preview image {} into {:#?}", self.url, self.cache); + resp.copy_to_file(self.cache.clone())?; + } +-- +2.31.1 + diff --git a/testing/read-it-later/APKBUILD b/testing/read-it-later/APKBUILD index e216b57a3dd..ad1f5178db3 100755 --- a/testing/read-it-later/APKBUILD +++ b/testing/read-it-later/APKBUILD @@ -2,17 +2,20 @@ # Maintainer: Alistair Francis pkgname=read-it-later pkgver=0.0.2 -pkgrel=0 +pkgrel=1 pkgdesc="Wallabag Client built with GTK" url="https://gitlab.gnome.org/World/read-it-later" arch="all !s390x !mips64 !riscv64" # cargo, rust not found -arch="" # Fails to fetch wallabag-api license="GPL-3.0-only" -makedepends="meson bash rust cargo webkit2gtk-dev libhandy-dev sqlite-dev +makedepends="meson bash rust cargo webkit2gtk-dev libhandy1-dev sqlite-dev gettext-dev openssl-dev" -source="read-it-later-$pkgver.tar.gz::https://gitlab.gnome.org/World/read-it-later/-/archive/$pkgver/read-it-later-$pkgver.tar.gz - fix-wallabag-api.patch +source="read-it-later-692cf638e1284bcf31031421e6951c767bed6139.tar.gz::https://gitlab.gnome.org/World/read-it-later/-/archive/692cf638e1284bcf31031421e6951c767bed6139/read-it-later-692cf638e1284bcf31031421e6951c767bed6139.tar.gz + 0001-Cargo-Update-the-glib-dependencies.patch + 0002-Cargo-Update-most-remainig-dependencies.patch + 0003-gitlab-ci.yml-Update-the-containers.patch + 0004-Cargo.toml-Update-isahc.patch " +builddir="$srcdir/read-it-later-692cf638e1284bcf31031421e6951c767bed6139" options="!check" # no tests build() { @@ -29,6 +32,9 @@ package() { } sha512sums=" -fce6d6896e434793c03b65c9f960a3006af807084cbc1538a3e1324e2b1aac22ffb284e41e8a4ee94c533cd3cb900256cbf65c97f5e61e6b0938566d2850e459 read-it-later-0.0.2.tar.gz -4eb0d9ed2427189f854886ef4611a2d4c1e98885ceea8a41c8be3cd1b571ad09d8dbf0d3dbfe3128e511391209407388cd1caa4e12ea15ef0c4117eb769ec824 fix-wallabag-api.patch +8c0b6a608230feb57612b06ea993f0f03d25ba90959376cfd80709190e4939c88edeadd3071a70006ad84879604682ac47f87e3e72cbb5a300d0f505084bf37e read-it-later-692cf638e1284bcf31031421e6951c767bed6139.tar.gz +12e26a50f155e13e8704b1eb5a7858baf2fe54e59374518f77225172694b40c716801e4bc868c4af03feb71acd85ee34e8ad0e5497c69360943618abb18f823e 0001-Cargo-Update-the-glib-dependencies.patch +c74dcbb4413b30c336d8b421f1d82a4516409e76c936b126491418914cdf287d91ba80557799c86e7c874ef74538011416e5aefa5bcf73d4946dcae58b2f3f7a 0002-Cargo-Update-most-remainig-dependencies.patch +7d1327995d9c4e8eb9b0774ea3d54c338bb16ec0fd3f9724655e54f28ac38c9e6623661ff9313bdb4e3aab3131d6a384f6c60c7499a3e3891b57a13e9750ac3f 0003-gitlab-ci.yml-Update-the-containers.patch +0638d8270b3666fdb149ef0e4c6e23dc33e48bad2b2294d2484240560933560e9500c34ddba44b7f4972062d0c0e618149d448e4bb0c83dd17220a1e3f0d8d41 0004-Cargo.toml-Update-isahc.patch "