Merge #86

86: release v0.7.0 r=Emilgardis a=Emilgardis



Co-authored-by: Emil Gardström <emil.gardstrom@gmail.com>

Author: bors[bot]

.github/workflows/audit.yml

@@ -11,7 +11,7 @@ on:
 
 jobs:
   audit:
-    needs: [security-audit, cargo-deny]
+    needs: [cargo-deny] # security-audit,
     runs-on: ubuntu-latest
     steps:
       - name: Done
@@ -21,6 +21,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - name: Install rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: 1.60.0
+          override: true
       - uses: actions-rs/audit-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -36,8 +43,11 @@ jobs:
           - sources
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: recursive
       - uses: EmbarkStudios/cargo-deny-action@v1
         with:
+          rust-version: "1.60.0"
           command: check ${{ matrix.checks }} -s
           arguments: --all-features
           log-level: warn

CHANGELOG.md

@@ -4,7 +4,16 @@
 
 ## [Unreleased] - ReleaseDate
 
-[Commits](https://github.com/Emilgardis/twitch_oauth2/compare/v0.6.1...Unreleased)
+[Commits](https://github.com/Emilgardis/twitch_oauth2/compare/v0.7.0...Unreleased)
+
+## [v0.7.0] - 2022-05-08
+
+[Commits](https://github.com/Emilgardis/twitch_oauth2/compare/v0.6.1...v0.7.0)
+
+### Breaking changes
+
+* switch to [`twitch_types`](https://crates.io/crates/twitch_types) for `UserId` and `Nickname`/`UserName`
+* bump MSRV to 1.60, also changes the feature names for clients to their simpler variant `surf` and `client`
 
 ## [v0.6.1] - 2021-11-23
 

Cargo.lock

@@ -1,24 +1,22 @@
 [package]
 name = "twitch_oauth2"
-version = "0.6.1"
-authors = ["Emil Gardström <emil.gardstrom@gmail.com>"]
-edition = "2018"
+version = "0.7.0"
+edition = "2021"
 repository = "https://github.com/Emilgardis/twitch_oauth2"
 license = "MIT OR Apache-2.0"
 description = "Oauth2 for Twitch endpoints"
 keywords = ["oauth", "twitch", "async", "asynchronous"]
-documentation = "https://docs.rs/twitch_oauth2/0.6.1"
+documentation = "https://docs.rs/twitch_oauth2/0.7.0"
 readme = "README.md"
-resolver = "2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [features]
 default = []
-reqwest_client = ["reqwest"]
-surf_client_curl = ["surf_client", "surf/curl-client"]
-surf_client = ["surf", "http-types", "http-types/hyperium_http"]
+reqwest = ["dep:reqwest"]
+surf_client_curl = ["dep:surf", "surf/curl-client"]
+surf = ["dep:surf", "dep:http-types", "http-types?/hyperium_http"]
 mock_api = []
-all = ["surf_client_curl", "reqwest_client"]
+all = ["surf_client_curl", "dep:reqwest"]
 
 [dependencies]
 thiserror = "1.0.29"
@@ -35,41 +33,45 @@ aliri_braid = "0.1.9"
 url = "2.2.2"
 base64 = "0.13.0"
 rand = "0.8.4"
-twitch_types = "0.1.0"
+twitch_types = "0.2.0"
 
 [dev-dependencies]
-tokio = { version = "1.12.0", features = ["rt-multi-thread", "macros", "test-util"] }
+tokio = { version = "1.12.0", features = [
+    "rt-multi-thread",
+    "macros",
+    "test-util",
+] }
 dotenv = "0.15.0"
 anyhow = "1.0.44"
 reqwest = "0.11.4"
 surf = "2.3.1"
-rpassword = "5.0.1"
+rpassword = "6.0.1"
 
 [[example]]
 name = "user_token"
 path = "examples/user_token.rs"
-required-features = ["surf_client"]
+required-features = ["surf"]
 
 [[example]]
 name = "app_access_token"
 path = "examples/app_access_token.rs"
-required-features = ["surf_client"]
+required-features = ["surf"]
 
 [[example]]
 name = "auth_flow"
 path = "examples/auth_flow.rs"
-required-features = ["reqwest_client"]
+required-features = ["reqwest"]
 
 
 [[example]]
 name = "mock_app"
 path = "examples/mock_app.rs"
-required-features = ["reqwest_client", "mock_api"]
+required-features = ["reqwest", "mock_api"]
 
 [[example]]
 name = "mock_user"
 path = "examples/mock_user.rs"
-required-features = ["reqwest_client", "mock_api"]
+required-features = ["reqwest", "mock_api"]
 
 [package.metadata.docs.rs]
 features = ["all", "mock_api"]

Cargo.toml

@@ -1,7 +1,7 @@
 Twitch OAuth2 | OAuth2 for Twitch endpoints
 ============================================
 
-[![github]](https://github.com/emilgardis/twitch_oauth2) [![crates-io]](https://crates.io/crates/twitch_oauth2) [![docs-rs]](https://docs.rs/twitch_oauth2/0.6.1/twitch_oauth2)
+[![github]](https://github.com/emilgardis/twitch_oauth2) [![crates-io]](https://crates.io/crates/twitch_oauth2) [![docs-rs]](https://docs.rs/twitch_oauth2/0.7.0/twitch_oauth2)
 
 [github]: https://img.shields.io/badge/github-emilgardis/twitch__oauth2-8da0cb?style=for-the-badge&labelColor=555555&logo=github"
 [crates-io]: https://img.shields.io/crates/v/twitch_oauth2.svg?style=for-the-badge&color=fc8d62&logo=rust"

README.md

@@ -28,7 +28,7 @@ async fn main() -> anyhow::Result<()> {
 
     println!("Go to this page: {}", url);
 
-    let input = rpassword::prompt_password_stdout(
+    let input = rpassword::prompt_password(
         "Paste in the resulting adress after authenticating (input hidden): ",
     )?;
 

examples/auth_flow.rs

@@ -30,7 +30,6 @@ pub trait Client<'a>: Sync + Send + 'a {
 pub struct DummyClient;
 
 #[cfg(feature = "reqwest")]
-#[cfg_attr(nightly, doc(cfg(feature = "reqwest_client")))] // FIXME: This doc_cfg does nothing
 impl<'a> Client<'a> for DummyClient {
     type Error = DummyClient;
 
@@ -45,7 +44,6 @@ impl<'a> Client<'a> for DummyClient {
 use reqwest::Client as ReqwestClient;
 
 #[cfg(feature = "reqwest")]
-#[cfg_attr(nightly, doc(cfg(feature = "reqwest_client")))] // FIXME: This doc_cfg does nothing
 impl<'a> Client<'a> for ReqwestClient {
     type Error = reqwest::Error;
 
@@ -54,7 +52,6 @@ impl<'a> Client<'a> for ReqwestClient {
         request: crate::HttpRequest,
     ) -> BoxedFuture<'a, Result<crate::HttpResponse, Self::Error>> {
         // Reqwest plays really nice here and has a try_from on `http::Request` -> `reqwest::Request`
-        use std::convert::TryFrom;
         let req = match reqwest::Request::try_from(request) {
             Ok(req) => req,
             Err(e) => return Box::pin(async { Err(e) }),
@@ -96,7 +93,6 @@ pub enum SurfError {
 }
 
 #[cfg(feature = "surf")]
-#[cfg_attr(nightly, doc(cfg(feature = "surf_client")))] // FIXME: This doc_cfg does nothing
 impl<'a> Client<'a> for SurfClient {
     type Error = SurfError;
 

src/client.rs

@@ -2,8 +2,8 @@
 #![deny(missing_docs, broken_intra_doc_links)] // This will be weird until 1.52, see https://github.com/rust-lang/rust/pull/80527
 #![cfg_attr(nightly, deny(rustdoc::broken_intra_doc_links))]
 #![cfg_attr(nightly, feature(doc_cfg))]
-#![doc(html_root_url = "https://docs.rs/twitch_oauth2/0.6.1")]
-//! [![github]](https://github.com/emilgardis/twitch_oauth2) [![crates-io]](https://crates.io/crates/twitch_oauth2) [![docs-rs]](https://docs.rs/twitch_oauth2/0.6.1/twitch_oauth2)
+#![doc(html_root_url = "https://docs.rs/twitch_oauth2/0.7.0")]
+//! [![github]](https://github.com/emilgardis/twitch_oauth2) [![crates-io]](https://crates.io/crates/twitch_oauth2) [![docs-rs]](https://docs.rs/twitch_oauth2/0.7.0/twitch_oauth2)
 //!
 //! [github]: https://img.shields.io/badge/github-emilgardis/twitch__oauth2-8da0cb?style=for-the-badge&labelColor=555555&logo=github"
 //! [crates-io]: https://img.shields.io/crates/v/twitch_oauth2.svg?style=for-the-badge&color=fc8d62&logo=rust"