From a78a333583c7159fb5c932088c723a2ffa53c675 Mon Sep 17 00:00:00 2001 From: Devin R Date: Sat, 27 Jun 2020 14:06:50 -0400 Subject: [PATCH] Publish rumatui-tui version 0.8.1 and lock git deps to rev --- .gitignore | 1 - Cargo.lock | 117 ++++++++++++++++++++++++++++---------------------- Cargo.toml | 6 +-- tests/test.rs | 1 - 4 files changed, 69 insertions(+), 56 deletions(-) delete mode 100644 tests/test.rs diff --git a/.gitignore b/.gitignore index a96cee4..87c78ad 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ /target -Cargo.lock syncdata diff --git a/Cargo.lock b/Cargo.lock index effd211..02d559a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,9 +2,9 @@ # It is not intended for manual editing. [[package]] name = "addr2line" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a49806b9dadc843c61e7c97e72490ad7f7220ae249012fbda9ad0609457c0543" +checksum = "602d785912f476e480434627e8732e6766b760c045bbf897d9dfaa9f4fbd399c" dependencies = [ "gimli", ] @@ -26,9 +26,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.10" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada" +checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86" dependencies = [ "memchr", ] @@ -39,7 +39,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" dependencies = [ - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -48,7 +48,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" dependencies = [ - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -169,7 +169,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ "hermit-abi", "libc", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -200,15 +200,15 @@ checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" [[package]] name = "base64" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e223af0dc48c96d4f8342ec01a4974f139df863896b316681efd36742f22cc67" +checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" [[package]] name = "bincode" -version = "1.2.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5753e2a71534719bf3f4e57006c3a4f0d2c672a4b676eec84161f763eca87dbf" +checksum = "f30d3a39baa26f9651f17b375061f3233dde33424a8b72b0dbe93a68a0bc896d" dependencies = [ "byteorder", "serde", @@ -308,9 +308,9 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" [[package]] name = "cc" -version = "1.0.54" +version = "1.0.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bbb73db36c1246e9034e307d0fba23f9a2e251faa47ade70c1bd252220c8311" +checksum = "b1be3409f94d7bdceeb5f5fac551039d9b3f00e25da7a74fc4d33400a0d96368" [[package]] name = "cfg-if" @@ -537,7 +537,7 @@ checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a" dependencies = [ "libc", "redox_users", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -803,7 +803,7 @@ dependencies = [ "libc", "log", "rustc_version", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -822,7 +822,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e692e296bfac1d2533ef168d0b60ff5897b8b70a4009276834014dd8924cc028" dependencies = [ "libc", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -1068,9 +1068,9 @@ dependencies = [ [[package]] name = "js_int" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41001c418a5cd1630e2be833fd7e282eb1f4290132d85ebb4f01b5a4c0155a3c" +checksum = "1b2b63d60564122f2a7d6592c2f1d6c1c60e7a266b4d24715950a1ddad784f66" dependencies = [ "serde", ] @@ -1164,7 +1164,7 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" [[package]] name = "matrix-sdk" version = "0.1.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk#cd9252cc3d9d46770db54a1c6317aa4a52b52cf3" +source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=cd9252cc3d9d46770db54a1c6317aa4a52b52cf3#cd9252cc3d9d46770db54a1c6317aa4a52b52cf3" dependencies = [ "futures-timer", "http", @@ -1182,7 +1182,7 @@ dependencies = [ [[package]] name = "matrix-sdk-base" version = "0.1.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk#cd9252cc3d9d46770db54a1c6317aa4a52b52cf3" +source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=cd9252cc3d9d46770db54a1c6317aa4a52b52cf3#cd9252cc3d9d46770db54a1c6317aa4a52b52cf3" dependencies = [ "async-trait", "matrix-sdk-common", @@ -1198,7 +1198,7 @@ dependencies = [ [[package]] name = "matrix-sdk-common" version = "0.1.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk#cd9252cc3d9d46770db54a1c6317aa4a52b52cf3" +source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=cd9252cc3d9d46770db54a1c6317aa4a52b52cf3#cd9252cc3d9d46770db54a1c6317aa4a52b52cf3" dependencies = [ "futures-locks", "instant", @@ -1214,7 +1214,7 @@ dependencies = [ [[package]] name = "matrix-sdk-common-macros" version = "0.1.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk#cd9252cc3d9d46770db54a1c6317aa4a52b52cf3" +source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=cd9252cc3d9d46770db54a1c6317aa4a52b52cf3#cd9252cc3d9d46770db54a1c6317aa4a52b52cf3" dependencies = [ "quote", "syn", @@ -1223,7 +1223,7 @@ dependencies = [ [[package]] name = "matrix-sdk-crypto" version = "0.1.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk#cd9252cc3d9d46770db54a1c6317aa4a52b52cf3" +source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=cd9252cc3d9d46770db54a1c6317aa4a52b52cf3#cd9252cc3d9d46770db54a1c6317aa4a52b52cf3" dependencies = [ "async-trait", "atomic", @@ -1256,7 +1256,7 @@ checksum = "14fff01d1a4aa5bb1c3824a6e1e509e5757a8403059122088da6f095e49ff5a0" dependencies = [ "ansi_term 0.12.1", "anyhow", - "base64 0.12.2", + "base64 0.12.3", "clap", "fehler", "gethostname", @@ -1372,7 +1372,7 @@ checksum = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7" dependencies = [ "cfg-if", "libc", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -1471,9 +1471,9 @@ checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" [[package]] name = "openssl" -version = "0.10.29" +version = "0.10.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee6d85f4cb4c4f59a6a85d5b68a233d280c82e29e822913b9c8b129fbf20bdd" +checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4" dependencies = [ "bitflags", "cfg-if", @@ -1595,7 +1595,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b336d94e8e4ce29bf15bba393164629764744c567e8ad306cc1fdd0119967fd" dependencies = [ - "base64 0.12.2", + "base64 0.12.3", "chrono", "indexmap", "line-wrap", @@ -1778,7 +1778,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" dependencies = [ - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -1788,7 +1788,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b82c9238b305f26f53443e3a4bc8528d64b8d0bee408ec949eb7bf5635ec680" dependencies = [ "async-compression", - "base64 0.12.2", + "base64 0.12.3", "bytes", "encoding_rs", "futures-core", @@ -1926,7 +1926,7 @@ dependencies = [ [[package]] name = "rumatui" -version = "0.1.16" +version = "0.1.17" dependencies = [ "async-trait", "chrono", @@ -1945,7 +1945,7 @@ dependencies = [ "ruma-api", "ruma-client-api", "ruma-identifiers", - "rumatui-tui", + "rumatui-tui 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde", "serde_json", "syntect", @@ -1971,6 +1971,21 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "rumatui-tui" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "321431661dcf65148a9405f094d81d862102b3d84b012670c1779dbd1279082e" +dependencies = [ + "bitflags", + "cassowary", + "either", + "itertools", + "termion", + "unicode-segmentation", + "unicode-width", +] + [[package]] name = "rust-argon2" version = "0.7.0" @@ -2026,7 +2041,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" dependencies = [ "lazy_static", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -2093,18 +2108,18 @@ checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" [[package]] name = "serde" -version = "1.0.113" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6135c78461981c79497158ef777264c51d9d0f4f3fc3a4d22b915900e42dac6a" +checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.113" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93c5eaa17d0954cb481cdcfffe9d84fcfa7a1a9f2349271e678677be4c26ae31" +checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e" dependencies = [ "proc-macro2", "quote", @@ -2161,7 +2176,7 @@ dependencies = [ "cfg-if", "libc", "redox_syscall", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -2258,9 +2273,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a994520748611c17d163e81b6c4a4b13d11b7f63884362ab2efac3aa9cf16d00" +checksum = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd" dependencies = [ "proc-macro2", "quote", @@ -2311,7 +2326,7 @@ dependencies = [ "rand", "redox_syscall", "remove_dir_all", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -2321,7 +2336,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9" dependencies = [ "libc", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -2393,7 +2408,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" dependencies = [ "libc", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -2584,9 +2599,9 @@ checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" [[package]] name = "unicode-xid" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" +checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" [[package]] name = "unicode_categories" @@ -2639,7 +2654,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" dependencies = [ "same-file", - "winapi 0.3.8", + "winapi 0.3.9", "winapi-util", ] @@ -2744,7 +2759,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a83a4b8838569b89d2a3e7353995088e3b80c420a1269cd3d92ba8196875fc16" dependencies = [ "widestring", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -2761,9 +2776,9 @@ checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" [[package]] name = "winapi" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" dependencies = [ "winapi-i686-pc-windows-gnu", "winapi-x86_64-pc-windows-gnu", @@ -2787,7 +2802,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -2802,7 +2817,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" dependencies = [ - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 99fecd0..6f04bbd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ lazy_static = "1.4.0" # matrix-sdk = "0.1.0" # matrix-sdk-base = { version = "0.1.0", features = ["messages"] } -matrix-sdk = { git = "https://github.com/matrix-org/matrix-rust-sdk" } +matrix-sdk = { git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "cd9252cc3d9d46770db54a1c6317aa4a52b52cf3" } mdcat = "0.18.2" muncher = "0.6.1" @@ -43,14 +43,14 @@ termion = "1.5.5" tokio = { version = "0.2.21", features = ["macros", "rt-threaded", "sync"] } # crates.io published fork of tui -rumatui-tui = { path = "./rumatui-tui", version = "0.8.1" } +rumatui-tui = "0.8.1" webbrowser = "0.5.2" url = "2.1.1" uuid = { version = "0.8.1", features = ["v4"] } [dependencies.pulldown-cmark] -version = "^0.7" +version = "0.7.1" default-features = false features = ['simd'] diff --git a/tests/test.rs b/tests/test.rs deleted file mode 100644 index 8b13789..0000000 --- a/tests/test.rs +++ /dev/null @@ -1 +0,0 @@ -