- Irdest community - lists.irde.st

Ratman 0.5.0 and some other small announcements
by Katharina Fey 08 Aug '23

08 Aug '23

Hey everyone, it's been a while since the last update. I'm sending this e-mail to both the announcements and community list to a) break the ice on the community list and b) make it easier/ more approachable for people to reply to the announcement on the community list. So far the community list hasn't really gotten used, since we mostly communicate on Matrix. In the future I suspect the community list would be the easiest place to report issues, and contribute code changes, since our GitLab requires account verification, which can be annoying. In the meantime, let's get into todays announcements: Irdest has received two new NLnet grants this year! One for myself, and one for Aman, who has been part of the Irdest community for many years, and I'm very excited to get to work with him finally :) My NLnet grant -------------- The Irdest project has been in a strange state for this past year (and a bit). Since we forked off from qaul.net, there was a kind of pressure to change things on a technical and social level, to work towards a new vision for the project. And I think, mostly, we have succeeded at that. At the same time, the result of this "exploration" has been technical debt at many levels, inconsistencies that have slowly accumulated, and more and more bugs that are the result of them. This is going to be the focus of my grant work: to bring Irdest into a more unified state, to integrate features that were written as part of the last NLnet grant but haven't been able to properly land in a release. And to make the codebase easier to understand, work on, and maintain in the future. The core of the Irdest project (Ratman) used to be just one component of a larger tower, but now it _is_, at least in many ways, the tower. This needs to be reflected in the way the project and repository is structured. New release ----------- Today I am tagging release/0.5.0! It brings a lot of simplification to the codebase. All of the ratman utility crates (-netmod, -client, -types) have been consolidated into "libratman", which also replaces the "ratman" crate name, since there is little point to having a crate on crates.io that purely represents an executable target (the daemon). The daemon is now called "ratmand". The ratman tools are now no longer special parts of the ratman tree, and have instead been moved to the clients directory, with the rest of the applications that interact with ratmand over its client API. Additionally I changed the configuration format from JSON to KDL [1]. I've been deliberating about this change for a long time now, and while the code for parsing the configuration is now a lot more complex, it also allows us to upgrade configurations in-place in the future, can handle comments more easily, in-place edits, nested structures without getting unwieldy to edit, etc. The syntax will most likely be new to people, but I feel it's straight forward enough (especially in the way that we use it) that it should be easy enough to get used to. There are some other smaller things that you can read about in the release announcement! [2] Aman's grant ------------ And finally, I want to briefly talk about Aman's NLnet project: part of the shift in "vision" for Irdest has been to move away from the idea of building another meshing "app", and instead focus on the idea that technical infrastructure requires work and maintenance, and to democratise this work and maintenance. Making it easy to take existing router hardware, and augment it with easy to use and configure meshing capabilities, in our opinion, is fundamental to getting a project like Irdest not only to succeed, but to stick around any one hype wave. I have installed and forgotten about too many "apps" that were too single minded in their approach to communication. So, with this in mind: Aman's grant focuses on building ratmand and any other necessary tools for OpenWRT and building images/ packages that people can install via the existing OpenWRT package infrastructure. Additionally, he will be working on a netmod driver for embedded bluetooth boards. Potentially this could re-use some of the serial driver infrastructure we already have in place for the LoRa modems, but we'll see. In conclusion ------------- Anyway, I am very excited about the future of this project. There are still many many things to do, and I hope to be able to provide updates on how things are going more frequently. In the meantime I will start using the announcement mailing list for actual release announcements, plus probably I will start posting RFCs (requests for comment) on the community list regarding our upcoming specification and similar! Thank you for reading my somewhat rambly thoughts on the future of development. If you have any questions, feel free to reply to this e-mail, or start a new thread (on the community list). Read you all soon, - Kookie --- [1]: https://kdl.dev [2]: https://git.irde.st/we/irdest/-/tags/release%2F0.5.0

1 1

Fwd: freifunk@GSoC 2022: Your project ideas!
by Katharina Fey 26 Jan '22

26 Jan '22

Good news everyone. I just got this announcement. We have a pad for project ideas over here: https://pad.irde.st/code/#/2/code/edit/RsUmKbuxqh2VZ9zLXkXAlCrf/ -------- Forwarded Message -------- Subject: freifunk@GSoC 2022: Your project ideas! Date: Tue, 25 Jan 2022 14:09:17 +0100 From: Andreas Bräu <ab(a)andi95.de> Reply-To: gsoc-org-admins(a)freifunk.net <gsoc-org-admins(a)freifunk.net> To: Katharina Fey <kookie(a)spacekookie.de> Hello together, I hope you all had a good start into the new year! We are planning to apply for the Google Summer of Code again this year. And there is good news: 1. Participation is no longer conditional on being a student. You just have to be older than 18. 2. There are small and large projects. Large means that you would work on it full time for 10 weeks. Small means that you work on it 50% of the time for 10 weeks. 3. The duration of the project can be stretched. This means that the 10 weeks set aside for a project can be spread over up to 20 weeks. For us, this has some advantages. The projects can be fitted into the participants' personal schedules. You can go on holiday in between, or take exams. In addition, we have the opportunity to involve many more people and to promote people who are close to the communities. What needs to be done? In the current phase, we need to collect project ideas, because these will feed into the evaluation of our application. We collect the projects at https://projects.freifunk.net/#/projects and they can be edited in Github at https://github.com/freifunk/projects.freifunk.net-contents. It's best to use the month of January to go through your to-do lists :) If you have any questions, you can always write to me. Please pass the info on to your communities as well! Best regards Andi ps: please spread this message in your communities! -- Andreas Bräu XMPP: andibraeu(a)jabber.weimarnetz.de Twitter: @evAltenberga Blog: https://blog.andi95.de PGP: 0xB7E04818

1 0

"Irdest APIs" page on docs.irde.st is not public?
by Anton 20 Jan '22

20 Jan '22

Hi all, First of all, congratulations on the release of ratman! This sounds very exciting! In fact, I have just learned about Irdest today thanks to the announcement. Trying to learn more, I was browsing the website today, and one of the links lead me to a "403 Forbidden" page. I'm assuming it's a bug, and thought I'd let you know about it. The URL for the 403/Forbidden was: https://docs.irde.st/developer/technical/api/ The link that lead me there was at the bottom of https://docs.irde.st/developer/technical/ It is the link titled "Irdest APIs". Hope it helps, and I'll be able to learn more about Irdest APIs soon. -- Anton

2 1

[PATCH] docs: add ratmand(1) man page
by Alyssa Ross 18 Jan '22

18 Jan '22

--- docs/man/ratmand.1 | 149 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 149 insertions(+) create mode 100644 docs/man/ratmand.1 diff --git a/docs/man/ratmand.1 b/docs/man/ratmand.1 new file mode 100644 index 00000000..06966d88 --- /dev/null +++ b/docs/man/ratmand.1 @@ -0,0 +1,149 @@ +.\" SPDX-FileCopyrightText: 2022 Alyssa Ross <hi(a)alyssa.is> +.\" SPDX-FileCopyrightText: 2022 Katharina Fey <kookie(a)spacekookie.de> +.\" SPDX-License-Identifier: CC-BY-SA-4.0 +.Dd January 18, 2022 +.UT RATMAND 1 +.Os +.Sh NAME +.Rm ratmand +.Nd decentralised, peer-to-peer packet router +.Sh SYNOPSIS +.Nm +.Op Fl d +.Op Fl p | f +.Op Fl v Ar verbosity +.Op Fl b Ar addr +.Op Fl \-no-inet +.Op Fl \-inet Ar addr +.Op Fl \-no-discovery +.Op Fl \-discovery-iface Ar iface +.Op Fl \-discovery-port Ar port +.Sh DESCRIPTION +.Nm +is a stand-alone, decentralised routing daemon, and the core component +behind the Irdest project. Ratman provides an alternative address +space via 256bit cryptographic keys, while peering with different +Ratman instances over a variety of transport mechanisms. +.Pp +The arguments are as follows: +.Bl -tag -width Ds +.It Fl d , \-accept-unknown-peers +By default Ratman rejects unknown incoming peer requests. To disable +this functionality you need to pass this flag. +.Pp +Note that if you want to run Ratman +.Em without +having to provide a set of peers to begin with (for example to purely +act as a peering server) then you +.Em must also +provide this flag. +.It Fl p , \-peers Ar PEERS +This multi-parameter flag allows you to specify an initial set of +peers to connect to. The syntax used for this is called PEER_SYNTAX +and used across various components in Irdest. +.Pp +A peer is expressed as follows: +.Bd -literal -offset indent +<netmod>#<address>:<port> +.Ed +.Bl -inset +.It Va netmod +refers to name of the netmod that the peer should be introduced to. +Currently the only valid netmod-identifier is +.Dv inet . +.It Va address +contains the main address part. Domain names (provided you have a +working DNS setup) are also accepted. +.It Va port +to connect to. +.El +.It Fl f , \-peer-file Ar PEER_FILE +Similar parameter to +.Fl p +but pointing to a file instead. This file must then contain a peer +formatted in PEER_SYNTAX on each line. +.It Fl v , \-verbosity Ar verbosity +Ratman can be configured to log more or less, depending on your needs. +Following is a breakdown of available log levels and how they are +generally used. +.Bl -hang +.It Dv error +Only print unexpected behaviour that has caused some operation to +fail. This does not mean that the whole router is crashing, but may +be an early indicator of a fault +.It Dv warn +Only print for unexpected behaviour that doesn't +otherwise impact the operation of the router. +.It Dv info +Print at most one statement for each high-level component +action. It is possible to gauge the general operation of the +router from just these messages +.It Dv debug +Print at most two statements for each operation (for +example "start" and "finish"). Debug messages are plenty because +all components emit them, but limit their re-occurrence in each +component. +.It Dv trace +Includes individual step to each operation with no real limit on +recurrence. +.El +.It Fl b , \-bind Ar addr +Override the default listening port for Ratman IPC connections. This +is useful in case you want to run multiple routers on the same +machine, but will cause issue with applications that don't allow you +to specify the IPC connection socket address, e.g. +.Xr irdest-echo 1 . +.It Fl \-no-inet +Disable the inet overlay driver. +.It Fl \-inet Ar addr +Specify the bind address and port for the netmod-inet overlay driver. +It supports both +.Xr ipv6 7 +and +.Xr ip 7 +address schemas. +.It Fl \-no-discovery +By default Ratman runs a local +.Xr ipv6 7 +multicast discovery driver which will find other Ratman instances on +your local network to peer with. This flag disables that +functionality. +.It Fl \-discovery-iface Ar iface +Bind to +.Ar iface +for local peer discovery. If none is provided +.Nm +will attempt to guess the correct interface. +.It Fl \-discovery-port Ar port +Bind to +.Ar port +for local peer discovery. Make sure this port is open in your +firewall. The default port is 9001. +.Pp +.Em Warning : +it's not recommended to change this unless you know this is what you +want! +.El +.Sh EXIT STATUS +.Ex -std +.Sh EXAMPLES +.Bd -literal +# Start router daemon without connecting to any pre-defined peers, +# but accepting any incoming peering requests. +ratmand --accept-unknown-peers +.Ed +.Sh BUGS +Currently Ratman can only peer over an existing internet connection +but this will not always be the case. +.Pp +This is +.Em alpha +level software and will include bugs and cause crashes. If you +encounter a reproducible issue, please report it! +.Bl -ohang +.It Issue tracker +.Lk https://git.irde.st/we/irdest/-/issues +.It Mailing list +.Lk https://lists.irde.st/archives/list/community@lists.irde.st +.It Matrix +.Lk https://matrix.to/#/#chat:irde.st base-commit: 11a048d9a4a448509ce516eb325a6fbc123680f7 -- 2.34.1

1 0

[PATCH] deny.toml: allow BSD-2-Clause and CC0-1.0
by Alyssa Ross 04 Jun '21

04 Jun '21

--- deny.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deny.toml b/deny.toml index 57a20226..34897404 100644 --- a/deny.toml +++ b/deny.toml @@ -57,6 +57,8 @@ unlicensed = "deny" copyleft = "allow" allow = [ "Apache-2.0", + "BSD-2-Clause", "BSD-3-Clause", + "CC0-1.0", "MIT", ] -- 2.31.0

1 0

[PATCH nixfiles] gitlab: Make pipeline status in email subject clearer to Kookie
by Alyssa Ross 16 Apr '21

16 Apr '21

Kookie finds it hard to differentiate the subject lines of GitLab emails, and so can't easily tell whether the build has started working again, or if it's just been broken, so I volunteered to make it easier. --- ...s-in-email-subject-clearer-to-Kookie.patch | 35 +++++++++++++++++++ services/gitlab/default.nix | 8 ++++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 services/gitlab/Make-pipeline-status-in-email-subject-clearer-to-Kookie.patch diff --git a/services/gitlab/Make-pipeline-status-in-email-subject-clearer-to-Kookie.patch b/services/gitlab/Make-pipeline-status-in-email-subject-clearer-to-Kookie.patch new file mode 100644 index 0000000..48cda65 --- /dev/null +++ b/services/gitlab/Make-pipeline-status-in-email-subject-clearer-to-Kookie.patch @@ -0,0 +1,35 @@ +From 8c5e6d238e9dd1ac12c4539e9beb8330525c228e Mon Sep 17 00:00:00 2001 +From: Alyssa Ross <hi(a)alyssa.is> +Date: Fri, 16 Apr 2021 11:47:28 +0000 +Subject: [PATCH] Make pipeline status in email subject clearer to Kookie + +--- + app/mailers/emails/pipelines.rb | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/app/mailers/emails/pipelines.rb b/app/mailers/emails/pipelines.rb +index fb1f70723fd..02b3ff29c96 100644 +--- a/app/mailers/emails/pipelines.rb ++++ b/app/mailers/emails/pipelines.rb +@@ -3,15 +3,15 @@ + module Emails + module Pipelines + def pipeline_success_email(pipeline, recipients) +- pipeline_mail(pipeline, recipients, 'Successful') ++ pipeline_mail(pipeline, recipients, '🥳 Successful') + end + + def pipeline_failed_email(pipeline, recipients) +- pipeline_mail(pipeline, recipients, 'Failed') ++ pipeline_mail(pipeline, recipients, '🔥️ Failed') + end + + def pipeline_fixed_email(pipeline, recipients) +- pipeline_mail(pipeline, recipients, 'Fixed') ++ pipeline_mail(pipeline, recipients, '🥳 Fixed') + end + + private +-- +2.31.0 + diff --git a/services/gitlab/default.nix b/services/gitlab/default.nix index cd33b53..6afd40c 100644 --- a/services/gitlab/default.nix +++ b/services/gitlab/default.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ config, pkgs, ... }: { petabyte.secrets."gitlab/initial-root-password".owner = "gitlab"; @@ -32,6 +32,12 @@ port = 443; https = true; + packages.gitlab = pkgs.gitlab.overrideAttrs ({ patches ? [], ... }: { + patches = patches ++ [ + ./Make-pipeline-status-in-email-subject-clearer-to-Kookie.patch + ]; + }); + initialRootPasswordFile = config.petabyte.secrets."gitlab/initial-root-password".path; secrets = { secretFile = config.petabyte.secrets."gitlab/secret".path; -- 2.31.0

1 0

[Community] [PATCH v2] Update blake2 to 0.9.1 everywhere
by Alyssa Ross 16 Apr '21

16 Apr '21

0.8.1 depends on a version of generic_array that has an unsoundness bug. The VarBlake2b hasher now gives us a Box<[u8]> instead of a Vec, which meant it could no longer be passed straight to Identity::truncate in ratman-identity. I noticed that that method took an Into<&Vec<u8>>, which I don't think anything other than Vec actually implements -- other things implement Into<Vec<u8>>, but not Into<&Vec<u8>>. I think the correct type to use here to allow a vec to be borrowed is AsRef<[u8]> (which types like Box<[u8]> do actually implement), so I've changed it to take that instead. --- Cargo.lock | 94 +++++---------------------- irdest-core/Cargo.toml | 2 +- irdest-core/src/auth/pwhash.rs | 4 +- irdest-core/src/messages/generator.rs | 2 +- ratman/identity/Cargo.toml | 2 +- ratman/identity/src/lib.rs | 15 +++-- 6 files changed, 31 insertions(+), 88 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2f1dfdd1..724cd098 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -313,27 +313,15 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -[[package]] -name = "blake2" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94cb07b0da6a73955f8fb85d24c466778e70cda767a568229b104f0264089330" -dependencies = [ - "byte-tools", - "crypto-mac 0.7.0", - "digest 0.8.1", - "opaque-debug 0.2.3", -] - [[package]] name = "blake2" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10a5720225ef5daecf08657f23791354e1685a8c91a4c60c7f3d3b2892f978f4" dependencies = [ - "crypto-mac 0.8.0", - "digest 0.9.0", - "opaque-debug 0.3.0", + "crypto-mac", + "digest", + "opaque-debug", ] [[package]] @@ -342,7 +330,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "generic-array 0.14.4", + "generic-array", ] [[package]] @@ -365,12 +353,6 @@ version = "3.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe" -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - [[package]] name = "byteorder" version = "1.4.3" @@ -538,24 +520,14 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "crypto-mac" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" -dependencies = [ - "generic-array 0.12.4", - "subtle 1.0.0", -] - [[package]] name = "crypto-mac" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ - "generic-array 0.14.4", - "subtle 2.4.0", + "generic-array", + "subtle", ] [[package]] @@ -575,28 +547,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "639891fde0dbea823fc3d798a0fdf9d2f9440a42d64a78ab3488b0ca025117b3" dependencies = [ "byteorder", - "digest 0.9.0", + "digest", "rand_core 0.5.1", - "subtle 2.4.0", + "subtle", "zeroize", ] -[[package]] -name = "digest" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" -dependencies = [ - "generic-array 0.12.4", -] - [[package]] name = "digest" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ - "generic-array 0.14.4", + "generic-array", ] [[package]] @@ -858,15 +821,6 @@ dependencies = [ "system-deps", ] -[[package]] -name = "generic-array" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" -dependencies = [ - "typenum", -] - [[package]] name = "generic-array" version = "0.14.4" @@ -1084,8 +1038,8 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840" dependencies = [ - "crypto-mac 0.8.0", - "digest 0.9.0", + "crypto-mac", + "digest", ] [[package]] @@ -1123,7 +1077,7 @@ dependencies = [ "async-trait", "base64", "bincode", - "blake2 0.8.1", + "blake2", "hex", "ircore-types", "irpc-sdk", @@ -1284,7 +1238,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae8038be446bbffb5bebe247ab05a1b1cb4c33363e204102a01e44f5933e7451" dependencies = [ "base64", - "blake2 0.9.1", + "blake2", "hmac", "pbkdf2", "rand 0.7.3", @@ -1476,12 +1430,6 @@ version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" -[[package]] -name = "opaque-debug" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" - [[package]] name = "opaque-debug" version = "0.3.0" @@ -1536,12 +1484,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd" dependencies = [ "base64", - "crypto-mac 0.8.0", + "crypto-mac", "hmac", "rand 0.7.3", "rand_core 0.5.1", "sha2", - "subtle 2.4.0", + "subtle", ] [[package]] @@ -1817,7 +1765,7 @@ name = "ratman-identity" version = "0.6.2" dependencies = [ "bincode", - "blake2 0.8.1", + "blake2", "cfg-if 1.0.0", "hex", "rand 0.7.3", @@ -1980,8 +1928,8 @@ dependencies = [ "block-buffer", "cfg-if 1.0.0", "cpuid-bool", - "digest 0.9.0", - "opaque-debug 0.3.0", + "digest", + "opaque-debug", ] [[package]] @@ -2098,12 +2046,6 @@ dependencies = [ "syn 1.0.69", ] -[[package]] -name = "subtle" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" - [[package]] name = "subtle" version = "2.4.0" diff --git a/irdest-core/Cargo.toml b/irdest-core/Cargo.toml index ca894c73..3b2767bd 100644 --- a/irdest-core/Cargo.toml +++ b/irdest-core/Cargo.toml @@ -16,7 +16,7 @@ async-std = { version = "1.0", features = ["attributes", "unstable"] } async-trait = "0.1" base64 = "0.12" bincode = "1.0" -blake2 = "0.8" +blake2 = "0.9" hex = "0.4" jni = { version = "0.14", optional = true, default-features = false } rand = "0.7" diff --git a/irdest-core/src/auth/pwhash.rs b/irdest-core/src/auth/pwhash.rs index 35723157..0a916af6 100644 --- a/irdest-core/src/auth/pwhash.rs +++ b/irdest-core/src/auth/pwhash.rs @@ -28,7 +28,7 @@ impl PwHash { let new = Blake2b::new() .chain(pw.into()) .chain(&self.salt) - .result() + .finalize() .to_vec(); self.hash == new @@ -54,7 +54,7 @@ impl PwHash { let hash = Blake2b::new() .chain(pw.into()) .chain(&salt) - .result() + .finalize() .to_vec(); Self { hash, salt } diff --git a/irdest-core/src/messages/generator.rs b/irdest-core/src/messages/generator.rs index 351177e6..af7f0b89 100644 --- a/irdest-core/src/messages/generator.rs +++ b/irdest-core/src/messages/generator.rs @@ -72,7 +72,7 @@ impl MsgBuilder { pub(crate) fn generate(&self) -> Message { let mut rng = rand::thread_rng(); let sender = self.sender.clone().unwrap_or_else(|| { - Identity::truncate(&Standard.sample_iter(rng).take(ID_LEN).collect()) + Identity::truncate(Standard.sample_iter(rng).take(ID_LEN).collect::<Vec<_>>()) }); let associator = self.associator.clone().unwrap_or("".into()); let id = self.id.clone().unwrap_or_else(|| MsgId::random()); diff --git a/ratman/identity/Cargo.toml b/ratman/identity/Cargo.toml index f4eb957d..28200d5b 100644 --- a/ratman/identity/Cargo.toml +++ b/ratman/identity/Cargo.toml @@ -16,7 +16,7 @@ aligned = [] [dependencies] serde = { version = "1.0", features = ["derive"] } -blake2 = { version = "0.8.0", optional = true } +blake2 = { version = "0.9.0", optional = true } rand = { version = "0.7", optional = true } cfg-if = "1.0" hex = "0.4" diff --git a/ratman/identity/src/lib.rs b/ratman/identity/src/lib.rs index f0c7b674..7c7192f1 100644 --- a/ratman/identity/src/lib.rs +++ b/ratman/identity/src/lib.rs @@ -72,12 +72,13 @@ impl Identity { /// /// This function will panic, if the provided vector isn't long /// enough, but extra data will simply be discarded. - pub fn truncate<'vec, V: Into<&'vec Vec<u8>>>(vec: V) -> Self { - let vec = vec.into(); - assert!(vec.len() >= ID_LEN); + pub fn truncate(bytes: impl AsRef<[u8]>) -> Self { + let bytes = bytes.as_ref(); + assert!(bytes.len() >= ID_LEN); Self( - vec.into_iter() + bytes + .into_iter() .enumerate() .take(ID_LEN) .fold([0; ID_LEN], |mut buf, (i, u)| { @@ -136,13 +137,13 @@ impl Identity { #[cfg(feature = "digest")] pub fn with_digest<'vec, V: Into<&'vec Vec<u8>>>(vec: V) -> Self { use blake2::{ - digest::{Input, VariableOutput}, + digest::{Update, VariableOutput}, VarBlake2b, }; let mut hasher = VarBlake2b::new(ID_LEN).unwrap(); - hasher.input(vec.into()); - Self::truncate(&hasher.vec_result()) + hasher.update(vec.into()); + Self::truncate(hasher.finalize_boxed()) } /// Generate a new random Identity -- 2.30.0

2 1

[Community] [PATCH] Remove unused dependencies
by Alyssa Ross 16 Apr '21

16 Apr '21

Identified with cargo-udeps. Thanks Milan for telling me about it! I left irdest-gtk's dependency on irdest-sdk, because I figure it's only a matter of time until that's used. Thanks-to: Milan Pässler <milan(a)petabyte.dev> --- Cargo.lock | 834 +++++++------------------------- clients/hubd/Cargo.toml | 3 - irdest-core/Cargo.toml | 6 +- irdest-core/types/Cargo.toml | 4 +- netmods/netmod-mem/Cargo.toml | 1 - netmods/netmod-tcp/Cargo.toml | 1 - netmods/netmod-udp/Cargo.toml | 1 - netmods/netmod-wd/Cargo.toml | 2 - ratman/Cargo.toml | 1 - ratman/configure/Cargo.toml | 1 - ratman/harness/Cargo.toml | 1 - ratman/netmod/Cargo.toml | 1 - rpc-core/irpc-broker/Cargo.toml | 1 - rpc-core/irpc-sdk/Cargo.toml | 3 +- utils/alexandria/Cargo.toml | 2 - 15 files changed, 185 insertions(+), 677 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9ed7f433..2f1dfdd1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,12 +23,10 @@ dependencies = [ "rand 0.7.3", "ratman-identity", "serde", - "serde_json", "sodiumoxide", "tempfile", "thiserror", "tracing", - "tracing-futures", ] [[package]] @@ -47,7 +45,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -56,32 +54,14 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] name = "anyhow" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afddf7f520a80dbf76e6f50a35bca42a2331ef227a28b3b6dc5c2e2338d114b1" - -[[package]] -name = "arbitrary" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "698b65a961a9d730fb45b6b0327e20207810c9f61ee421b082b27ba003f49e2b" - -[[package]] -name = "as-slice" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb4d1c23475b74e3672afa8c2be22040b8b7783ad9b461021144ed10a46bb0e6" -dependencies = [ - "generic-array 0.12.3", - "generic-array 0.13.2", - "generic-array 0.14.4", - "stable_deref_trait", -] +checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" [[package]] name = "ascii" @@ -96,7 +76,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5" dependencies = [ "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.69", ] [[package]] @@ -150,14 +130,14 @@ dependencies = [ "fastrand", "futures-lite", "libc", - "log 0.4.14", + "log", "nb-connect", "once_cell", "parking", "polling", "vec-arena", "waker-fn", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -191,7 +171,7 @@ dependencies = [ "futures-lite", "once_cell", "signal-hook", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -213,7 +193,7 @@ dependencies = [ "futures-lite", "gloo-timers", "kv-log-macro", - "log 0.4.14", + "log", "memchr", "num_cpus", "once_cell", @@ -231,13 +211,13 @@ checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0" [[package]] name = "async-trait" -version = "0.1.42" +version = "0.1.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3a45e77e34375a7923b1e8febb049bb011f064714a8e17a1a616fef01da13d" +checksum = "589652ce7ccb335d1e7ecb3be145425702b290dbcb7029bbeaae263fc1d87b48" dependencies = [ - "proc-macro2 1.0.24", + "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.69", ] [[package]] @@ -247,7 +227,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "812b4911e210bd51b24596244523c856ca749e6223c50a7fbbba3f89ee37c426" dependencies = [ "atk-sys", - "bitflags 1.2.1", + "bitflags", "glib", "glib-sys", "gobject-sys", @@ -272,17 +252,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" -[[package]] -name = "attohttpc" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf13118df3e3dce4b5ac930641343b91b656e4e72c8f8325838b01a4b1c9d45" -dependencies = [ - "http", - "log 0.4.14", - "url", -] - [[package]] name = "atty" version = "0.2.14" @@ -291,7 +260,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ "hermit-abi", "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -308,11 +277,10 @@ checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" [[package]] name = "bincode" -version = "1.3.2" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d175dfa69e619905c4c3cdb7c3c203fa3bdd5d51184e3afdb2742c0280493772" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" dependencies = [ - "byteorder", "serde", ] @@ -322,16 +290,16 @@ version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd4865004a46a0aafb2a0a5eb19d3c9fc46ee5f063a6cfc605c69ac9ecf5263d" dependencies = [ - "bitflags 1.2.1", + "bitflags", "cexpr", "clang-sys", "clap", "env_logger", "lazy_static", "lazycell", - "log 0.4.14", + "log", "peeking_take_while", - "proc-macro2 1.0.24", + "proc-macro2 1.0.26", "quote 1.0.9", "regex", "rustc-hash", @@ -339,12 +307,6 @@ dependencies = [ "which", ] -[[package]] -name = "bitflags" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f67931368edf3a9a51d29886d245f1c3db2f1ef0dcc9e35ff70341b78c10d23" - [[package]] name = "bitflags" version = "1.2.1" @@ -411,15 +373,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "byteorder" -version = "1.3.4" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" - -[[package]] -name = "bytes" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "cache-padded" @@ -433,7 +389,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c5c0f2e047e8ca53d0ff249c54ae047931d7a6ebe05d00af73e0ffeb6e34bdb8" dependencies = [ - "bitflags 1.2.1", + "bitflags", "cairo-sys-rs", "glib", "glib-sys", @@ -453,12 +409,6 @@ dependencies = [ "system-deps", ] -[[package]] -name = "capnp" -version = "0.13.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e76a319e55a4ef27c8c383215fa3160167bd8a883e8d27c0ecd57ed81bca2af" - [[package]] name = "cc" version = "1.0.67" @@ -503,16 +453,16 @@ dependencies = [ "num-traits", "serde", "time", - "winapi 0.3.9", + "winapi", ] [[package]] name = "clang-sys" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f54d78e30b388d4815220c8dd03fea5656b6c6d32adb59e89061552a102f8da1" +checksum = "853eda514c284c2287f4bf20ae614f8781f40a81d32ecda6e91449304dfe077c" dependencies = [ - "glob 0.3.0", + "glob", "libc", "libloading", ] @@ -525,7 +475,7 @@ checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" dependencies = [ "ansi_term 0.11.0", "atty", - "bitflags 1.2.1", + "bitflags", "strsim", "term_size", "textwrap", @@ -571,32 +521,12 @@ dependencies = [ "cache-padded", ] -[[package]] -name = "conjoiner-engine" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60abd3730920fc7cb3488fb17d8ede5f99b1b24d6c2dac1ccfd6497e28967dfd" -dependencies = [ - "postcard", - "serde", -] - [[package]] name = "cpuid-bool" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" -[[package]] -name = "crossbeam-channel" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils", -] - [[package]] name = "crossbeam-utils" version = "0.8.3" @@ -614,7 +544,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" dependencies = [ - "generic-array 0.12.3", + "generic-array 0.12.4", "subtle 1.0.0", ] @@ -630,19 +560,19 @@ dependencies = [ [[package]] name = "ctor" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8f45d9ad417bcef4817d614a501ab55cdd96a6fdb24f49aab89a54acfd66b19" +checksum = "5e98e2ad1a782e33928b96fc3948e7c355e5af34ba4de7670fe8bac2a3b2006d" dependencies = [ "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.69", ] [[package]] name = "curve25519-dalek" -version = "3.0.2" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f627126b946c25a4638eec0ea634fc52506dea98db118aae985118ce7c3d723f" +checksum = "639891fde0dbea823fc3d798a0fdf9d2f9440a42d64a78ab3488b0ca025117b3" dependencies = [ "byteorder", "digest 0.9.0", @@ -657,7 +587,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" dependencies = [ - "generic-array 0.12.3", + "generic-array 0.12.4", ] [[package]] @@ -687,7 +617,7 @@ checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ "libc", "redox_users", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -727,7 +657,7 @@ checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f" dependencies = [ "atty", "humantime", - "log 0.4.14", + "log", "regex", "termcolor", ] @@ -756,27 +686,11 @@ dependencies = [ "instant", ] -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "form_urlencoded" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" -dependencies = [ - "matches", - "percent-encoding", -] - [[package]] name = "futures" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f55667319111d593ba876406af7c409c0ebb44dc4be6132a783ccf163ea14c1" +checksum = "a9d5813545e459ad3ca1bff9915e9ad7f1a47dc6a91b627ce321d5863b7dd253" dependencies = [ "futures-channel", "futures-core", @@ -789,9 +703,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2dd2df839b57db9ab69c2c9d8f3e8c81984781937fe2807dc6dcf3b2ad2939" +checksum = "ce79c6a52a299137a6013061e0cf0e688fce5d7f1bc60125f520912fdb29ec25" dependencies = [ "futures-core", "futures-sink", @@ -799,15 +713,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15496a72fabf0e62bdc3df11a59a3787429221dd0710ba8ef163d6f7a9112c94" +checksum = "098cd1c6dda6ca01650f1a37a794245eb73181d0d4d4e955e2f3c37db7af1815" [[package]] name = "futures-executor" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891a4b7b96d84d5940084b2a37632dd65deeae662c114ceaa2c879629c9c0ad1" +checksum = "10f6cb7042eda00f0049b1d2080aa4b93442997ee507eb3828e8bd7577f94c9d" dependencies = [ "futures-core", "futures-task", @@ -816,9 +730,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71c2c65c57704c32f5241c1223167c2c3294fd34ac020c807ddbe6db287ba59" +checksum = "365a1a1fb30ea1c03a830fdb2158f5236833ac81fa0ad12fe35b29cddc35cb04" [[package]] name = "futures-lite" @@ -837,33 +751,33 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea405816a5139fb39af82c2beb921d52143f556038378d6db21183a5c37fbfb7" +checksum = "668c6733a182cd7deb4f1de7ba3bf2120823835b3bcfbeacf7d2c4a773c1bb8b" dependencies = [ "proc-macro-hack", - "proc-macro2 1.0.24", + "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.69", ] [[package]] name = "futures-sink" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85754d98985841b7d4f5e8e6fbfa4a4ac847916893ec511a2917ccd8525b8bb3" +checksum = "5c5629433c555de3d82861a7a4e3794a4c40040390907cfbfd7143a92a426c23" [[package]] name = "futures-task" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa189ef211c15ee602667a6fcfe1c1fd9e07d42250d2156382820fba33c9df80" +checksum = "ba7aa51095076f3ba6d9a1f702f74bd05ec65f555d70d2033d55ba8d69f581bc" [[package]] name = "futures-util" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1812c7ab8aedf8d6f2701a43e1243acdbcc2b36ab26e2ad421eb99ac963d96d1" +checksum = "3c144ad54d60f23927f0a6b6d816e4271278b64f005ad65e4e35291d2de9c025" dependencies = [ "futures-channel", "futures-core", @@ -885,7 +799,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db00839b2a68a7a10af3fa28dfb3febaba3a20c3a9ac2425a33b7df1f84a6b7d" dependencies = [ - "bitflags 1.2.1", + "bitflags", "cairo-rs", "cairo-sys-rs", "gdk-pixbuf", @@ -946,18 +860,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" -dependencies = [ - "typenum", -] - -[[package]] -name = "generic-array" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed1e761351b56f54eb9dcd0cfaca9fd0daecf93918e1cfc01c8a3d26ee7adcd" +checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" dependencies = [ "typenum", ] @@ -1000,7 +905,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fb60242bfff700772dae5d9e3a1f7aa2e4ebccf18b89662a16acb2822568561" dependencies = [ - "bitflags 1.2.1", + "bitflags", "futures", "futures-channel", "futures-core", @@ -1025,7 +930,7 @@ dependencies = [ "gobject-sys", "libc", "system-deps", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1034,7 +939,7 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c685013b7515e668f1b57a165b009d4d28cb139a8a989bbd699c10dad29d0c5" dependencies = [ - "bitflags 1.2.1", + "bitflags", "futures-channel", "futures-core", "futures-executor", @@ -1058,9 +963,9 @@ dependencies = [ "itertools", "proc-macro-crate", "proc-macro-error", - "proc-macro2 1.0.24", + "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.69", ] [[package]] @@ -1073,12 +978,6 @@ dependencies = [ "system-deps", ] -[[package]] -name = "glob" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" - [[package]] name = "glob" version = "0.3.0" @@ -1116,7 +1015,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f022f2054072b3af07666341984562c8e626a79daa8be27b955d12d06a5ad6a" dependencies = [ "atk", - "bitflags 1.2.1", + "bitflags", "cairo-rs", "cairo-sys-rs", "cc", @@ -1155,28 +1054,6 @@ dependencies = [ "system-deps", ] -[[package]] -name = "hash32" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4041af86e63ac4298ce40e5cca669066e75b6f1aa3390fe2561ffa5e1d9f4cc" -dependencies = [ - "byteorder", -] - -[[package]] -name = "heapless" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74911a68a1658cfcfb61bc0ccfbd536e3b6e906f8c2f7883ee50157e3e2184f1" -dependencies = [ - "as-slice", - "generic-array 0.13.2", - "hash32", - "serde", - "stable_deref_trait", -] - [[package]] name = "heck" version = "0.3.2" @@ -1197,9 +1074,9 @@ dependencies = [ [[package]] name = "hex" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hmac" @@ -1211,47 +1088,12 @@ dependencies = [ "digest 0.9.0", ] -[[package]] -name = "http" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7245cd7449cc792608c3c8a9eaf69bd4eabbabf802713748fd739c98b82f0747" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - [[package]] name = "humantime" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" -[[package]] -name = "idna" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "igd" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd32c880165b2f776af0b38d206d1cabaebcf46c166ac6ae004a5d45f7d48ef" -dependencies = [ - "attohttpc", - "log 0.4.14", - "rand 0.7.3", - "url", - "xmltree", -] - [[package]] name = "instant" version = "0.1.9" @@ -1261,23 +1103,12 @@ dependencies = [ "cfg-if 1.0.0", ] -[[package]] -name = "ipnetwork" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c3eaab3ac0ede60ffa41add21970a7df7d91772c03383aac6c2c3d53cc716b" -dependencies = [ - "serde", -] - [[package]] name = "ircore-types" version = "0.1.0" dependencies = [ "alexandria-tags", - "async-trait", "bincode", - "irpc-sdk", "ratman-identity", "serde", "serde_json", @@ -1293,15 +1124,11 @@ dependencies = [ "base64", "bincode", "blake2 0.8.1", - "crossbeam-channel", - "futures", "hex", "ircore-types", "irpc-sdk", "jni", - "log 0.4.14", - "mime", - "netmod-mem", + "log", "rand 0.7.3", "ratman", "ratman-harness", @@ -1330,13 +1157,10 @@ dependencies = [ "async-std", "clap", "directories-next", - "igd", - "ipnetwork", "irdest-core", "irpc-broker", "netmod-tcp", "netmod-udp", - "pnet", "ratman", "ratman-configure", "tracing", @@ -1375,13 +1199,12 @@ version = "0.1.0" dependencies = [ "async-std", "byteorder", - "capnp", "irpc-sdk", "lazy_static", "ratman-identity", "serde", "signal-hook", - "socket2", + "socket2 0.3.19", "tracing", "tracing-subscriber", ] @@ -1403,7 +1226,6 @@ name = "irpc-sdk" version = "0.1.1" dependencies = [ "async-std", - "async-trait", "byteorder", "ratman-identity", "serde", @@ -1436,7 +1258,7 @@ dependencies = [ "combine", "error-chain", "jni-sys", - "log 0.4.14", + "log", "walkdir", ] @@ -1448,23 +1270,13 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "js-sys" -version = "0.3.48" +version = "0.3.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc9f84f9b115ce7843d60706df1422a916680bfdfcbdb0447c5614ff9d7e4d78" +checksum = "2d99f9e3e84b8f67f846ef5b4cbbc3b1c29f6c759fcbce6f01aa0e73d932a24c" dependencies = [ "wasm-bindgen", ] -[[package]] -name = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - [[package]] name = "keybob" version = "0.4.0" @@ -1486,7 +1298,7 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" dependencies = [ - "log 0.4.14", + "log", ] [[package]] @@ -1503,9 +1315,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.87" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "265d751d31d6780a3f956bb5b8022feba2d94eeee5a84ba64f4212eedca42213" +checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41" [[package]] name = "libloading" @@ -1514,7 +1326,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a" dependencies = [ "cfg-if 1.0.0", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1536,15 +1348,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "log" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" -dependencies = [ - "log 0.4.14", -] - [[package]] name = "log" version = "0.4.14" @@ -1564,32 +1367,20 @@ dependencies = [ "regex-automata", ] -[[package]] -name = "matches" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" - [[package]] name = "memchr" version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" -[[package]] -name = "mime" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" - [[package]] name = "nb-connect" -version = "1.0.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670361df1bc2399ee1ff50406a0d422587dd3bb0da596e1978fe8e05dabddf4f" +checksum = "a19900e7eee95eb2b3c2e26d12a874cc80aaf750e31be6fcbe743ead369fa45d" dependencies = [ "libc", - "socket2", + "socket2 0.4.0", ] [[package]] @@ -1598,7 +1389,6 @@ version = "0.4.0" dependencies = [ "async-std", "async-trait", - "crossbeam-channel", "ratman-identity", "ratman-netmod", ] @@ -1616,7 +1406,6 @@ dependencies = [ "serde", "thiserror", "tracing", - "tracing-futures", ] [[package]] @@ -1631,7 +1420,6 @@ dependencies = [ "serde", "task-notify", "tracing", - "tracing-futures", ] [[package]] @@ -1640,8 +1428,6 @@ version = "0.2.0" dependencies = [ "async-std", "async-trait", - "bincode", - "jni", "ratman-netmod", ] @@ -1686,9 +1472,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea78b9742c52ac729753c1590e9adc5248ea9bdaf974597efd46c74cfaa5fb54" +checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" [[package]] name = "opaque-debug" @@ -1716,7 +1502,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9937068580bebd8ced19975938573803273ccbcbd598c58d4906efd4ac87c438" dependencies = [ - "bitflags 1.2.1", + "bitflags", "glib", "glib-sys", "gobject-sys", @@ -1764,41 +1550,35 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" -[[package]] -name = "percent-encoding" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" - [[package]] name = "permute" version = "0.1.0" [[package]] name = "pin-project" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96fa8ebb90271c4477f144354485b8068bd8f6b78b428b01ba892ca26caf0b63" +checksum = "bc174859768806e91ae575187ada95c91a29e96a98dc5d2cd9a1fed039501ba6" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "758669ae3558c6f74bd2a18b41f7ac0b5a195aea6639d6a9b5e5d1ad5ba24c0b" +checksum = "a490329918e856ed1b083f244e3bfe2d8c4f336407e4ea9e1a9f479ff09049e5" dependencies = [ - "proc-macro2 1.0.24", + "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.69", ] [[package]] name = "pin-project-lite" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cf491442e4b033ed1c722cb9f0df5fcfcf4de682466c46469c36bc47dc5548a" +checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" [[package]] name = "pin-utils" @@ -1812,125 +1592,19 @@ version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" -[[package]] -name = "pnet" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b657d5b9a98a2c81b82549922b8b15984e49f8120cd130b11a09f81b9b55d633" -dependencies = [ - "ipnetwork", - "pnet_base", - "pnet_datalink", - "pnet_packet", - "pnet_sys", - "pnet_transport", -] - -[[package]] -name = "pnet_base" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4688aa497ef62129f302a5800ebde67825f8ff129f43690ca84099f6620bed" - -[[package]] -name = "pnet_datalink" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59001c9c4d9d23bf2f61afaaf134a766fd6932ba2557c606b9112157053b9ac7" -dependencies = [ - "ipnetwork", - "libc", - "pnet_base", - "pnet_sys", - "winapi 0.3.9", -] - -[[package]] -name = "pnet_macros" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d894a90dbdbe976e624453fc31b1912f658083778329442dda1cca94f76a3e76" -dependencies = [ - "regex", - "syntex", - "syntex_syntax", -] - -[[package]] -name = "pnet_macros_support" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b99269a458570bc06a9132254349f6543d9abc92e88b68d8de934aac9481f6c" -dependencies = [ - "pnet_base", -] - -[[package]] -name = "pnet_packet" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33f8238f4eb897a55ca06510cd71afb5b5ca7b4ff2d7188f1ca855fc1710133e" -dependencies = [ - "glob 0.2.11", - "pnet_base", - "pnet_macros", - "pnet_macros_support", - "syntex", -] - -[[package]] -name = "pnet_sys" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7589e4c4e7ed72a3ffdff8a65d3bea84e8c3a23e19d0a10e8f45efdf632fff15" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "pnet_transport" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "326abdfd2e70e8e943bd58087b59686de170cac050a3b19c9fcc84db01690af5" -dependencies = [ - "libc", - "pnet_base", - "pnet_packet", - "pnet_sys", -] - [[package]] name = "polling" -version = "2.0.2" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2a7bc6b2a29e632e45451c941832803a18cce6781db04de8a04696cdca8bde4" +checksum = "4fc12d774e799ee9ebae13f4076ca003b40d18a11ac0f3641e6f899618580b7b" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libc", - "log 0.4.14", + "log", "wepoll-sys", - "winapi 0.3.9", + "winapi", ] -[[package]] -name = "postcard" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61f42c9617f3d7b447ee300bf80cb16c7cd7b28ca88555822793f073f69719f" -dependencies = [ - "byteorder", - "heapless", - "postcard-cobs", - "serde", -] - -[[package]] -name = "postcard-cobs" -version = "0.1.5-pre" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c68cb38ed13fd7bc9dd5db8f165b7c8d9c1a315104083a2b10f11354c2af97f" - [[package]] name = "ppv-lite86" version = "0.2.10" @@ -1953,9 +1627,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.24", + "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.69", "version_check", ] @@ -1965,7 +1639,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.24", + "proc-macro2 1.0.26", "quote 1.0.9", "version_check", ] @@ -1993,9 +1667,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.24" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" +checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" dependencies = [ "unicode-xid 0.2.1", ] @@ -2015,7 +1689,7 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" dependencies = [ - "proc-macro2 1.0.24", + "proc-macro2 1.0.26", ] [[package]] @@ -2107,7 +1781,6 @@ dependencies = [ "bincode", "chrono", "clockctrl", - "futures", "netmod-mem", "ratman-identity", "ratman-netmod", @@ -2123,7 +1796,6 @@ name = "ratman-configure" version = "0.1.0" dependencies = [ "async-std", - "netmod-mem", "netmod-tcp", "netmod-udp", "ratman", @@ -2135,7 +1807,6 @@ dependencies = [ name = "ratman-harness" version = "0.1.0" dependencies = [ - "arbitrary", "netmod-mem", "ratman", "tempfile", @@ -2159,7 +1830,6 @@ name = "ratman-netmod" version = "0.5.1" dependencies = [ "async-trait", - "conjoiner-engine", "ratman-identity", "serde", "twox-hash", @@ -2167,11 +1837,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" +checksum = "8270314b5ccceb518e7e578952f0b72b88222d02e8f77f5ecf7abbb673539041" dependencies = [ - "bitflags 1.2.1", + "bitflags", ] [[package]] @@ -2186,14 +1856,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.4.3" +version = "1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a" +checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19" dependencies = [ "aho-corasick", "memchr", "regex-syntax", - "thread_local", ] [[package]] @@ -2208,9 +1877,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.22" +version = "0.6.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581" +checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548" [[package]] name = "relm" @@ -2224,7 +1893,7 @@ dependencies = [ "gobject-sys", "gtk", "libc", - "log 0.4.14", + "log", "quote 0.6.13", "syn 0.15.44", ] @@ -2236,9 +1905,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dfad01c044fc443386089bc153b4586199e96ac4d3749f0a85ec3aec88a069" dependencies = [ "lazy_static", - "proc-macro2 1.0.24", + "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.69", ] [[package]] @@ -2247,7 +1916,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2256,12 +1925,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "rustc-serialize" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" - [[package]] name = "ryu" version = "1.0.5" @@ -2279,22 +1942,22 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.123" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae" +checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.123" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31" +checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" dependencies = [ - "proc-macro2 1.0.24", + "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.69", ] [[package]] @@ -2338,9 +2001,9 @@ checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" [[package]] name = "signal-hook" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a7f3f92a1da3d6b1d32245d0cbcbbab0cfc45996d8df619c42bccfa6d2bbb5f" +checksum = "ef33d6d0cd06e0840fba9985aab098c147e67e05cee14d412d3345ed14ff30ac" dependencies = [ "libc", "signal-hook-registry", @@ -2381,7 +2044,17 @@ checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" dependencies = [ "cfg-if 1.0.0", "libc", - "winapi 0.3.9", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2" +dependencies = [ + "libc", + "winapi", ] [[package]] @@ -2395,12 +2068,6 @@ dependencies = [ "serde", ] -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - [[package]] name = "static_assertions" version = "1.1.0" @@ -2426,9 +2093,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c" dependencies = [ "heck", - "proc-macro2 1.0.24", + "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.69", ] [[package]] @@ -2456,11 +2123,11 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.60" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081" +checksum = "48fe99c6bd8b1cc636890bcc071842de909d902c81ac7dab53ba33c421ab8ffb" dependencies = [ - "proc-macro2 1.0.24", + "proc-macro2 1.0.26", "quote 1.0.9", "unicode-xid 0.2.1", ] @@ -2471,61 +2138,12 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" dependencies = [ - "proc-macro2 1.0.24", + "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.69", "unicode-xid 0.2.1", ] -[[package]] -name = "syntex" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a30b08a6b383a22e5f6edc127d169670d48f905bb00ca79a00ea3e442ebe317" -dependencies = [ - "syntex_errors", - "syntex_syntax", -] - -[[package]] -name = "syntex_errors" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04c48f32867b6114449155b2a82114b86d4b09e1bddb21c47ff104ab9172b646" -dependencies = [ - "libc", - "log 0.3.9", - "rustc-serialize", - "syntex_pos", - "term", - "unicode-xid 0.0.3", -] - -[[package]] -name = "syntex_pos" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fd49988e52451813c61fecbe9abb5cfd4e1b7bb6cdbb980a6fbcbab859171a6" -dependencies = [ - "rustc-serialize", -] - -[[package]] -name = "syntex_syntax" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7628a0506e8f9666fdabb5f265d0059b059edac9a3f810bda077abb5d826bd8d" -dependencies = [ - "bitflags 0.5.0", - "libc", - "log 0.3.9", - "rustc-serialize", - "syntex_errors", - "syntex_pos", - "term", - "unicode-xid 0.0.3", -] - [[package]] name = "system-deps" version = "1.3.2" @@ -2556,17 +2174,7 @@ dependencies = [ "rand 0.8.3", "redox_syscall", "remove_dir_all", - "winapi 0.3.9", -] - -[[package]] -name = "term" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1" -dependencies = [ - "kernel32-sys", - "winapi 0.2.8", + "winapi", ] [[package]] @@ -2576,7 +2184,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2613,9 +2221,9 @@ version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" dependencies = [ - "proc-macro2 1.0.24", + "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.69", ] [[package]] @@ -2634,24 +2242,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] -[[package]] -name = "tinyvec" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317cca572a0e89c3ce0ca1f1bdc9369547fe318a683418e42ac8f59d14701023" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - [[package]] name = "toml" version = "0.5.8" @@ -2675,13 +2268,13 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.13" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a9bd1db7706f2373a190b0d067146caa39350c486f3d455b0e33b431f94c07" +checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2" dependencies = [ - "proc-macro2 1.0.24", + "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.69", ] [[package]] @@ -2710,7 +2303,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3" dependencies = [ "lazy_static", - "log 0.4.14", + "log", "tracing-core", ] @@ -2726,9 +2319,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ab8966ac3ca27126141f7999361cc97dd6fb4b71da04c02044fa9045d98bb96" +checksum = "705096c6f83bf68ea5d357a6aa01829ddbdac531b357b45abeca842938085baa" dependencies = [ "ansi_term 0.12.1", "chrono", @@ -2759,27 +2352,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" - -[[package]] -name = "unicode-bidi" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -dependencies = [ - "matches", -] - -[[package]] -name = "unicode-normalization" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef" -dependencies = [ - "tinyvec", -] +checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" [[package]] name = "unicode-segmentation" @@ -2793,12 +2368,6 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" -[[package]] -name = "unicode-xid" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36dff09cafb4ec7c8cf0023eb0b686cb6ce65499116a12201c9e11840ca01beb" - [[package]] name = "unicode-xid" version = "0.1.0" @@ -2820,18 +2389,6 @@ dependencies = [ "void", ] -[[package]] -name = "url" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b" -dependencies = [ - "form_urlencoded", - "idna", - "matches", - "percent-encoding", -] - [[package]] name = "value-bag" version = "1.0.0-alpha.6" @@ -2843,9 +2400,9 @@ dependencies = [ [[package]] name = "vec-arena" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eafc1b9b2dfc6f5529177b62cf806484db55b32dc7c9658a118e11bbeb33061d" +checksum = "34b2f665b594b07095e3ac3f718e13c2197143416fae4c5706cffb7b1af8d7f1" [[package]] name = "vec_map" @@ -2861,9 +2418,9 @@ checksum = "d63556a25bae6ea31b52e640d7c41d1ab27faba4ccb600013837a3d0b3994ca1" [[package]] name = "version_check" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" +checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" [[package]] name = "visn" @@ -2886,12 +2443,12 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] name = "walkdir" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" dependencies = [ "same-file", - "winapi 0.3.9", + "winapi", "winapi-util", ] @@ -2909,9 +2466,9 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" [[package]] name = "wasm-bindgen" -version = "0.2.71" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee1280240b7c461d6a0071313e08f34a60b0365f14260362e5a2b17d1d31aa7" +checksum = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -2919,24 +2476,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.71" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b7d8b6942b8bb3a9b0e73fc79b98095a27de6fa247615e59d096754a3bc2aa8" +checksum = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae" dependencies = [ "bumpalo", "lazy_static", - "log 0.4.14", - "proc-macro2 1.0.24", + "log", + "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.69", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.21" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e67a5806118af01f0d9045915676b22aaebecf4178ae7021bc171dab0b897ab" +checksum = "81b8b767af23de6ac18bf2168b690bed2902743ddf0fb39252e36f9e2bfc63ea" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -2946,9 +2503,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.71" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ac38da8ef716661f0f36c0d8320b89028efe10c7c0afde65baffb496ce0d3b" +checksum = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f" dependencies = [ "quote 1.0.9", "wasm-bindgen-macro-support", @@ -2956,28 +2513,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.71" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc053ec74d454df287b9374ee8abb36ffd5acb95ba87da3ba5b7d3fe20eb401e" +checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c" dependencies = [ - "proc-macro2 1.0.24", + "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.69", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.71" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d6f8ec44822dd71f5f221a5847fb34acd9060535c1211b70a05844c0f6383b1" +checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489" [[package]] name = "web-sys" -version = "0.3.48" +version = "0.3.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec600b26223b2948cedfde2a0aa6756dcf1fef616f43d7b3097aaf53a6c4d92b" +checksum = "a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be" dependencies = [ "js-sys", "wasm-bindgen", @@ -3001,12 +2558,6 @@ dependencies = [ "libc", ] -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - [[package]] name = "winapi" version = "0.3.9" @@ -3017,12 +2568,6 @@ dependencies = [ "winapi-x86_64-pc-windows-gnu", ] -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - [[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" @@ -3035,7 +2580,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -3044,21 +2589,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "xml-rs" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b07db065a5cf61a7e4ba64f29e67db906fb1787316516c4e6e5ff0fea1efcd8a" - -[[package]] -name = "xmltree" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d046fd42d4137234742eae0d05b4fb6fbdda9aed7c78e523ae890fd87c7e11dd" -dependencies = [ - "xml-rs", -] - [[package]] name = "zeroize" version = "1.2.0" @@ -3074,8 +2604,8 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3f369ddb18862aba61aa49bf31e74d29f0f162dec753063200e1dc084345d16" dependencies = [ - "proc-macro2 1.0.24", + "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.60", + "syn 1.0.69", "synstructure", ] diff --git a/clients/hubd/Cargo.toml b/clients/hubd/Cargo.toml index a5684be5..fa87bad7 100644 --- a/clients/hubd/Cargo.toml +++ b/clients/hubd/Cargo.toml @@ -17,8 +17,5 @@ ratman-configure = { path = "../../ratman/configure" } async-std = { version = "1.0", features = ["attributes"] } clap = { version = "2.0", features = ["wrap_help", "color"] } directories-next = "2.0" -igd = "0.11" -ipnetwork = "0.17" -pnet = "0.27" tracing = "0.1" tracing-subscriber = { version = "0.2", features = ["fmt", "env-filter"] } diff --git a/irdest-core/Cargo.toml b/irdest-core/Cargo.toml index 52a52e08..ca894c73 100644 --- a/irdest-core/Cargo.toml +++ b/irdest-core/Cargo.toml @@ -9,7 +9,6 @@ edition = "2018" [dependencies] alexandria = { version = "0.2", path = "../utils/alexandria" } ircore-types = { version = "0.1", path = "types" } -netmod-mem = { version = "0.4", path = "../netmods/netmod-mem", optional = true } irpc-sdk = { version = "0.1", path = "../rpc-core/irpc-sdk", optional = true } ratman = { version = "0.2", path = "../ratman" } @@ -18,11 +17,8 @@ async-trait = "0.1" base64 = "0.12" bincode = "1.0" blake2 = "0.8" -crossbeam-channel = "0.5" -futures = "0.3" hex = "0.4" jni = { version = "0.14", optional = true, default-features = false } -mime = "0.3" rand = "0.7" serde = { version = "1.0", features = [ "derive" ] } sodiumoxide = "0.2.5" @@ -42,4 +38,4 @@ default = ["generate-message", "testing", "rpc"] # TODO: remove rpc default? ffi-java = ["jni"] generate-message = [] rpc = ["irpc-sdk"] -testing = ["tempfile", "netmod-mem"] +testing = ["tempfile"] diff --git a/irdest-core/types/Cargo.toml b/irdest-core/types/Cargo.toml index 3fe3d0a6..a700d0bd 100644 --- a/irdest-core/types/Cargo.toml +++ b/irdest-core/types/Cargo.toml @@ -8,11 +8,9 @@ license = "AGPL-3.0-or-later" [dependencies] ratman-identity = { version ="0.6.0", path = "../../ratman/identity", features = ["random"] } -irpc-sdk = { version = "0.1", path = "../../rpc-core/irpc-sdk" } serde = { version = "1.0", features = ["derive"] } alexandria-tags = { version = "0.2", path = "../../utils/alexandria-tags" } serde_json = "1.0" -async-trait = "0.1" [dev-dependencies] serde_json = "1.0" @@ -20,4 +18,4 @@ bincode = "1.0" [features] # default = ["rpc"] -# rpc = [] \ No newline at end of file +# rpc = [] diff --git a/netmods/netmod-mem/Cargo.toml b/netmods/netmod-mem/Cargo.toml index 4d9fc3d4..7759051f 100644 --- a/netmods/netmod-mem/Cargo.toml +++ b/netmods/netmod-mem/Cargo.toml @@ -9,6 +9,5 @@ license = "AGPL-3.0" [dependencies] async-std = { version = "1.0", features = ["attributes", "unstable"] } async-trait = "0.1" -crossbeam-channel = "0.5" ratman-identity = { version ="0.6", path = "../../ratman/identity", package = "ratman-identity", features = [ "digest" ] } ratman-netmod = { version ="0.5.0", path = "../../ratman/netmod", package = "ratman-netmod" } diff --git a/netmods/netmod-tcp/Cargo.toml b/netmods/netmod-tcp/Cargo.toml index 2ea54286..877bca47 100644 --- a/netmods/netmod-tcp/Cargo.toml +++ b/netmods/netmod-tcp/Cargo.toml @@ -17,4 +17,3 @@ byteorder = "1.0" thiserror = "1.0" serde = { version = "1.0", features = ["derive"] } tracing = "0.1" -tracing-futures = "0.2" diff --git a/netmods/netmod-udp/Cargo.toml b/netmods/netmod-udp/Cargo.toml index 514c2ca0..f412a308 100644 --- a/netmods/netmod-udp/Cargo.toml +++ b/netmods/netmod-udp/Cargo.toml @@ -16,4 +16,3 @@ async-std = { version = "1.0", features = ["unstable"] } bincode = "1.0" serde = { version = "1.0", features = ["derive"] } tracing = "0.1" -tracing-futures = "0.2" diff --git a/netmods/netmod-wd/Cargo.toml b/netmods/netmod-wd/Cargo.toml index 02e659d1..6d039f39 100644 --- a/netmods/netmod-wd/Cargo.toml +++ b/netmods/netmod-wd/Cargo.toml @@ -7,8 +7,6 @@ edition = "2018" license = "AGPL-3.0-or-later" [dependencies] -jni = { version = "0.14", default-features = false } -bincode = "1.0" netmod = { version ="0.5.0", path = "../../ratman/netmod", package = "ratman-netmod" } async-std = { version = "1.0", features = ["unstable"] } async-trait = "0.1" diff --git a/ratman/Cargo.toml b/ratman/Cargo.toml index 7f9e96ff..acfdd4af 100644 --- a/ratman/Cargo.toml +++ b/ratman/Cargo.toml @@ -10,7 +10,6 @@ edition = "2018" async-std = { version = "1.0", features = ["std", "unstable"] } bincode = "1.0" chrono = { version = "0.4", features = ["serde"] } -futures = "0.3" serde = { version = "1.0", features = ["derive"] } tracing = "0.1" tracing-futures = "0.2" diff --git a/ratman/configure/Cargo.toml b/ratman/configure/Cargo.toml index c94ba07a..697d6138 100644 --- a/ratman/configure/Cargo.toml +++ b/ratman/configure/Cargo.toml @@ -8,7 +8,6 @@ license = "AGPL-3.0-or-later" [dependencies] async-std = { version = "1.0", features = ["attributes"] } -netmod-mem = { version ="0.4.0", path = "../../netmods/netmod-mem" } netmod-tcp = { version ="0.4.0", path = "../../netmods/netmod-tcp" } netmod-udp = { version ="0.2.0", path = "../../netmods/netmod-udp" } ratman = { version ="0.2.0", path = ".." } diff --git a/ratman/harness/Cargo.toml b/ratman/harness/Cargo.toml index 0831b8bf..51866097 100644 --- a/ratman/harness/Cargo.toml +++ b/ratman/harness/Cargo.toml @@ -7,7 +7,6 @@ edition = "2018" license = "AGPL-3.0-or-later" [dependencies] -arbitrary = "1.0" ratman = { version = "0.2", path = ".." } netmod-mem = { version = "0.4", path = "../../netmods/netmod-mem" } tempfile = "3.0" diff --git a/ratman/netmod/Cargo.toml b/ratman/netmod/Cargo.toml index 8bb09b06..b7670dd0 100644 --- a/ratman/netmod/Cargo.toml +++ b/ratman/netmod/Cargo.toml @@ -12,7 +12,6 @@ license = "AGPL-3.0" [dependencies] identity = { version ="0.6.0", path = "../identity", features = ["digest", "random"], package = "ratman-identity" } -conjoiner = { version = "1.0", package = "conjoiner-engine" } serde = { version = "1.0", features = ["derive"] } twox-hash = "1.5" async-trait = "0.1" diff --git a/rpc-core/irpc-broker/Cargo.toml b/rpc-core/irpc-broker/Cargo.toml index 2f6b6c38..07a94e83 100644 --- a/rpc-core/irpc-broker/Cargo.toml +++ b/rpc-core/irpc-broker/Cargo.toml @@ -12,7 +12,6 @@ irpc-sdk = { path = "../irpc-sdk", version = "0.1", features = ["internals"] } async-std = { version = "1.0", features = ["attributes"] } byteorder = "1.0" -capnp = "0.13" lazy_static = "1.0" serde = { version = "1.0", features = ["derive"] } signal-hook = "0.3" diff --git a/rpc-core/irpc-sdk/Cargo.toml b/rpc-core/irpc-sdk/Cargo.toml index b5a64e28..a1dbc0e7 100644 --- a/rpc-core/irpc-sdk/Cargo.toml +++ b/rpc-core/irpc-sdk/Cargo.toml @@ -21,6 +21,5 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" async-std = { version = "1.0", features = ["unstable"] } -async-trait = "0.1" byteorder = "1.0" -tracing = "0.1" \ No newline at end of file +tracing = "0.1" diff --git a/utils/alexandria/Cargo.toml b/utils/alexandria/Cargo.toml index 9e4add98..99b04d5e 100644 --- a/utils/alexandria/Cargo.toml +++ b/utils/alexandria/Cargo.toml @@ -21,11 +21,9 @@ keybob = "0.4" serde = { version = "1.0", features = ["derive", "rc"] } sodiumoxide = "0.2.5" tracing = "0.1" -tracing-futures = "0.2" [dev-dependencies] bincode = "1.0" ed25519-dalek = "1.0.0-pre.3" rand = "0.7" -serde_json = "1.0" tempfile = "3.0" -- 2.30.0

2 1

[Community] [PATCH RESEND] alexandria-tags: fix accidentally disabled test
by Alyssa Ross 16 Apr '21

16 Apr '21

--- utils/alexandria-tags/src/lib.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/alexandria-tags/src/lib.rs b/utils/alexandria-tags/src/lib.rs index 09cfd54b..c34cfbe8 100644 --- a/utils/alexandria-tags/src/lib.rs +++ b/utils/alexandria-tags/src/lib.rs @@ -19,10 +19,10 @@ use std::{collections::BTreeSet, fmt}; /// Simply construct a set via one of the `From` implementations of a /// containing type. /// -/// ```norun -/// # use alexandria::data::TagSet; +/// ```no_run +/// # use alexandria_tags::{Tag, TagSet}; /// # use std::collections::BTreeSet; -/// let _: TagSet = vec![].into(); +/// let _: TagSet = Vec::<Tag>::new().into(); /// let _: TagSet = BTreeSet::default().into(); /// ``` #[derive(Clone, Debug, Default, Eq, PartialEq, Hash, Serialize, Deserialize)] -- 2.30.0

2 1

2024

2023

2022

2021

Irdest community