Use current thread runtime

Cargo.toml

@@ -55,7 +55,6 @@ url = "1.7.2"
 which = "2.0.1"
 zip = "0.5.2"
 termcolor = "1.0.4"
-tokio-signal = "0.2.7"
 
 [target.'cfg(target_os = "linux")'.dependencies]
 tokio-socketcan = "0.1.3"

src/main.rs

@@ -19,11 +19,10 @@
 // SOFTWARE.
 
 use failure::Error;
-use futures::{sync::oneshot, Future, Sink, Stream};
+use futures::{Future, Sink, Stream};
 use rogcat::{parser, record::Record};
 use std::{process::exit, str::FromStr};
-use tokio::runtime::Runtime;
-use tokio_signal::ctrl_c;
+use tokio::runtime::current_thread::Runtime;
 use url::Url;
 
 mod cli;
@@ -92,36 +91,26 @@ fn run() -> Result<(), Error> {
     let filter = filter::from_args_profile(&args, &profile)?;
     let mut parser = parser::Parser::default();
 
-    let mut runtime = Runtime::new()?;
-
-    let f = source
-        .map(move |a| match a {
-            StreamData::Line(l) => parser.parse(&l),
-            StreamData::Record(r) => r,
-        })
-        .filter(move |r| filter.filter(r))
-        .take_while(move |_| {
-            Ok(match head {
-                Some(0) => false,
-                Some(n) => {
-                    head = Some(n - 1);
-                    true
-                }
-                None => true,
+    Runtime::new()?.block_on(
+        source
+            .map(move |a| match a {
+                StreamData::Line(l) => parser.parse(&l),
+                StreamData::Record(r) => r,
             })
-        })
-        .forward(sink)
-        .map(|_| exit(0))
-        .map_err(|e| eprintln!("{}", e));
-    let mut f = Some(oneshot::spawn(f, &runtime.executor()));
-
-    // Cancel stream processing on ctrl-c
-    runtime.block_on(ctrl_c().flatten_stream().take(1).for_each(move |()| {
-        f.take();
-        Ok(())
-    }))?;
-
-    Ok(())
+            .filter(move |r| filter.filter(r))
+            .take_while(move |_| {
+                Ok(match head {
+                    Some(0) => false,
+                    Some(n) => {
+                        head = Some(n - 1);
+                        true
+                    }
+                    None => true,
+                })
+            })
+            .forward(sink)
+            .map(|_| exit(0)),
+    )
 }
 
 fn main() {