Replace reqwest with http and hyper, and tower

Cargo.toml

@@ -17,7 +17,6 @@ keywords = ["github", "github-api"]
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-reqwest = { version = "0.11.10", default-features = false, features = ["json"] }
 serde = { version = "1.0.126", features = ["derive"] }
 serde_json = "1.0.64"
 serde_path_to_error = "0.1.4"
@@ -28,35 +27,41 @@ hyperx = "1.3.0"
 snafu = { version = "0.7", features = ["backtraces"] }
 once_cell = "1.7.2"
 arc-swap = "1.3.0"
-base64 = "0.20.0"
+base64 = "0.13.1"
 bytes = "1.0.1"
 jsonwebtoken = "8"
-futures-core = { version = "0.3.15", optional = true }
-futures-util = { version = "0.3.15", optional = true }
+futures = { version = "0.3.15" }
 secrecy = "0.8.0"
 cfg-if = "1.0.0"
 either = "1.8.0"
+hyper = { version = "0.14.13", features = ["client", "http1", "stream", "tcp"] }
+http = "0.2.5"
+tower-http = { version = "0.3.2", features = ["map-response-body", "trace"] }
+hyper-timeout = {version = "0.4.1", optional = true }
+http-body = "0.4.5"
+tower = { version = "0.4.13", default-features = false, features = ["util", "buffer"] }
+hyper-rustls = { version = "0.23.2", optional = true }
+tracing = { version = "0.1.37", features = ["log"], optional = true }
+serde_urlencoded = "0.7.1"
+pin-project = "1.0.12"
+tokio = { version = "1.17.0", default-features = false, optional = true }
+futures-core = { version = "0.3.15", optional = true }
+futures-util = { version = "0.3.15", optional = true }
+hyper-tls = { version = "0.5.0", optional = true }
 
 [dev-dependencies]
 tokio = { version = "1.17.0", default-features = false, features = [
     "macros",
     "rt-multi-thread",
     "time",
 ] }
+tokio-test = "0.4.2"
 wiremock = "0.5.3"
 
 [features]
-default = ["native-tls"]
-rustls = ["rustls-tls"]  # Leagcy support (<=0.17.0)
-
-# Enables native-tls specific functionality not available by default.
-native-tls = ["reqwest/native-tls"]
-native-tls-alpn = ["reqwest/native-tls-alpn"]
-native-tls-vendored = ["reqwest/native-tls-vendored"]
-
-rustls-tls = ["reqwest/rustls-tls"]
-rustls-tls-manual-roots = ["reqwest/rustls-tls-manual-roots"]
-rustls-tls-webpki-roots = ["reqwest/rustls-tls-webpki-roots"]
-rustls-tls-native-roots = ["reqwest/rustls-tls-native-roots"]
+default = ["tls", "timeout", "tracing", "retry"]
 
-stream = ["futures-core", "futures-util", "reqwest/stream"]
+retry = ["tower/retry", "futures-util"]
+tls = ["hyper-tls"]
+timeout = ["hyper-timeout", "tokio", "tower/timeout"]
+stream = ["futures-core", "futures-util", "hyper/stream"]

examples/create_repo_from_template.rs

@@ -4,7 +4,9 @@ use octocrab::Octocrab;
 async fn main() -> octocrab::Result<()> {
     let token = std::env::var("GITHUB_TOKEN").expect("GITHUB_TOKEN env variable is required");
 
-    let octocrab = Octocrab::builder().personal_token(token.to_string()).build()?;
+    let octocrab = Octocrab::builder()
+        .personal_token(token.to_string())
+        .build()?;
 
     let repository = octocrab.repos("rust-lang", "rust-template");
     repository
@@ -17,4 +19,4 @@ async fn main() -> octocrab::Result<()> {
         .await?;
 
     Ok(())
-}
+}

examples/custom_client.rs

@@ -0,0 +1,42 @@
+use http::header::USER_AGENT;
+use http::Uri;
+use hyper_tls::HttpsConnector;
+use octocrab::auth::Auth;
+use octocrab::service::middleware::base_uri::BaseUriLayer;
+use octocrab::service::middleware::extra_headers::ExtraHeadersLayer;
+use octocrab::{AuthState, Octocrab, OctocrabBuilder};
+use std::sync::Arc;
+use tower::Layer;
+
+#[tokio::main]
+async fn main() -> octocrab::Result<()> {
+    let client = hyper::Client::builder().build(HttpsConnector::new());
+    let octocrab = OctocrabBuilder::new()
+        .with_service(client)
+        .with_layer(&BaseUriLayer::new(Uri::from_static(
+            "https://api.github.com",
+        )))
+        .with_layer(&ExtraHeadersLayer::new(Arc::new(vec![(
+            USER_AGENT,
+            "octocrab".parse().unwrap(),
+        )])))
+        .with_auth(AuthState::None)
+        .build()
+        .unwrap();
+
+    let repo = octocrab.repos("rust-lang", "rust").get().await?;
+
+    let repo_metrics = octocrab
+        .repos("rust-lang", "rust")
+        .get_community_profile_metrics()
+        .await?;
+
+    println!(
+        "{} has {} stars and {}% health percentage",
+        repo.full_name.unwrap(),
+        repo.stargazers_count.unwrap_or(0),
+        repo_metrics.health_percentage
+    );
+
+    Ok(())
+}

examples/device_flow.rs

@@ -1,12 +1,12 @@
 use either::Either;
-use reqwest::header::ACCEPT;
+use http::header::ACCEPT;
 use std::time::Duration;
 
 #[tokio::main]
 async fn main() -> octocrab::Result<()> {
     let client_id = secrecy::Secret::from(std::env::var("GITHUB_CLIENT_ID").unwrap());
     let crab = octocrab::Octocrab::builder()
-        .base_url("https://github.com")?
+        .base_uri("https://github.com")?
         .add_header(ACCEPT, "application/json".to_string())
         .build()?;
 
@@ -41,5 +41,5 @@ async fn main() -> octocrab::Result<()> {
     };
 
     println!("Authorization succeeded with access to {:?}", auth.scope);
-    return Ok(());
+    Ok(())
 }

examples/get_content.rs

@@ -12,10 +12,7 @@ async fn main() -> octocrab::Result<()> {
         .send()
         .await?;
 
-    println!(
-        "{} files/dirs in the repo root",
-        content.items.into_iter().count()
-    );
+    println!("{} files/dirs in the repo root", content.items.len());
 
     Ok(())
 }

examples/get_repo.rs

@@ -8,7 +8,10 @@ async fn main() -> octocrab::Result<()> {
 
     let repo = octocrab.repos("rust-lang", "rust").get().await?;
 
-    let repo_metrics = octocrab.repos("rust-lang", "rust").get_community_profile_metrics().await?;
+    let repo_metrics = octocrab
+        .repos("rust-lang", "rust")
+        .get_community_profile_metrics()
+        .await?;
 
     println!(
         "{} has {} stars and {}% health percentage",

examples/github_app_authentication.rs

@@ -18,6 +18,6 @@ async fn main() -> octocrab::Result<()> {
 }
 
 fn read_env_var(var_name: &str) -> String {
-    let err = format!("Missing environment variable: {}", var_name);
+    let err = format!("Missing environment variable: {var_name}");
     std::env::var(var_name).expect(&err)
 }

examples/github_app_authentication_manual.rs

@@ -1,4 +1,4 @@
-use octocrab::models::{InstallationToken, InstallationRepositories};
+use octocrab::models::{InstallationRepositories, InstallationToken};
 use octocrab::params::apps::CreateInstallationAccessToken;
 use octocrab::Octocrab;
 
@@ -31,7 +31,7 @@ async fn main() -> octocrab::Result<()> {
         .await
         .unwrap();
 
-    let octocrab = octocrab::OctocrabBuilder::new()
+    let octocrab = octocrab::OctocrabBuilder::default()
         .personal_token(access.token)
         .build()
         .unwrap();
@@ -46,6 +46,6 @@ async fn main() -> octocrab::Result<()> {
 }
 
 fn read_env_var(var_name: &str) -> String {
-    let err = format!("Missing environment variable: {}", var_name);
+    let err = format!("Missing environment variable: {var_name}");
     std::env::var(var_name).expect(&err)
 }

examples/paging_results.rs

@@ -17,7 +17,7 @@ async fn main() -> octocrab::Result<()> {
         prs.extend(new_page.take_items());
 
         for pr in prs.drain(..) {
-            println!("{:?}", pr);
+            println!("{pr:?}");
         }
 
         current_page = new_page;

examples/print_license.rs

@@ -5,7 +5,7 @@ async fn main() -> octocrab::Result<()> {
         .license()
         .await?;
 
-    println!("{:#?}", license);
+    println!("{license:#?}");
 
     Ok(())
 }

examples/print_pr_diff.rs

@@ -5,7 +5,7 @@ async fn main() -> octocrab::Result<()> {
         .get_diff(72033)
         .await?;
 
-    println!("{}", diff);
+    println!("{diff}");
 
     Ok(())
 }

examples/search_issues.rs

@@ -10,8 +10,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
         .send()
         .await
     {
-        Ok(page) => println!("{:#?}", page),
-        Err(error) => println!("{:#?}", error),
+        Ok(page) => println!("{page:#?}"),
+        Err(error) => println!("{error:#?}"),
     }
 
     Ok(())

examples/update_pull_request_branch.rs

@@ -8,19 +8,19 @@
 //! octocrab = { path = "../" }
 //! ```
 
-
 use octocrab::Octocrab;
 
 #[tokio::main]
 async fn main() -> octocrab::Result<()> {
     let token = std::env::var("GITHUB_TOKEN").expect("GITHUB_TOKEN env variable is required");
     let octocrab = Octocrab::builder().personal_token(token).build()?;
 
-    let update = octocrab.pulls("XAMPPRocky", "octocrab").update_branch(200).await?;
+    let update = octocrab
+        .pulls("XAMPPRocky", "octocrab")
+        .update_branch(200)
+        .await?;
 
-    println!(
-        "Result of pull request update: {}", update,
-    );
+    println!("Result of pull request update: {update}",);
 
     Ok(())
 }

src/api.rs

@@ -1,6 +1,7 @@
 pub mod actions;
 pub mod activity;
 pub mod apps;
+pub mod commits;
 pub mod current;
 pub mod events;
 pub mod gists;
@@ -15,4 +16,3 @@ pub mod repos;
 pub mod search;
 pub mod teams;
 pub mod workflows;
-pub mod commits;