diff options
author | Matthias Beyer <matthias.beyer@atos.net> | 2021-02-01 08:55:54 +0100 |
---|---|---|
committer | Matthias Beyer <matthias.beyer@atos.net> | 2021-02-01 08:55:54 +0100 |
commit | 79ef89fc1ba76577cbce5312205610062b070b7d (patch) | |
tree | 6030f0a711f46bc9e05a4bc8642001015de4fe1d | |
parent | d28f93fe5d30b16e891351c7ecb4d2d4666649ce (diff) | |
parent | a91435fe5c043402df9c3ddeba114fb424fce1bc (diff) |
Merge branch 'update-deps'
-rw-r--r-- | Cargo.toml | 11 | ||||
-rw-r--r-- | src/commands/build.rs | 2 | ||||
-rw-r--r-- | src/commands/release.rs | 2 | ||||
-rw-r--r-- | src/commands/source.rs | 2 | ||||
-rw-r--r-- | src/commands/util.rs | 2 | ||||
-rw-r--r-- | src/endpoint/configured.rs | 4 | ||||
-rw-r--r-- | src/endpoint/scheduler.rs | 6 | ||||
-rw-r--r-- | src/orchestrator/orchestrator.rs | 2 |
8 files changed, 15 insertions, 16 deletions
@@ -30,14 +30,14 @@ git2 = "0.13" handlebars = { version = "3", features = ["no_logging"] } indicatif = "0.15" indoc = "1" -itertools = "0.9" +itertools = "0.10" lazy_static = "1.4" log = "0.4" parse-display = "0.4" pom = "3" ptree = "0.3" regex = "1" -reqwest = { version = "0.10", features = [ "stream" ] } +reqwest = { version = "0.11", features = [ "stream" ] } resiter = "0.4" result-inspect = "0.1" semver = { version = "0.11", features = [ "serde" ] } @@ -45,12 +45,13 @@ serde = "1" serde_json = "1" sha1 = { version = "0.6", features = ["std"] } sha2 = "0.9" -shiplift = { git = "https://github.com/softprops/shiplift", rev = "03cc8c075f86f1bd9e2c4e29872a0e8b9072c7f0" } +shiplift = { git = "https://github.com/softprops/shiplift", rev = "f5017f603afab9821966032ea652cb3161051f17" } syntect = "4.4" tar = "0.4" terminal_size = "0.1" -tokio = { version = "0.2", features = ["macros", "fs", "process", "io-util", "blocking"] } -typed-builder = "0.7" +tokio = { version = "1.0", features = ["macros", "fs", "process", "io-util"] } +tokio-stream = "0.1" +typed-builder = "0.8" unindent = "0.1" url = { version = "2", features = ["serde"] } uuid = { version = "0.6", features = ["serde", "v4"] } diff --git a/src/commands/build.rs b/src/commands/build.rs index 86f205b..3f168fa 100644 --- a/src/commands/build.rs +++ b/src/commands/build.rs @@ -25,8 +25,8 @@ use diesel::QueryDsl; use diesel::RunQueryDsl; use itertools::Itertools; use log::{debug, info, trace, warn}; -use tokio::stream::StreamExt; use tokio::sync::RwLock; +use tokio_stream::StreamExt; use crate::config::*; use crate::filestore::path::StoreRoot; diff --git a/src/commands/release.rs b/src/commands/release.rs index b60383c..7dde913 100644 --- a/src/commands/release.rs +++ b/src/commands/release.rs @@ -16,7 +16,7 @@ use anyhow::Result; use clap::ArgMatches; use diesel::prelude::*; use log::{debug, trace}; -use tokio::stream::StreamExt; +use tokio_stream::StreamExt; use crate::config::Configuration; use crate::db::models as dbmodels; diff --git a/src/commands/source.rs b/src/commands/source.rs index 00a3ca0..1567ca7 100644 --- a/src/commands/source.rs +++ b/src/commands/source.rs @@ -20,7 +20,7 @@ use clap::ArgMatches; use colored::Colorize; use log::{info, trace}; use tokio::io::AsyncWriteExt; -use tokio::stream::StreamExt; +use tokio_stream::StreamExt; use crate::config::*; use crate::package::Package; diff --git a/src/commands/util.rs b/src/commands/util.rs index 8862c05..1d4ac76 100644 --- a/src/commands/util.rs +++ b/src/commands/util.rs @@ -17,7 +17,7 @@ use anyhow::anyhow; use clap::ArgMatches; use log::{error, info, trace}; use regex::Regex; -use tokio::stream::StreamExt; +use tokio_stream::StreamExt; use crate::config::*; use crate::package::Package; diff --git a/src/endpoint/configured.rs b/src/endpoint/configured.rs index fd419a4..7d38c45 100644 --- a/src/endpoint/configured.rs +++ b/src/endpoint/configured.rs @@ -23,9 +23,9 @@ use log::trace; use shiplift::Container; use shiplift::Docker; use shiplift::ExecContainerOptions; -use tokio::stream::StreamExt; -use tokio::sync::mpsc::UnboundedSender; use tokio::sync::RwLock; +use tokio::sync::mpsc::UnboundedSender; +use tokio_stream::StreamExt; use typed_builder::TypedBuilder; use crate::endpoint::EndpointConfiguration; diff --git a/src/endpoint/scheduler.rs b/src/endpoint/scheduler.rs index c2f35fc..a4721a8 100644 --- a/src/endpoint/scheduler.rs +++ b/src/endpoint/scheduler.rs @@ -21,9 +21,9 @@ use indicatif::ProgressBar; use itertools::Itertools; use log::trace; use tokio::io::AsyncWriteExt; -use tokio::stream::StreamExt; -use tokio::sync::mpsc::UnboundedReceiver; use tokio::sync::RwLock; +use tokio::sync::mpsc::UnboundedReceiver; +use tokio_stream::StreamExt; use uuid::Uuid; use crate::db::models as dbmodels; @@ -325,8 +325,6 @@ struct LogReceiver<'a> { impl<'a> LogReceiver<'a> { async fn join(mut self) -> Result<String> { - use resiter::Map; - let mut success = None; let mut accu = vec![]; let mut logfile = self.get_logfile().await.transpose()?; diff --git a/src/orchestrator/orchestrator.rs b/src/orchestrator/orchestrator.rs index 08f8b0e..b99767e 100644 --- a/src/orchestrator/orchestrator.rs +++ b/src/orchestrator/orchestrator.rs @@ -19,10 +19,10 @@ use anyhow::anyhow; use diesel::PgConnection; use indicatif::ProgressBar; use log::trace; -use tokio::stream::StreamExt; use tokio::sync::RwLock; use tokio::sync::mpsc::Receiver; use tokio::sync::mpsc::Sender; +use tokio_stream::StreamExt; use typed_builder::TypedBuilder; use uuid::Uuid; |