From fe11ed138aa470281bcddbc25f86550814eee058 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Frosteg=C3=A5rd?= Date: Sun, 13 Sep 2020 17:28:18 +0200 Subject: [PATCH] Use (patched) crates.io deps for crates, add some package metadata --- Cargo.lock | 14 +++++++------- Cargo.toml | 15 +++++++++++++++ aquatic/Cargo.toml | 11 +++++++---- aquatic_cli_helpers/Cargo.toml | 2 ++ aquatic_common/Cargo.toml | 2 ++ aquatic_http/Cargo.toml | 8 +++++--- aquatic_http_load_test/Cargo.toml | 6 ++++-- aquatic_http_protocol/Cargo.toml | 1 + aquatic_udp/Cargo.toml | 8 +++++--- aquatic_udp_bench/Cargo.toml | 5 +++-- aquatic_udp_load_test/Cargo.toml | 5 +++-- aquatic_udp_protocol/Cargo.toml | 2 ++ aquatic_ws/Cargo.toml | 8 +++++--- aquatic_ws_load_test/Cargo.toml | 5 +++-- aquatic_ws_protocol/Cargo.toml | 2 ++ 15 files changed, 66 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0eed36c..c891214 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,9 +23,9 @@ checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" [[package]] name = "ahash" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d66721683190aeea775c737eee925aea24719058d86d815e8ee121dd9f37d19" +checksum = "0adac150c2dd5a9c864d054e07bda5e6bc010cd10036ea5f17e82a2f5867f735" [[package]] name = "aho-corasick" @@ -719,7 +719,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00d63df3d41950fb462ed38308eea019113ad1508da725bbedcd0fa5a85ef5f7" dependencies = [ - "ahash 0.4.4", + "ahash 0.4.5", "serde", ] @@ -1411,9 +1411,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.115" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e54c9a88f2da7238af84b5101443f0c0d0a3bbdc455e34a5c9497b1903ed55d5" +checksum = "96fe57af81d28386a513cbc6858332abc6117cfdb5999647c6444b8f43a370a5" dependencies = [ "serde_derive", ] @@ -1449,9 +1449,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.115" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "609feed1d0a73cc36a0182a840a9b37b4a82f0b1150369f0536a9e3f2a31dc48" +checksum = "f630a6370fd8e457873b4bd2ffdae75408bc291ba72be773772a4c2a065d9ae8" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index bdaa157..552a2ca 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,6 +16,21 @@ members = [ "aquatic_ws_protocol", ] +[patch.crates-io] +aquatic = { path = "aquatic" } +aquatic_cli_helpers = { path = "aquatic_cli_helpers" } +aquatic_common = { path = "aquatic_common" } +aquatic_http = { path = "aquatic_http" } +aquatic_http_load_test = { path = "aquatic_http_load_test" } +aquatic_http_protocol = { path = "aquatic_http_protocol" } +aquatic_udp = { path = "aquatic_udp" } +aquatic_udp_bench = { path = "aquatic_udp_bench" } +aquatic_udp_load_test = { path = "aquatic_udp_load_test" } +aquatic_udp_protocol = { path = "aquatic_udp_protocol" } +aquatic_ws = { path = "aquatic_ws" } +aquatic_ws_load_test = { path = "aquatic_ws_load_test" } +aquatic_ws_protocol = { path = "aquatic_ws_protocol" } + [profile.release] debug = true lto = true diff --git a/aquatic/Cargo.toml b/aquatic/Cargo.toml index 45c9836..c6f08fb 100644 --- a/aquatic/Cargo.toml +++ b/aquatic/Cargo.toml @@ -4,13 +4,16 @@ version = "0.1.0" authors = ["Joakim Frostegård "] edition = "2018" license = "Apache-2.0" +description = "Blazingly fast, multi-threaded BitTorrent tracker (UDP, HTTP, WebTorrent)" +repository = "https://github.com/greatest-ape/aquatic" +keywords = ["bittorrent", "torrent", "webtorrent"] [[bin]] name = "aquatic" [dependencies] -aquatic_cli_helpers = { path = "../aquatic_cli_helpers" } -aquatic_http = { path = "../aquatic_http" } -aquatic_udp = { path = "../aquatic_udp" } -aquatic_ws = { path = "../aquatic_ws" } +aquatic_cli_helpers = "0.1.0" +aquatic_http = "0.1.0" +aquatic_udp = "0.1.0" +aquatic_ws = "0.1.0" mimalloc = { version = "0.1", default-features = false } \ No newline at end of file diff --git a/aquatic_cli_helpers/Cargo.toml b/aquatic_cli_helpers/Cargo.toml index be5ac9a..93d55e8 100644 --- a/aquatic_cli_helpers/Cargo.toml +++ b/aquatic_cli_helpers/Cargo.toml @@ -4,6 +4,8 @@ version = "0.1.0" authors = ["Joakim Frostegård "] edition = "2018" license = "Apache-2.0" +description = "aquatic BitTorrent tracker CLI helpers" +repository = "https://github.com/greatest-ape/aquatic" [dependencies] anyhow = "1" diff --git a/aquatic_common/Cargo.toml b/aquatic_common/Cargo.toml index d5ef54b..1fa29c3 100644 --- a/aquatic_common/Cargo.toml +++ b/aquatic_common/Cargo.toml @@ -4,6 +4,8 @@ version = "0.1.0" authors = ["Joakim Frostegård "] edition = "2018" license = "Apache-2.0" +description = "aquatic BitTorrent tracker common code" +repository = "https://github.com/greatest-ape/aquatic" [lib] name = "aquatic_common" diff --git a/aquatic_http/Cargo.toml b/aquatic_http/Cargo.toml index 303e155..ddd7554 100644 --- a/aquatic_http/Cargo.toml +++ b/aquatic_http/Cargo.toml @@ -4,6 +4,8 @@ version = "0.1.0" authors = ["Joakim Frostegård "] edition = "2018" license = "Apache-2.0" +description = "Blazingly fast, multi-threaded HTTP BitTorrent tracker" +repository = "https://github.com/greatest-ape/aquatic" [lib] name = "aquatic_http" @@ -15,9 +17,9 @@ path = "src/bin/main.rs" [dependencies] anyhow = "1" -aquatic_cli_helpers = { path = "../aquatic_cli_helpers" } -aquatic_common = { path = "../aquatic_common" } -aquatic_http_protocol = { path = "../aquatic_http_protocol" } +aquatic_cli_helpers = "0.1.0" +aquatic_common = "0.1.0" +aquatic_http_protocol = "0.1.0" crossbeam-channel = "0.4" either = "1" hashbrown = "0.9" diff --git a/aquatic_http_load_test/Cargo.toml b/aquatic_http_load_test/Cargo.toml index 315fdef..a82ed53 100644 --- a/aquatic_http_load_test/Cargo.toml +++ b/aquatic_http_load_test/Cargo.toml @@ -4,14 +4,16 @@ version = "0.1.0" authors = ["Joakim Frostegård "] edition = "2018" license = "Apache-2.0" +description = "HTTP BitTorrent tracker protocol" +repository = "https://github.com/greatest-ape/aquatic" [[bin]] name = "aquatic_http_load_test" [dependencies] anyhow = "1" -aquatic_cli_helpers = { path = "../aquatic_cli_helpers" } -aquatic_http_protocol = { path = "../aquatic_http_protocol" } +aquatic_cli_helpers = "0.1.0" +aquatic_http_protocol = "0.1.0" hashbrown = "0.9" mimalloc = { version = "0.1", default-features = false } mio = { version = "0.7", features = ["udp", "os-poll", "os-util"] } diff --git a/aquatic_http_protocol/Cargo.toml b/aquatic_http_protocol/Cargo.toml index afbcf51..1f66db5 100644 --- a/aquatic_http_protocol/Cargo.toml +++ b/aquatic_http_protocol/Cargo.toml @@ -4,6 +4,7 @@ version = "0.1.0" authors = ["Joakim Frostegård "] edition = "2018" license = "Apache-2.0" +repository = "https://github.com/greatest-ape/aquatic" [lib] name = "aquatic_http_protocol" diff --git a/aquatic_udp/Cargo.toml b/aquatic_udp/Cargo.toml index 193fef8..250a6c0 100644 --- a/aquatic_udp/Cargo.toml +++ b/aquatic_udp/Cargo.toml @@ -4,6 +4,8 @@ version = "0.1.0" authors = ["Joakim Frostegård "] edition = "2018" license = "Apache-2.0" +description = "Blazingly fast, multi-threaded UDP BitTorrent tracker" +repository = "https://github.com/greatest-ape/aquatic" [lib] name = "aquatic_udp" @@ -14,9 +16,9 @@ name = "aquatic_udp" [dependencies] anyhow = "1" -aquatic_cli_helpers = { path = "../aquatic_cli_helpers" } -aquatic_common = { path = "../aquatic_common" } -aquatic_udp_protocol = { path = "../aquatic_udp_protocol" } +aquatic_cli_helpers = "0.1.0" +aquatic_common = "0.1.0" +aquatic_udp_protocol = "0.1.0" crossbeam-channel = "0.4" hashbrown = "0.9" histogram = "0.6" diff --git a/aquatic_udp_bench/Cargo.toml b/aquatic_udp_bench/Cargo.toml index 3d951d8..782c19f 100644 --- a/aquatic_udp_bench/Cargo.toml +++ b/aquatic_udp_bench/Cargo.toml @@ -4,14 +4,15 @@ version = "0.1.0" authors = ["Joakim Frostegård "] edition = "2018" license = "Apache-2.0" +repository = "https://github.com/greatest-ape/aquatic" [[bin]] name = "aquatic_udp_bench" [dependencies] anyhow = "1" -aquatic_cli_helpers = { path = "../aquatic_cli_helpers" } -aquatic_udp = { path = "../aquatic_udp" } +aquatic_cli_helpers = "0.1.0" +aquatic_udp = "0.1.0" crossbeam-channel = "0.4" indicatif = "0.15" mimalloc = { version = "0.1", default-features = false } diff --git a/aquatic_udp_load_test/Cargo.toml b/aquatic_udp_load_test/Cargo.toml index 288d732..d746d68 100644 --- a/aquatic_udp_load_test/Cargo.toml +++ b/aquatic_udp_load_test/Cargo.toml @@ -4,14 +4,15 @@ version = "0.1.0" authors = ["Joakim Frostegård "] edition = "2018" license = "Apache-2.0" +repository = "https://github.com/greatest-ape/aquatic" [[bin]] name = "aquatic_udp_load_test" [dependencies] anyhow = "1" -aquatic_cli_helpers = { path = "../aquatic_cli_helpers" } -aquatic_udp_protocol = { path = "../aquatic_udp_protocol" } +aquatic_cli_helpers = "0.1.0" +aquatic_udp_protocol = "0.1.0" crossbeam-channel = "0.4" hashbrown = "0.9" mimalloc = { version = "0.1", default-features = false } diff --git a/aquatic_udp_protocol/Cargo.toml b/aquatic_udp_protocol/Cargo.toml index 52be3fc..180efaa 100644 --- a/aquatic_udp_protocol/Cargo.toml +++ b/aquatic_udp_protocol/Cargo.toml @@ -4,6 +4,8 @@ version = "0.1.0" authors = ["Joakim Frostegård "] edition = "2018" license = "Apache-2.0" +description = "UDP BitTorrent tracker protocol" +repository = "https://github.com/greatest-ape/aquatic" [dependencies] byteorder = "1" diff --git a/aquatic_ws/Cargo.toml b/aquatic_ws/Cargo.toml index cec0b46..d6c9501 100644 --- a/aquatic_ws/Cargo.toml +++ b/aquatic_ws/Cargo.toml @@ -4,6 +4,8 @@ version = "0.1.0" authors = ["Joakim Frostegård "] edition = "2018" license = "Apache-2.0" +description = "Blazingly fast, multi-threaded WebTorrent tracker" +repository = "https://github.com/greatest-ape/aquatic" [lib] name = "aquatic_ws" @@ -15,9 +17,9 @@ path = "src/bin/main.rs" [dependencies] anyhow = "1" -aquatic_cli_helpers = { path = "../aquatic_cli_helpers" } -aquatic_common = { path = "../aquatic_common" } -aquatic_ws_protocol = { path = "../aquatic_ws_protocol" } +aquatic_cli_helpers = "0.1.0" +aquatic_common = "0.1.0" +aquatic_ws_protocol = "0.1.0" crossbeam-channel = "0.4" either = "1" hashbrown = { version = "0.9", features = ["serde"] } diff --git a/aquatic_ws_load_test/Cargo.toml b/aquatic_ws_load_test/Cargo.toml index e8f901d..c9ea7b8 100644 --- a/aquatic_ws_load_test/Cargo.toml +++ b/aquatic_ws_load_test/Cargo.toml @@ -4,14 +4,15 @@ version = "0.1.0" authors = ["Joakim Frostegård "] edition = "2018" license = "Apache-2.0" +repository = "https://github.com/greatest-ape/aquatic" [[bin]] name = "aquatic_ws_load_test" [dependencies] anyhow = "1" -aquatic_cli_helpers = { path = "../aquatic_cli_helpers" } -aquatic_ws_protocol = { path = "../aquatic_ws_protocol" } +aquatic_cli_helpers = "0.1.0" +aquatic_ws_protocol = "0.1.0" hashbrown = { version = "0.9", features = ["serde"] } mimalloc = { version = "0.1", default-features = false } mio = { version = "0.7", features = ["udp", "os-poll", "os-util"] } diff --git a/aquatic_ws_protocol/Cargo.toml b/aquatic_ws_protocol/Cargo.toml index 9009fbb..1411e04 100644 --- a/aquatic_ws_protocol/Cargo.toml +++ b/aquatic_ws_protocol/Cargo.toml @@ -4,6 +4,8 @@ version = "0.1.0" authors = ["Joakim Frostegård "] edition = "2018" license = "Apache-2.0" +description = "WebTorrent tracker protocol" +repository = "https://github.com/greatest-ape/aquatic" [lib] name = "aquatic_ws_protocol"