From 9780bf491f0a69986f9f35b9c6a81ac951356aff Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Sun, 7 Jan 2024 00:53:08 +0900 Subject: [PATCH] ci: update cargo-check-external-types to 0.1.10 (#6274) --- .github/workflows/ci.yml | 6 +++--- tokio/Cargo.toml | 10 ++++++++++ tokio/external-types.toml | 11 ----------- 3 files changed, 13 insertions(+), 14 deletions(-) delete mode 100644 tokio/external-types.toml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b22f53c8a43..a2242d3b873 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -931,7 +931,7 @@ jobs: rust: # `check-external-types` requires a specific Rust nightly version. See # the README for details: https://github.com/awslabs/cargo-check-external-types - - nightly-2023-05-31 + - nightly-2023-10-21 steps: - uses: actions/checkout@v4 - name: Install Rust ${{ matrix.rust }} @@ -942,9 +942,9 @@ jobs: - 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.10 - name: check-external-types - run: cargo check-external-types --all-features --config external-types.toml + run: cargo check-external-types --all-features working-directory: tokio check-fuzzing: diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml index 87d2a460c8d..2efbca02dbc 100644 --- a/tokio/Cargo.toml +++ b/tokio/Cargo.toml @@ -164,3 +164,13 @@ rustc-args = ["--cfg", "tokio_unstable", "--cfg", "tokio_taskdump"] [package.metadata.playground] features = ["full", "test-util"] + +[package.metadata.cargo_check_external_types] +# The following are types that are allowed to be exposed in Tokio's public API. +# The standard library is allowed by default. +allowed_external_types = [ + "bytes::buf::buf_impl::Buf", + "bytes::buf::buf_mut::BufMut", + + "tokio_macros::*", +] diff --git a/tokio/external-types.toml b/tokio/external-types.toml deleted file mode 100644 index a5bde8ed10c..00000000000 --- a/tokio/external-types.toml +++ /dev/null @@ -1,11 +0,0 @@ -# This config file is for the `cargo-check-external-types` tool that is run in CI. - -# The following are types that are allowed to be exposed in Tokio's public API. -# The standard library is allowed by default. -allowed_external_types = [ - "bytes::buf::buf_impl::Buf", - "bytes::buf::buf_mut::BufMut", - - "tokio_macros::*", -] -