git.delta.rocks / remowt / refs/commits / 075f10342c88

difftreelog

chore cargo-shear

qwnnrlkxYaroslav Bolyukin3 days agoparent: #61cfb31.patch.diff
in: trunk

8 files changed

modifiedCargo.lockdiffbeforeafterboth
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -517,7 +517,7 @@
  "cfg-if",
  "cipher",
  "cpufeatures",
- "rand_core 0.10.1",
+ "rand_core",
  "zeroize",
 ]
 
@@ -670,7 +670,7 @@
  "getrandom 0.4.2",
  "hybrid-array",
  "num-traits",
- "rand_core 0.10.1",
+ "rand_core",
  "serdect",
  "subtle",
  "zeroize",
@@ -684,7 +684,7 @@
 dependencies = [
  "getrandom 0.4.2",
  "hybrid-array",
- "rand_core 0.10.1",
+ "rand_core",
 ]
 
 [[package]]
@@ -694,7 +694,7 @@
 checksum = "3633a51a39c69ebbaa4feaa694bd83d241e4093901c84a0963b19d9bb3f0cf8f"
 dependencies = [
  "crypto-bigint",
- "rand_core 0.10.1",
+ "rand_core",
 ]
 
 [[package]]
@@ -836,7 +836,7 @@
 dependencies = [
  "curve25519-dalek",
  "ed25519",
- "rand_core 0.10.1",
+ "rand_core",
  "serde",
  "sha2",
  "signature",
@@ -867,7 +867,7 @@
  "once_cell",
  "pem-rfc7468",
  "pkcs8",
- "rand_core 0.10.1",
+ "rand_core",
  "sec1",
  "subtle",
  "zeroize",
@@ -972,7 +972,7 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1f686ab92a9fb0eaf188f6c6c87b89490baa6fdb0db4544ba4dc47f7942489f"
 dependencies = [
- "rand_core 0.10.1",
+ "rand_core",
  "subtle",
 ]
 
@@ -1005,12 +1005,6 @@
 checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
 
 [[package]]
-name = "fuchsia-cprng"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
-
-[[package]]
 name = "futures"
 version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1153,7 +1147,7 @@
  "js-sys",
  "libc",
  "r-efi",
- "rand_core 0.10.1",
+ "rand_core",
  "wasip2",
  "wasip3",
  "wasm-bindgen",
@@ -1194,7 +1188,7 @@
 checksum = "7fd1a1c7a5206c5b7a3f5a0d7ccd3ff85d0c8f5133d62a02680255b0004af5f4"
 dependencies = [
  "ff",
- "rand_core 0.10.1",
+ "rand_core",
  "subtle",
 ]
 
@@ -1327,8 +1321,8 @@
 dependencies = [
  "num-integer",
  "num-traits",
- "rand 0.10.1",
- "rand_core 0.10.1",
+ "rand",
+ "rand_core",
 ]
 
 [[package]]
@@ -1380,7 +1374,7 @@
 checksum = "01737161ba802849cfd486b5bd209d38ba4943494c249a8126005170c7621edd"
 dependencies = [
  "crypto-common",
- "rand_core 0.10.1",
+ "rand_core",
 ]
 
 [[package]]
@@ -1489,7 +1483,7 @@
  "kem",
  "module-lattice",
  "pkcs8",
- "rand_core 0.10.1",
+ "rand_core",
  "sha3",
 ]
 
@@ -1527,15 +1521,6 @@
 ]
 
 [[package]]
-name = "non-zero-byte-slice"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89daa1daa11c9df05d1181bcd0936d8066f8543144d77b09808eb78d65e38024"
-dependencies = [
- "serde",
-]
-
-[[package]]
 name = "nu-ansi-term"
 version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1583,51 +1568,8 @@
 version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
-
-[[package]]
-name = "openssh"
-version = "0.11.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d534c4bfecb0ed71dea4db444a5922a294d15cf40e700548f27295e1feb0ef18"
-dependencies = [
- "libc",
- "once_cell",
- "openssh-mux-client",
- "shell-escape",
- "tempfile",
- "thiserror",
- "tokio",
-]
 
 [[package]]
-name = "openssh-mux-client"
-version = "0.17.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df21c25c5f6a6c11cf6c54723c7b1389bfb4b5b0c17b097da274cade81d4815e"
-dependencies = [
- "cfg-if",
- "non-zero-byte-slice",
- "once_cell",
- "openssh-mux-client-error",
- "sendfd",
- "serde",
- "ssh_format",
- "tokio",
- "tokio-io-utility",
- "typed-builder",
-]
-
-[[package]]
-name = "openssh-mux-client-error"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9879168afb48a235200e30d93df320b7191568cda8621df02f145c1c0f1af95a"
-dependencies = [
- "ssh_format_error",
- "thiserror",
-]
-
-[[package]]
 name = "ordered-stream"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1690,7 +1632,7 @@
  "delegate",
  "futures",
  "log",
- "rand 0.10.1",
+ "rand",
  "sha2",
  "thiserror",
  "tokio",
@@ -1809,7 +1751,7 @@
  "cbc",
  "der",
  "pbkdf2",
- "rand_core 0.10.1",
+ "rand_core",
  "scrypt",
  "sha2",
  "spki",
@@ -1823,7 +1765,7 @@
 dependencies = [
  "der",
  "pkcs5",
- "rand_core 0.10.1",
+ "rand_core",
  "spki",
 ]
 
@@ -1905,7 +1847,7 @@
  "crypto-bigint",
  "crypto-common",
  "ff",
- "rand_core 0.10.1",
+ "rand_core",
  "subtle",
  "zeroize",
 ]
@@ -1951,19 +1893,6 @@
 version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
-
-[[package]]
-name = "rand"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
-dependencies = [
- "fuchsia-cprng",
- "libc",
- "rand_core 0.3.1",
- "rdrand",
- "winapi",
-]
 
 [[package]]
 name = "rand"
@@ -1973,23 +1902,8 @@
 dependencies = [
  "chacha20",
  "getrandom 0.4.2",
- "rand_core 0.10.1",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
-dependencies = [
- "rand_core 0.4.2",
+ "rand_core",
 ]
-
-[[package]]
-name = "rand_core"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
 
 [[package]]
 name = "rand_core"
@@ -1998,15 +1912,6 @@
 checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
 
 [[package]]
-name = "rdrand"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
 name = "redox_syscall"
 version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2043,15 +1948,6 @@
 version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"
-
-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi",
-]
 
 [[package]]
 name = "remowt-agent"
@@ -2062,15 +1958,12 @@
  "bifrostlink-ports",
  "clap",
  "futures",
- "futures-util",
  "nix",
- "rand 0.10.1",
  "remowt-endpoints",
  "remowt-link-shared",
  "remowt-plugin",
  "remowt-polkit-shared",
  "remowt-ui-prompt",
- "serde",
  "tempfile",
  "tokio",
  "tokio-util",
@@ -2087,7 +1980,6 @@
 dependencies = [
  "anyhow",
  "bifrostlink",
- "bifrostlink-ports",
  "bytes",
  "camino",
  "futures",
@@ -2108,9 +2000,7 @@
 name = "remowt-endpoints"
 version = "0.1.7"
 dependencies = [
- "anyhow",
  "bifrostlink",
- "bifrostlink-macros",
  "camino",
  "nix",
  "serde",
@@ -2118,7 +2008,6 @@
  "thiserror",
  "tokio",
  "tracing",
- "uuid",
  "zbus",
 ]
 
@@ -2146,7 +2035,6 @@
  "remowt-link-shared",
  "serde_json",
  "tokio",
- "tracing",
  "tracing-subscriber",
 ]
 
@@ -2164,27 +2052,14 @@
 version = "0.1.7"
 dependencies = [
  "anyhow",
- "async-trait",
- "bifrostlink",
- "bifrostlink-ports",
- "bytes",
  "clap",
  "nix",
- "openssh",
  "remowt-client",
  "remowt-link-shared",
  "remowt-ui-prompt",
- "russh",
- "russh-config",
- "serde",
- "serde_json",
- "tempdir",
- "thiserror",
  "tokio",
- "tokio-stream",
  "tracing",
  "tracing-subscriber",
- "uuid",
 ]
 
 [[package]]
@@ -2195,7 +2070,6 @@
  "bifrostlink",
  "bifrostlink-macros",
  "serde",
- "serde_json",
  "thiserror",
  "tokio",
  "tracing",
@@ -2250,7 +2124,7 @@
  "digest",
  "pkcs1",
  "pkcs8",
- "rand_core 0.10.1",
+ "rand_core",
  "sha2",
  "signature",
  "spki",
@@ -2305,8 +2179,8 @@
  "pkcs5",
  "pkcs8",
  "polyval",
- "rand 0.10.1",
- "rand_core 0.10.1",
+ "rand",
+ "rand_core",
  "ring",
  "rsa",
  "russh-cryptovec",
@@ -2442,16 +2316,6 @@
 version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
-
-[[package]]
-name = "sendfd"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b183bfd5b1bc64ab0c1ef3ee06b008a9ef1b68a7d3a99ba566fbfe7a7c6d745b"
-dependencies = [
- "libc",
- "tokio",
-]
 
 [[package]]
 name = "serde"
@@ -2557,12 +2421,6 @@
 dependencies = [
  "lazy_static",
 ]
-
-[[package]]
-name = "shell-escape"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f"
 
 [[package]]
 name = "shlex"
@@ -2593,7 +2451,7 @@
 checksum = "28d567dcbaf0049cb8ac2608a76cd95ff9e4412e1899d389ee400918ca7537f5"
 dependencies = [
  "digest",
- "rand_core 0.10.1",
+ "rand_core",
 ]
 
 [[package]]
@@ -2684,7 +2542,7 @@
  "p256",
  "p384",
  "p521",
- "rand_core 0.10.1",
+ "rand_core",
  "rsa",
  "sec1",
  "sha1",
@@ -2693,25 +2551,6 @@
  "ssh-cipher",
  "ssh-encoding",
  "zeroize",
-]
-
-[[package]]
-name = "ssh_format"
-version = "0.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24ab31081d1c9097c327ec23550858cb5ffb4af6b866c1ef4d728455f01f3304"
-dependencies = [
- "serde",
- "ssh_format_error",
-]
-
-[[package]]
-name = "ssh_format_error"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be3c6519de7ca611f71ef7e8a56eb57aa1c818fecb5242d0a0f39c83776c210c"
-dependencies = [
- "serde",
 ]
 
 [[package]]
@@ -2752,16 +2591,6 @@
  "proc-macro2",
  "quote",
  "unicode-ident",
-]
-
-[[package]]
-name = "tempdir"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
-dependencies = [
- "rand 0.4.6",
- "remove_dir_all",
 ]
 
 [[package]]
@@ -2821,15 +2650,6 @@
  "tokio-macros",
  "tracing",
  "windows-sys 0.61.2",
-]
-
-[[package]]
-name = "tokio-io-utility"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d672654d175710e52c7c41f6aec77c62b3c0954e2a7ebce9049d1e94ed7c263"
-dependencies = [
- "tokio",
 ]
 
 [[package]]
@@ -2841,17 +2661,6 @@
  "proc-macro2",
  "quote",
  "syn 2.0.117",
-]
-
-[[package]]
-name = "tokio-stream"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70"
-dependencies = [
- "futures-core",
- "pin-project-lite",
- "tokio",
 ]
 
 [[package]]
@@ -2952,26 +2761,6 @@
  "thread_local",
  "tracing-core",
  "tracing-log",
-]
-
-[[package]]
-name = "typed-builder"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31aa81521b70f94402501d848ccc0ecaa8f93c8eb6999eb9747e72287757ffda"
-dependencies = [
- "typed-builder-macro",
-]
-
-[[package]]
-name = "typed-builder-macro"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "076a02dc54dd46795c2e9c8282ed40bcfb1e22747e955de9389a1de28190fb26"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
 ]
 
 [[package]]
modifiedCargo.tomldiffbeforeafterboth
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,15 +22,11 @@
 
 camino = { version = "1.2.2", features = ["serde1"] }
 anyhow = "1.0.86"
-async-trait = "0.1.81"
 bytes = "1.11.0"
 clap = "4.5.16"
 futures = "0.3.30"
-futures-util = "0.3.30"
 nix = "0.31.3"
-openssh = "0.11.0"
 pam-client = "0.5.0"
-rand = "0.10.1"
 russh = { version = "0.61.2", default-features = false, features = [
 	"ring",
 	"flate2",
@@ -39,10 +35,8 @@
 russh-config = "0.58.0"
 serde = "1.0.228"
 serde_json = "1.0.149"
-tempdir = "0.3.7"
 tempfile = "3"
 tokio = { version = "1.39.3", features = ["fs"] }
-tokio-stream = "0.1.15"
 tokio-util = "0.7.11"
 tracing = "0.1.40"
 tracing-subscriber = "0.3.18"
modifiedcmds/remowt-agent/Cargo.tomldiffbeforeafterboth
before · cmds/remowt-agent/Cargo.toml
1[package]2name = "remowt-agent"3description = "remowt on-host agent serving fs/pty/systemd endpoints over bifrostlink"4version.workspace = true5edition = "2021"6license.workspace = true78[dependencies]9anyhow.workspace = true10bifrostlink.workspace = true11bifrostlink-ports.workspace = true12clap = { workspace = true, features = ["derive"] }13futures.workspace = true14futures-util.workspace = true15nix.workspace = true16remowt-polkit-shared.workspace = true17rand.workspace = true18remowt-link-shared.workspace = true19remowt-plugin.workspace = true20serde = { workspace = true, features = ["derive"] }21tempfile.workspace = true22tokio = { workspace = true, features = [23	"rt",24	"fs",25	"macros",26	"net",27	"io-util",28	"time",29	"process",30] }31tokio-util = { workspace = true, features = ["codec"] }32tracing.workspace = true33tracing-subscriber.workspace = true34remowt-ui-prompt.workspace = true35uuid = { workspace = true, features = ["v4"] }36zbus = { workspace = true, features = ["tokio"] }37zbus_polkit = { workspace = true, features = ["tokio"] }38remowt-endpoints.workspace = true
modifiedcmds/remowt-ssh/Cargo.tomldiffbeforeafterboth
--- a/cmds/remowt-ssh/Cargo.toml
+++ b/cmds/remowt-ssh/Cargo.toml
@@ -7,9 +7,7 @@
 
 [dependencies]
 clap = { workspace = true, features = ["derive"] }
-openssh = { workspace = true, features = ["native-mux"] }
 tracing-subscriber.workspace = true
-bifrostlink.workspace = true
 remowt-link-shared.workspace = true
 remowt-client.workspace = true
 tokio = { workspace = true, features = [
@@ -22,16 +20,5 @@
 ] }
 nix = { workspace = true, features = ["term"] }
 anyhow.workspace = true
-bifrostlink-ports.workspace = true
-uuid = { workspace = true, features = ["v4"] }
-tempdir.workspace = true
-async-trait.workspace = true
-bytes.workspace = true
-tokio-stream.workspace = true
 tracing.workspace = true
-thiserror.workspace = true
-serde_json.workspace = true
-serde.workspace = true
 remowt-ui-prompt.workspace = true
-russh.workspace = true
-russh-config.workspace = true
modifiedcrates/remowt-client/Cargo.tomldiffbeforeafterboth
--- a/crates/remowt-client/Cargo.toml
+++ b/crates/remowt-client/Cargo.toml
@@ -8,7 +8,6 @@
 [dependencies]
 anyhow.workspace = true
 bifrostlink.workspace = true
-bifrostlink-ports.workspace = true
 bytes.workspace = true
 camino.workspace = true
 serde.workspace = true
modifiedcrates/remowt-endpoints/Cargo.tomldiffbeforeafterboth
--- a/crates/remowt-endpoints/Cargo.toml
+++ b/crates/remowt-endpoints/Cargo.toml
@@ -6,15 +6,12 @@
 license.workspace = true
 
 [dependencies]
-anyhow.workspace = true
 bifrostlink.workspace = true
-bifrostlink-macros.workspace = true
 camino.workspace = true
 serde = { workspace = true }
 tempfile.workspace = true
 thiserror.workspace = true
 tokio = { workspace = true, features = ["net", "io-util", "rt", "process"] }
 tracing.workspace = true
-uuid.workspace = true
 nix = { workspace = true, features = ["process", "signal", "term"] }
 zbus.workspace = true
modifiedcrates/remowt-plugin/Cargo.tomldiffbeforeafterboth
--- a/crates/remowt-plugin/Cargo.toml
+++ b/crates/remowt-plugin/Cargo.toml
@@ -20,5 +20,4 @@
 	"time",
 	"process",
 ] }
-tracing.workspace = true
 tracing-subscriber.workspace = true
modifiedcrates/remowt-ui-prompt/Cargo.tomldiffbeforeafterboth
--- a/crates/remowt-ui-prompt/Cargo.toml
+++ b/crates/remowt-ui-prompt/Cargo.toml
@@ -10,7 +10,6 @@
 bifrostlink.workspace = true
 bifrostlink-macros.workspace = true
 serde.workspace = true
-serde_json.workspace = true
 thiserror.workspace = true
 tokio = { workspace = true, features = ["io-util", "macros", "process", "rt"] }
 tracing.workspace = true