From a91435fe5c043402df9c3ddeba114fb424fce1bc Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sat, 30 Jan 2021 15:18:53 +0100
Subject: Update tokio: 0.2 -> 1.0, shiplift

Because tokio 1.0 does not ship with the Stream trait, this patch also
introduces tokio_stream as new dependency.

For more information, look here:

    https://docs.rs/tokio/1.0.3/tokio/stream/index.html

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 src/commands/build.rs            | 2 +-
 src/commands/release.rs          | 2 +-
 src/commands/source.rs           | 2 +-
 src/commands/util.rs             | 2 +-
 src/endpoint/configured.rs       | 4 ++--
 src/endpoint/scheduler.rs        | 4 ++--
 src/orchestrator/orchestrator.rs | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src')

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 db6646c..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;
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;
 
-- 
cgit v1.2.3