From 21d4a682552cc4315e44cc03bb62dca3a28c70c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Fri, 9 Dec 2022 13:58:19 +0100 Subject: [PATCH] sort dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fabian Grünbichler --- Cargo.toml | 9 ++++----- pbs-client/Cargo.toml | 8 ++++---- pbs-datastore/Cargo.toml | 2 +- pbs-fuse-loop/Cargo.toml | 4 ++-- pbs-tape/Cargo.toml | 19 ++++++++++--------- pbs-tools/Cargo.toml | 4 ++-- proxmox-file-restore/Cargo.toml | 8 ++++---- proxmox-restore-daemon/Cargo.toml | 6 +++--- proxmox-rrd/Cargo.toml | 4 ++-- pxar-bin/Cargo.toml | 2 +- 10 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5a3001f9..cd09ffd1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -158,7 +158,6 @@ crc32fast.workspace = true crossbeam-channel.workspace = true endian_trait.workspace = true flate2.workspace = true -thiserror.workspace = true futures.workspace = true h2.workspace = true handlebars.workspace = true @@ -173,8 +172,8 @@ nom.workspace = true num-traits.workspace = true once_cell.workspace = true openssl.workspace = true -pam.workspace = true pam-sys.workspace = true +pam.workspace = true percent-encoding.workspace = true regex.workspace = true rustyline.workspace = true @@ -183,6 +182,7 @@ serde_json.workspace = true siphasher.workspace = true syslog.workspace = true termcolor.workspace = true +thiserror.workspace = true tokio = { workspace = true, features = [ "fs", "io-util", "io-std", "macros", "net", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "time" ] } tokio-openssl.workspace = true tokio-stream.workspace = true @@ -196,7 +196,6 @@ zstd.workspace = true #valgrind_request = { git = "https://github.com/edef1c/libvalgrind_request", version = "1.1.0", optional = true } - proxmox-async.workspace = true proxmox-compression.workspace = true proxmox-http = { workspace = true, features = [ "client-trait", "proxmox-async" ] } # pbs-client doesn't use these @@ -226,9 +225,9 @@ pbs-buildcfg.workspace = true pbs-client.workspace = true pbs-config.workspace = true pbs-datastore.workspace = true -proxmox-rrd.workspace = true -pbs-tools.workspace = true pbs-tape.workspace = true +pbs-tools.workspace = true +proxmox-rrd.workspace = true # Local path overrides # NOTE: You must run `cargo update` after changing this for it to take effect! diff --git a/pbs-client/Cargo.toml b/pbs-client/Cargo.toml index b7055e84..02d33854 100644 --- a/pbs-client/Cargo.toml +++ b/pbs-client/Cargo.toml @@ -10,14 +10,14 @@ anyhow.workspace = true bitflags.workspace = true bytes.workspace = true futures.workspace = true -hex.workspace = true h2.workspace = true +hex.workspace = true http.workspace = true hyper.workspace = true lazy_static.workspace = true libc.workspace = true -nix.workspace = true log.workspace = true +nix.workspace = true openssl.workspace = true percent-encoding.workspace = true pin-project-lite.workspace = true @@ -25,11 +25,11 @@ regex.workspace = true rustyline.workspace = true serde.workspace = true serde_json.workspace = true +tar.workspace = true tokio = { workspace = true, features = [ "fs", "signal" ] } tokio-stream.workspace = true tower-service.workspace = true xdg.workspace = true -tar.workspace = true pathpatterns.workspace = true @@ -40,8 +40,8 @@ proxmox-io = { workspace = true, features = [ "tokio" ] } proxmox-lang.workspace = true proxmox-router = { workspace = true, features = [ "cli", "server" ] } proxmox-schema.workspace = true -proxmox-time.workspace = true proxmox-sys.workspace = true +proxmox-time.workspace = true pxar.workspace = true diff --git a/pbs-datastore/Cargo.toml b/pbs-datastore/Cargo.toml index 440430eb..0ce0bf7e 100644 --- a/pbs-datastore/Cargo.toml +++ b/pbs-datastore/Cargo.toml @@ -37,5 +37,5 @@ proxmox-sys.workspace = true pbs-api-types.workspace = true pbs-buildcfg.workspace = true -pbs-tools.workspace = true pbs-config.workspace = true +pbs-tools.workspace = true diff --git a/pbs-fuse-loop/Cargo.toml b/pbs-fuse-loop/Cargo.toml index 0cf087fc..40a5e744 100644 --- a/pbs-fuse-loop/Cargo.toml +++ b/pbs-fuse-loop/Cargo.toml @@ -10,11 +10,11 @@ anyhow.workspace = true futures.workspace = true lazy_static.workspace = true libc.workspace = true -nix.workspace = true log.workspace = true +nix.workspace = true regex.workspace = true tokio = { workspace = true, features = ["io-util"] } -proxmox-time.workspace = true proxmox-fuse.workspace = true proxmox-sys.workspace = true +proxmox-time.workspace = true diff --git a/pbs-tape/Cargo.toml b/pbs-tape/Cargo.toml index 409a4443..2b826abd 100644 --- a/pbs-tape/Cargo.toml +++ b/pbs-tape/Cargo.toml @@ -6,30 +6,31 @@ edition.workspace = true description = "LTO tape support" [dependencies] +anyhow.workspace = true +bitflags.workspace = true +endian_trait.workspace = true +hex.workspace = true lazy_static.workspace = true libc.workspace = true log.workspace = true -anyhow.workspace = true -thiserror.workspace = true -endian_trait.workspace = true -hex.workspace = true nix.workspace = true +regex.workspace = true serde.workspace = true serde_json.workspace = true -bitflags.workspace = true -regex.workspace = true +thiserror.workspace = true udev.workspace = true proxmox-io.workspace = true proxmox-lang.workspace=true -# api-macro is only used by the binaries, so maybe we should split them out -proxmox-schema = { workspace = true, features = [ "api-macro" ] } +proxmox-sys.workspace = true proxmox-time.workspace = true proxmox-uuid.workspace = true +# api-macro is only used by the binaries, so maybe we should split them out +proxmox-schema = { workspace = true, features = [ "api-macro" ] } + # router::cli is only used by binaries, so maybe we should split them out proxmox-router = { workspace = true, features = ["cli", "server"] } -proxmox-sys.workspace = true pbs-api-types.workspace = true pbs-config.workspace = true diff --git a/pbs-tools/Cargo.toml b/pbs-tools/Cargo.toml index d59e71de..45467a85 100644 --- a/pbs-tools/Cargo.toml +++ b/pbs-tools/Cargo.toml @@ -34,11 +34,11 @@ zstd.workspace = true proxmox-async.workspace = true proxmox-io= { workspace = true, features = [ "tokio" ] } proxmox-lang.workspace=true -proxmox-time.workspace = true proxmox-sys.workspace = true +proxmox-time.workspace = true -pbs-buildcfg.workspace = true pbs-api-types.workspace = true +pbs-buildcfg.workspace = true [dev-dependencies] tokio = { workspace = true, features = [ "macros" ] } diff --git a/proxmox-file-restore/Cargo.toml b/proxmox-file-restore/Cargo.toml index c1975eb8..fc0e5612 100644 --- a/proxmox-file-restore/Cargo.toml +++ b/proxmox-file-restore/Cargo.toml @@ -9,8 +9,8 @@ anyhow.workspace = true base64.workspace = true futures.workspace = true libc.workspace = true -nix.workspace = true log.workspace = true +nix.workspace = true serde.workspace = true serde_json.workspace = true tokio = { workspace = true, features = [ "io-std", "rt", "rt-multi-thread", "time" ] } @@ -19,17 +19,17 @@ tokio-util.workspace = true pxar.workspace = true proxmox-async.workspace = true +proxmox-compression.workspace = true proxmox-lang.workspace=true proxmox-router = { workspace = true, features = [ "cli" ] } proxmox-schema = { workspace = true, features = [ "api-macro" ] } +proxmox-sys = { workspace = true, features = [ "logrotate" ] } proxmox-time.workspace = true proxmox-uuid.workspace = true -proxmox-sys = { workspace = true, features = [ "logrotate" ] } -proxmox-compression.workspace = true pbs-api-types.workspace = true pbs-buildcfg.workspace = true -pbs-config.workspace = true pbs-client.workspace = true +pbs-config.workspace = true pbs-datastore.workspace = true pbs-tools.workspace = true diff --git a/proxmox-restore-daemon/Cargo.toml b/proxmox-restore-daemon/Cargo.toml index ec6c3941..08f77d88 100644 --- a/proxmox-restore-daemon/Cargo.toml +++ b/proxmox-restore-daemon/Cargo.toml @@ -31,10 +31,10 @@ proxmox-compression.workspace = true proxmox-rest-server.workspace = true proxmox-router = { workspace = true, features = [ "cli", "server" ] } proxmox-schema = { workspace = true, features = [ "api-macro" ] } -proxmox-time.workspace = true proxmox-sys = { workspace = true, features = [ "sortable-macro" ] } +proxmox-time.workspace = true pbs-api-types.workspace = true -pbs-tools.workspace = true -pbs-datastore.workspace = true pbs-client.workspace = true +pbs-datastore.workspace = true +pbs-tools.workspace = true diff --git a/proxmox-rrd/Cargo.toml b/proxmox-rrd/Cargo.toml index d8e901ec..c0b7d708 100644 --- a/proxmox-rrd/Cargo.toml +++ b/proxmox-rrd/Cargo.toml @@ -17,9 +17,9 @@ libc.workspace = true log.workspace = true nix.workspace = true serde.workspace = true -serde_json.workspace = true serde_cbor.workspace = true +serde_json.workspace = true -proxmox-time.workspace = true proxmox-schema = { workspace = true, features = [ "api-macro" ] } proxmox-sys.workspace = true +proxmox-time.workspace = true diff --git a/pxar-bin/Cargo.toml b/pxar-bin/Cargo.toml index 23e6464e..d91c03d3 100644 --- a/pxar-bin/Cargo.toml +++ b/pxar-bin/Cargo.toml @@ -11,8 +11,8 @@ path = "src/main.rs" [dependencies] anyhow.workspace = true futures.workspace = true -nix.workspace = true log.workspace = true +nix.workspace = true serde_json.workspace = true tokio = { workspace = true, features = [ "rt", "rt-multi-thread" ] }