From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox 1/4] Cargo.toml: update to tokio 1.0
Date: Tue, 12 Jan 2021 14:58:11 +0100 [thread overview]
Message-ID: <20210112135830.2798301-2-f.gruenbichler@proxmox.com> (raw)
In-Reply-To: <20210112135830.2798301-1-f.gruenbichler@proxmox.com>
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
proxmox/Cargo.toml | 13 ++++-----
proxmox/debian/control | 61 ++++++++++++++++++++++++++++--------------
2 files changed, 48 insertions(+), 26 deletions(-)
diff --git a/proxmox/Cargo.toml b/proxmox/Cargo.toml
index b3d6030..46037b9 100644
--- a/proxmox/Cargo.toml
+++ b/proxmox/Cargo.toml
@@ -13,14 +13,14 @@ exclude = [ "debian" ]
[[example]]
name = "u2ftest"
-required-features = [ "tokio", "u2f" ]
+required-features = [ "tokio", "tokio-stream", "u2f" ]
[dependencies]
# General dependencies
anyhow = "1.0"
lazy_static = "1.4"
libc = "0.2"
-nix = "0.19"
+nix = "0.19.1"
# tools module:
base32 = { version = "0.4", optional = true }
@@ -36,16 +36,17 @@ serde_json = "1.0"
# libc, nix, lazy_static
# api module:
-bytes = "0.5"
+bytes = "1.0"
futures = { version = "0.3", optional = true }
http = "0.2"
-hyper = { version = "0.13", optional = true }
+hyper = { version = "0.14", features = [ "full" ], optional = true }
percent-encoding = "2.1"
openssl = { version = "0.10", optional = true }
-rustyline = "6"
+rustyline = "7"
serde_derive = "1.0"
textwrap = "0.11"
-tokio = { version = "0.2", features = [], optional = true }
+tokio = { version = "1.0", features = [], optional = true }
+tokio-stream = { version = "0.1.1", optional = true }
url = "2.1"
#regex, serde, serde_json
diff --git a/proxmox/debian/control b/proxmox/debian/control
index 47226da..feac20c 100644
--- a/proxmox/debian/control
+++ b/proxmox/debian/control
@@ -9,27 +9,28 @@ Build-Depends: debhelper (>= 11),
librust-anyhow-1+default-dev <!nocheck>,
librust-base32-0.4+default-dev <!nocheck>,
librust-base64-0.12+default-dev <!nocheck>,
- librust-bytes-0.5+default-dev <!nocheck>,
+ librust-bytes-1+default-dev <!nocheck>,
librust-endian-trait-0.6+arrays-dev <!nocheck>,
librust-endian-trait-0.6+default-dev <!nocheck>,
librust-futures-0.3+default-dev <!nocheck>,
librust-http-0.2+default-dev <!nocheck>,
- librust-hyper-0.13+default-dev <!nocheck>,
+ librust-hyper-0.14+default-dev <!nocheck>,
+ librust-hyper-0.14+full-dev <!nocheck>,
librust-lazy-static-1+default-dev (>= 1.4-~~) <!nocheck>,
librust-libc-0.2+default-dev <!nocheck>,
- librust-nix-0.19+default-dev <!nocheck>,
+ librust-nix-0.19+default-dev (>= 0.19.1-~~) <!nocheck>,
librust-openssl-0.10+default-dev <!nocheck>,
librust-percent-encoding-2+default-dev (>= 2.1-~~) <!nocheck>,
librust-regex-1+default-dev (>= 1.2-~~) <!nocheck>,
- librust-rustyline-6+default-dev <!nocheck>,
+ librust-rustyline-7+default-dev <!nocheck>,
librust-serde-1+default-dev <!nocheck>,
librust-serde-1+derive-dev <!nocheck>,
librust-serde-derive-1+default-dev <!nocheck>,
librust-serde-json-1+default-dev <!nocheck>,
librust-textwrap-0.11+default-dev <!nocheck>,
- librust-tokio-0.2+default-dev <!nocheck>,
- librust-tokio-0.2+io-util-dev <!nocheck>,
- librust-tokio-0.2+sync-dev <!nocheck>,
+ librust-tokio-1+default-dev <!nocheck>,
+ librust-tokio-1+io-util-dev <!nocheck>,
+ librust-tokio-1+sync-dev <!nocheck>,
librust-url-2+default-dev (>= 2.1-~~) <!nocheck>,
uuid-dev <!nocheck>,
uuid-dev <!nocheck>,
@@ -50,16 +51,16 @@ Depends:
${misc:Depends},
librust-anyhow-1+default-dev,
librust-base64-0.12+default-dev,
- librust-bytes-0.5+default-dev,
+ librust-bytes-1+default-dev,
librust-endian-trait-0.6+arrays-dev,
librust-endian-trait-0.6+default-dev,
librust-http-0.2+default-dev,
librust-lazy-static-1+default-dev (>= 1.4-~~),
librust-libc-0.2+default-dev,
- librust-nix-0.19+default-dev,
+ librust-nix-0.19+default-dev (>= 0.19.1-~~),
librust-percent-encoding-2+default-dev (>= 2.1-~~),
librust-regex-1+default-dev (>= 1.2-~~),
- librust-rustyline-6+default-dev,
+ librust-rustyline-7+default-dev,
librust-serde-1+default-dev,
librust-serde-1+derive-dev,
librust-serde-derive-1+default-dev,
@@ -80,6 +81,7 @@ Suggests:
librust-proxmox+proxmox-sortable-macro-dev (= ${binary:Version}),
librust-proxmox+router-dev (= ${binary:Version}),
librust-proxmox+tokio-dev (= ${binary:Version}),
+ librust-proxmox+tokio-stream-dev (= ${binary:Version}),
librust-proxmox+websocket-dev (= ${binary:Version})
Provides:
librust-proxmox+test-harness-dev (= ${binary:Version}),
@@ -142,8 +144,9 @@ Depends:
${misc:Depends},
librust-proxmox-dev (= ${binary:Version}),
librust-proxmox+router-dev (= ${binary:Version}),
- librust-hyper-0.13+default-dev,
- librust-tokio-0.2+default-dev
+ librust-hyper-0.14+default-dev,
+ librust-hyper-0.14+full-dev,
+ librust-tokio-1+default-dev
Provides:
librust-proxmox-0+cli-dev (= ${binary:Version}),
librust-proxmox-0.9+cli-dev (= ${binary:Version}),
@@ -178,7 +181,7 @@ Depends:
${misc:Depends},
librust-proxmox-dev (= ${binary:Version}),
librust-proxmox+u2f-dev (= ${binary:Version}),
- librust-tokio-0.2+macros-dev
+ librust-tokio-1+macros-dev
Provides:
librust-proxmox-0+examples-dev (= ${binary:Version}),
librust-proxmox-0.9+examples-dev (= ${binary:Version}),
@@ -208,7 +211,8 @@ Multi-Arch: same
Depends:
${misc:Depends},
librust-proxmox-dev (= ${binary:Version}),
- librust-hyper-0.13+default-dev
+ librust-hyper-0.14+default-dev,
+ librust-hyper-0.14+full-dev
Provides:
librust-proxmox-0+hyper-dev (= ${binary:Version}),
librust-proxmox-0.9+hyper-dev (= ${binary:Version}),
@@ -265,8 +269,9 @@ Multi-Arch: same
Depends:
${misc:Depends},
librust-proxmox-dev (= ${binary:Version}),
- librust-hyper-0.13+default-dev,
- librust-tokio-0.2+default-dev
+ librust-hyper-0.14+default-dev,
+ librust-hyper-0.14+full-dev,
+ librust-tokio-1+default-dev
Provides:
librust-proxmox-0+router-dev (= ${binary:Version}),
librust-proxmox-0.9+router-dev (= ${binary:Version}),
@@ -281,7 +286,7 @@ Multi-Arch: same
Depends:
${misc:Depends},
librust-proxmox-dev (= ${binary:Version}),
- librust-tokio-0.2+default-dev
+ librust-tokio-1+default-dev
Provides:
librust-proxmox-0+tokio-dev (= ${binary:Version}),
librust-proxmox-0.9+tokio-dev (= ${binary:Version}),
@@ -290,6 +295,21 @@ Description: Proxmox library - feature "tokio"
This metapackage enables feature "tokio" for the Rust proxmox crate, by pulling
in any additional dependencies needed by that feature.
+Package: librust-proxmox+tokio-stream-dev
+Architecture: any
+Multi-Arch: same
+Depends:
+ ${misc:Depends},
+ librust-proxmox-dev (= ${binary:Version}),
+ librust-tokio-stream-0.1+default-dev (>= 0.1.1-~~)
+Provides:
+ librust-proxmox-0+tokio-stream-dev (= ${binary:Version}),
+ librust-proxmox-0.9+tokio-stream-dev (= ${binary:Version}),
+ librust-proxmox-0.9.1+tokio-stream-dev (= ${binary:Version})
+Description: Proxmox library - feature "tokio-stream"
+ This metapackage enables feature "tokio-stream" for the Rust proxmox crate, by
+ pulling in any additional dependencies needed by that feature.
+
Package: librust-proxmox+websocket-dev
Architecture: any
Multi-Arch: same
@@ -297,10 +317,11 @@ Depends:
${misc:Depends},
librust-proxmox-dev (= ${binary:Version}),
librust-futures-0.3+default-dev,
- librust-hyper-0.13+default-dev,
+ librust-hyper-0.14+default-dev,
+ librust-hyper-0.14+full-dev,
librust-openssl-0.10+default-dev,
- librust-tokio-0.2+io-util-dev,
- librust-tokio-0.2+sync-dev
+ librust-tokio-1+io-util-dev,
+ librust-tokio-1+sync-dev
Provides:
librust-proxmox-0+websocket-dev (= ${binary:Version}),
librust-proxmox-0.9+websocket-dev (= ${binary:Version}),
--
2.20.1
next prev parent reply other threads:[~2021-01-12 13:59 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-12 13:58 [pbs-devel] [PATCH-SERIES 0/20] update to tokio 1.0 and friends Fabian Grünbichler
2021-01-12 13:58 ` Fabian Grünbichler [this message]
2021-01-12 13:58 ` [pbs-devel] [PATCH proxmox 2/4] update to rustyline 7 Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [PATCH proxmox 3/4] update to tokio 1.0 Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [PATCH proxmox 4/4] tokio 1.0: drop TimeoutFutureExt Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [PATCH proxmox-backup 01/12] update to tokio 1.0 Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [PATCH proxmox-backup 02/12] tokio 1.0: delay -> sleep Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [PATCH proxmox-backup 03/12] proxmox XXX: use tokio::time::timeout directly Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [PATCH proxmox-backup 04/12] tokio 1.0: AsyncRead/Seek with ReadBuf Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [PATCH proxmox-backup 05/12] tokio: adapt to 1.0 runtime changes Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [PATCH proxmox-backup 06/12] tokio: adapt to 1.0 process:Child changes Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [PATCH proxmox-backup 07/12] tokio 1.0: use ReceiverStream from tokio-stream Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [PATCH proxmox-backup 08/12] tokio 1.0: update to new tokio-openssl interface Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [PATCH proxmox-backup 09/12] tokio 1.0: update to new Signal interface Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [PATCH proxmox-backup 10/12] hyper: use new hyper::upgrade Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [PATCH proxmox-backup 11/12] examples: unify h2 examples Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [PATCH proxmox-backup 12/12] cleanup: remove unnecessary 'mut' and '.clone()' Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [PATCH proxmox-fuse] update to tokio 1.0 Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [PATCH pxar 1/3] " Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [RFC pxar 2/3] clippy: use matches! instead of match Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [RFC pxar 3/3] remove futures-io feature Fabian Grünbichler
2021-01-12 14:42 ` Wolfgang Bumiller
2021-01-12 14:52 ` [pbs-devel] [PATCH-SERIES 0/20] update to tokio 1.0 and friends Wolfgang Bumiller
2021-01-14 13:39 ` [pbs-devel] [PATCH proxmox 1/3] fix u2f example Fabian Grünbichler
2021-01-14 13:39 ` [pbs-devel] [PATCH proxmox-backup] proxmox XXX: adapt to moved ParameterSchema Fabian Grünbichler
2021-01-14 13:39 ` [pbs-devel] [PATCH proxmox 2/3] move ParameterSchema from router to schema Fabian Grünbichler
2021-01-14 13:39 ` [pbs-devel] [PATCH proxmox 3/3] build: add autopkgtest target Fabian Grünbichler
2021-01-14 13:41 ` [pbs-devel] [PATCH pxar 1/2] fix example Fabian Grünbichler
2021-01-14 13:41 ` [pbs-devel] [PATCH pxar 2/2] build: fix --no-default-features Fabian Grünbichler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210112135830.2798301-2-f.gruenbichler@proxmox.com \
--to=f.gruenbichler@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox