From e43f28f6a8290d8b452c707de06e2d95236f59e3 Mon Sep 17 00:00:00 2001
From: Artem Vorotnikov <artem@vorotnikov.me>
Date: Thu, 2 Jan 2020 22:22:15 +0300
Subject: macros: do not automatically pull rt-core (#2038)

---
 tokio-macros/src/lib.rs | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

(limited to 'tokio-macros')

diff --git a/tokio-macros/src/lib.rs b/tokio-macros/src/lib.rs
index fcdba2bf..bbcc3608 100644
--- a/tokio-macros/src/lib.rs
+++ b/tokio-macros/src/lib.rs
@@ -20,6 +20,7 @@ use proc_macro::TokenStream;
 use quote::quote;
 use std::num::NonZeroUsize;
 
+#[derive(Clone, Copy, PartialEq)]
 enum Runtime {
     Basic,
     Threaded,
@@ -145,21 +146,10 @@ fn parse_knobs(
         }
     }
 
-    let mut rt = quote! { tokio::runtime::Builder::new() };
-    match (runtime, is_test) {
-        (Some(Runtime::Threaded), _) => {
-            if rt_threaded {
-                rt = quote! { #rt.threaded_scheduler() }
-            }
-        }
-        (Some(Runtime::Basic), _) => rt = quote! { #rt.basic_scheduler() },
-        (None, true) => rt = quote! { #rt.basic_scheduler() },
-        (None, false) => {
-            if rt_threaded {
-                rt = quote! { #rt.threaded_scheduler() }
-            }
-        }
-    };
+    let mut rt = quote! { tokio::runtime::Builder::new().basic_scheduler() };
+    if rt_threaded && (runtime == Some(Runtime::Threaded) || (runtime.is_none() && !is_test)) {
+        rt = quote! { #rt.threaded_scheduler() };
+    }
     if let Some(v) = core_threads.map(|v| v.get()) {
         rt = quote! { #rt.core_threads(#v) };
     }
-- 
cgit v1.2.3