From bce9f0208816c415225e44eab2d82c112c82de35 Mon Sep 17 00:00:00 2001 From: tottoto Date: Thu, 19 Oct 2023 20:31:44 +0900 Subject: [PATCH 1/2] chore(ci): update to cargo-check-external-types 0.1.9 --- .github/workflows/CI.yml | 6 +++--- .github/workflows/external-types.toml | 15 --------------- Cargo.toml | 17 +++++++++++++++++ 3 files changed, 20 insertions(+), 18 deletions(-) delete mode 100644 .github/workflows/external-types.toml diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 258cded761..4467185b39 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -240,17 +240,17 @@ jobs: - name: Install Rust uses: dtolnay/rust-toolchain@master with: - toolchain: nightly-2023-05-31 # Compatible version for cargo-check-external-types + toolchain: nightly-2023-10-10 # Compatible version for cargo-check-external-types - name: Install cargo-check-external-types uses: taiki-e/cache-cargo-install-action@v1 with: - tool: cargo-check-external-types@0.1.7 + tool: cargo-check-external-types@0.1.9 - uses: Swatinem/rust-cache@v2 - name: check-external-types - run: cargo check-external-types --config .github/workflows/external-types.toml + run: cargo check-external-types udeps: needs: [style] diff --git a/.github/workflows/external-types.toml b/.github/workflows/external-types.toml deleted file mode 100644 index 23a83c1f02..0000000000 --- a/.github/workflows/external-types.toml +++ /dev/null @@ -1,15 +0,0 @@ -allowed_external_types = [ - "bytes::buf::buf_impl::Buf", - "bytes::bytes::Bytes", - "http::header", - "http::header::map::HeaderMap", - "http::method::Method", - "http::request::Request", - "http::response::Response", - "http::status::StatusCode", - "http::uri::Uri", - "http::version::Version", - "http_body::Body", - "http_body::frame::Frame", - "http_body::size_hint::SizeHint", -] diff --git a/Cargo.toml b/Cargo.toml index 860b2a8dca..201ceda9cd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -97,6 +97,23 @@ rustdoc-args = ["--cfg", "docsrs", "--cfg", "hyper_unstable_ffi", "--cfg", "hype [package.metadata.playground] features = ["full"] +[package.metadata.cargo_check_external_types] +allowed_external_types = [ + "bytes::buf::buf_impl::Buf", + "bytes::bytes::Bytes", + "http::header", + "http::header::map::HeaderMap", + "http::method::Method", + "http::request::Request", + "http::response::Response", + "http::status::StatusCode", + "http::uri::Uri", + "http::version::Version", + "http_body::Body", + "http_body::frame::Frame", + "http_body::size_hint::SizeHint", +] + [profile.release] codegen-units = 1 incremental = false From 3f0a756667e0b456d027dffc1d510445ab66e32c Mon Sep 17 00:00:00 2001 From: tottoto Date: Fri, 20 Oct 2023 00:21:26 +0900 Subject: [PATCH 2/2] chore(ci): use check-external-types separate config file --- .github/workflows/CI.yml | 2 +- .github/workflows/external-types.toml | 15 +++++++++++++++ Cargo.toml | 17 ----------------- 3 files changed, 16 insertions(+), 18 deletions(-) create mode 100644 .github/workflows/external-types.toml diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 4467185b39..549aed9144 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -250,7 +250,7 @@ jobs: - uses: Swatinem/rust-cache@v2 - name: check-external-types - run: cargo check-external-types + run: cargo check-external-types --config .github/workflows/external-types.toml udeps: needs: [style] diff --git a/.github/workflows/external-types.toml b/.github/workflows/external-types.toml new file mode 100644 index 0000000000..23a83c1f02 --- /dev/null +++ b/.github/workflows/external-types.toml @@ -0,0 +1,15 @@ +allowed_external_types = [ + "bytes::buf::buf_impl::Buf", + "bytes::bytes::Bytes", + "http::header", + "http::header::map::HeaderMap", + "http::method::Method", + "http::request::Request", + "http::response::Response", + "http::status::StatusCode", + "http::uri::Uri", + "http::version::Version", + "http_body::Body", + "http_body::frame::Frame", + "http_body::size_hint::SizeHint", +] diff --git a/Cargo.toml b/Cargo.toml index 201ceda9cd..860b2a8dca 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -97,23 +97,6 @@ rustdoc-args = ["--cfg", "docsrs", "--cfg", "hyper_unstable_ffi", "--cfg", "hype [package.metadata.playground] features = ["full"] -[package.metadata.cargo_check_external_types] -allowed_external_types = [ - "bytes::buf::buf_impl::Buf", - "bytes::bytes::Bytes", - "http::header", - "http::header::map::HeaderMap", - "http::method::Method", - "http::request::Request", - "http::response::Response", - "http::status::StatusCode", - "http::uri::Uri", - "http::version::Version", - "http_body::Body", - "http_body::frame::Frame", - "http_body::size_hint::SizeHint", -] - [profile.release] codegen-units = 1 incremental = false