Update tokio base dependencies to tokio 1.x

Author: rylev

Cargo.lock

@@ -17,11 +17,11 @@ libc = "0.2"
 chrono = "0.4"
 lazy_static = "1"
 semver = "1.0"
-reqwest = { version = "0.10", features = ["json"] }
+reqwest = { version = "0.11", features = ["json"] }
 xz2 = "0.1.3"
 tar = "0.4"
-tokio = { version = "0.2", features = ["rt-core"] }
-rustc-artifacts = "0.2"
+tokio = { version = "1.6", features = ["rt"] }
+rustc-artifacts = { path = "../../rustc-artifacts"}
 database = { path = "../database" }
 intern = { path = "../intern" }
 futures = "0.3.5"

collector/Cargo.toml

@@ -546,13 +546,12 @@ fn main_result() -> anyhow::Result<i32> {
 
     let benchmark_dir = PathBuf::from("collector/benchmarks");
 
-    let mut builder = tokio::runtime::Builder::new();
+    let mut builder = tokio::runtime::Builder::new_multi_thread();
     // We want to minimize noise from the runtime
     builder
-        .core_threads(1)
-        .max_threads(1)
-        .enable_io()
-        .basic_scheduler();
+        .worker_threads(1)
+        .max_blocking_threads(1)
+        .enable_io();
     let mut rt = builder.build().expect("built runtime");
 
     let default_db = "results.db";
@@ -810,7 +809,7 @@ fn main_result() -> anyhow::Result<i32> {
 }
 
 pub fn get_commit_or_fake_it(sha: &str) -> anyhow::Result<Commit> {
-    let mut rt = tokio::runtime::Runtime::new().unwrap();
+    let rt = tokio::runtime::Runtime::new().unwrap();
     Ok(rt
         .block_on(rustc_artifacts::master_commits())
         .map_err(|e| anyhow::anyhow!("{:?}", e))

collector/src/main.rs

@@ -10,16 +10,16 @@ edition = "2018"
 hashbrown = { version = "0.11", features = ["serde"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-rusqlite = { version = "0.23", features = ["bundled"] }
-tokio-postgres = { version = "0.5.4", features = ["with-serde_json-1", "with-chrono-0_4"] }
+rusqlite = { version = "0.25", features = ["bundled"] }
+tokio-postgres = { version = "0.7", features = ["with-serde_json-1", "with-chrono-0_4", "runtime"] }
 anyhow = "1"
 async-trait = "0.1"
-tokio = { version = "0.2.21", features = ["sync", "macros"] }
+tokio = { version = "1.6", features = ["sync", "macros"] }
 snap = "1"
 intern = { path = "../intern" }
 chrono = "0.4"
-reqwest = { version = "0.10.5", features = ["blocking"] }
-postgres-native-tls = "0.3"
+reqwest = { version = "0.11", features = ["blocking"] }
+postgres-native-tls = "0.5"
 native-tls = "0.2"
 lazy_static = "1"
 env_logger = "0.8"

database/Cargo.toml

@@ -310,7 +310,7 @@ async fn copy<R: Table>(
                 R::trailer()
             )
             .as_str(),
-            vec![],
+            Vec::<u32>::new(),
         )
         .await
         .unwrap();

database/src/bin/export-to-sqlite.rs

@@ -289,14 +289,14 @@ impl Ingesting for Sqlite<'_> {
         let mut exact = series.chunks_exact(9);
         for series in exact.by_ref() {
             cached
-                .execute(series.iter().flat_map(|v| {
+                .execute(rusqlite::params_from_iter(series.iter().flat_map(|v| {
                     vec![
                         ToSqlOutput::Borrowed(ValueRef::Text(v.krate.as_bytes())),
                         ToSqlOutput::Borrowed(ValueRef::Text(v.profile.as_bytes())),
                         ToSqlOutput::Borrowed(ValueRef::Text(v.cache.as_bytes())),
                         ToSqlOutput::Borrowed(ValueRef::Text(v.statistic.as_bytes())),
                     ]
-                }))
+                })))
                 .unwrap();
         }
         for v in exact.remainder() {
@@ -357,14 +357,14 @@ impl Ingesting for Sqlite<'_> {
         let mut exact = series.chunks_exact(21);
         for series in exact.by_ref() {
             cached
-                .execute(series.iter().flat_map(|v| {
+                .execute(rusqlite::params_from_iter(series.iter().flat_map(|v| {
                     vec![
                         ToSqlOutput::Borrowed(ValueRef::Text(v.krate.as_bytes())),
                         ToSqlOutput::Borrowed(ValueRef::Text(v.profile.as_bytes())),
                         ToSqlOutput::Borrowed(ValueRef::Text(v.cache.as_bytes())),
                         ToSqlOutput::Borrowed(ValueRef::Text(v.query.as_bytes())),
                     ]
-                }))
+                })))
                 .unwrap();
         }
         for v in exact.remainder() {

database/src/bin/ingest-json.rs

@@ -210,7 +210,7 @@ where
     }
 
     async fn get(&self) -> ManagedConnection<T> {
-        let permit = self.permits.clone().acquire_owned().await;
+        let permit = self.permits.clone().acquire_owned().await.unwrap();
         let conn = {
             let mut slots = self.connections.lock().unwrap_or_else(|e| e.into_inner());
             slots.pop()

database/src/pool.rs

@@ -9,12 +9,12 @@ env_logger = "0.8"
 anyhow = "1"
 thiserror = "1"
 futures = "0.3"
-tokio = { version = "0.2", features = ["macros", "time"] }
+tokio = { version = "1.6", features = ["macros", "time"] }
 log = "0.4"
 serde = { version = "1", features = ["rc"] }
 serde_derive = "1"
 serde_json = "1"
-hyper = "0.13"
+hyper = { version = "0.14", features = ["server", "stream"] }
 headers = "0.3"
 http = "0.2"
 home = "0.5"
@@ -25,19 +25,19 @@ ring = "0.16.10"
 hex = "0.4.2"
 regex = "1"
 lazy_static = "1"
-reqwest = { version = "0.10", features = ["json", "blocking"] }
+reqwest = { version = "0.11", features = ["json", "blocking"] }
 toml = "0.5"
 rust_team_data = { git = "https://github.com/rust-lang/team" }
 parking_lot = "0.11"
 snap = "1"
-rustc-artifacts = "0.2.2"
+rustc-artifacts = { path = "../../rustc-artifacts"}
 itertools = "0.10"
 hashbrown = { version = "0.11", features = ["serde"] }
 arc-swap = "1.3"
-rusqlite = { version = "0.23", features = ["bundled"] }
+rusqlite = { version = "0.25", features = ["bundled"] }
 async-trait = "0.1"
 database = { path = "../database" }
-bytes = "0.5.6"
+bytes = "1.0"
 url = "2"
 analyzeme = { git = "https://github.com/rust-lang/measureme" }
 tar = "0.4"

site/Cargo.toml

@@ -188,7 +188,7 @@ r? @ghost",
     let rollup_merge_sha = rollup_merge_sha.to_owned();
     tokio::task::spawn(async move {
         // Give github time to create the merge commit reference
-        tokio::time::delay_for(Duration::from_secs(30)).await;
+        tokio::time::sleep(Duration::from_secs(30)).await;
         // This provides the master SHA so that we can check that we only queue
         // an appropriate try build. If there's ever a race condition, i.e.,
         // master was pushed while this command was running, the user will have to

site/src/github.rs

@@ -3,7 +3,7 @@
 
 use crate::load::InputData;
 use anyhow::Context;
-use bytes::buf::BufExt;
+use bytes::Buf;
 use hyper::StatusCode;
 use std::collections::HashMap;
 use std::fmt;

site/src/self_profile.rs

@@ -7,7 +7,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use bytes::buf::BufExt;
+use bytes::Buf;
 use parking_lot::Mutex;
 use std::cell::RefCell;
 use std::collections::HashMap;
@@ -1773,7 +1773,7 @@ async fn run_server(data: Arc<RwLock<Option<Arc<InputData>>>>, addr: SocketAddr)
             }))
         }
     });
-    let server = hyper::Server::bind(&addr).serve(svc);
+    let server = hyper::server::Server::bind(&addr).serve(svc);
     if let Err(e) = server.await {
         eprintln!("server error: {:?}", e);
     }