Merge 2a9edd63b2 into 32ddf972c6

2024-06-13 10:49:26 +00:00 · 2023-10-30 00:26:52 +00:00 · 2023-10-30 00:26:52 +00:00 · fdfac7110a
parent 32ddf972c6 2a9edd63b2
commit fdfac7110a
12 changed files with 193 additions and 29 deletions
--- a/.github/workflows/clippy-fmt.yml
+++ b/.github/workflows/clippy-fmt.yml
@ -17,7 +17,8 @@ jobs:
    steps:
      - uses: actions/checkout@v4

-      - uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
+      - name: Install Rust (nightly)
+        uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
        with:
          toolchain: nightly
          components: rustfmt
@ -32,7 +33,8 @@ jobs:
    steps:
      - uses: actions/checkout@v4

-      - uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
+      - name: Install Rust
+        uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
        with:
          components: clippy

@ -47,7 +49,8 @@ jobs:
    steps:
      - uses: actions/checkout@v4

-      - uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
+      - name: Install Rust (nightly)
+        uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
        with:
          toolchain: nightly
          components: rust-docs
@ -57,6 +60,29 @@ jobs:
          RUSTDOCFLAGS: -D warnings
        run: cargo +nightly doc --no-deps --workspace --all-features

+  check-external-types:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Rust (nightly-2023-10-10)
+        uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
+        with:
+          toolchain: nightly-2023-10-10
+
+      - name: Install just
+        uses: taiki-e/install-action@v2.20.2
+        with:
+          tool: just
+
+      - name: Install cargo-check-external-types
+        uses: taiki-e/cache-cargo-install-action@v1.2.2
+        with:
+          tool: cargo-check-external-types@0.1.10
+
+      - name: check external types
+        run: just check-external-types-all
+
  public-api-diff:
    runs-on: ubuntu-latest
    steps:
@ -66,13 +92,15 @@ jobs:

      - uses: actions/checkout@v4

-      - uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
+      - name: Install Rust (nightly-2023-08-25)
+        uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
        with:
          toolchain: nightly-2023-08-25

-      - uses: taiki-e/cache-cargo-install-action@v1.2.2
+      - name: Install cargo-public-api
+        uses: taiki-e/cache-cargo-install-action@v1.2.2
        with:
-          tool: cargo-public-api
+          tool: cargo-public-api@0.32.0

      - name: generate API diff
        run: |
--- a/actix-files/Cargo.toml
+++ b/actix-files/Cargo.toml
@ -13,9 +13,14 @@ categories = ["asynchronous", "web-programming::http-server"]
 license = "MIT OR Apache-2.0"
 edition = "2021"

-[lib]
-name = "actix_files"
-path = "src/lib.rs"
+[package.metadata.cargo_check_external_types]
+allowed_external_types = [
+    "actix_http::*",
+    "actix_service::*",
+    "actix_web::*",
+    "http::*",
+    "mime::*",
+]

 [features]
 experimental-io-uring = ["actix-web/experimental-io-uring", "tokio-uring"]
--- a/actix-http-test/Cargo.toml
+++ b/actix-http-test/Cargo.toml
@ -18,9 +18,17 @@ edition = "2021"
 [package.metadata.docs.rs]
 features = []

-[lib]
-name = "actix_http_test"
-path = "src/lib.rs"
+[package.metadata.cargo_check_external_types]
+allowed_external_types = [
+    "actix_codec::*",
+    "actix_http::*",
+    "actix_server::*",
+    "awc::*",
+    "bytes::*",
+    "futures_core::*",
+    "http::*",
+    "tokio::*",
+]

 [features]
 default = []
--- a/actix-http/Cargo.toml
+++ b/actix-http/Cargo.toml
@ -23,9 +23,26 @@ rust-version.workspace = true
 # features that docs.rs will build with
 features = ["http2", "ws", "openssl", "rustls-0_20", "rustls-0_21", "compress-brotli", "compress-gzip", "compress-zstd"]

-[lib]
-name = "actix_http"
-path = "src/lib.rs"
+[package.metadata.cargo_check_external_types]
+allowed_external_types = [
+    "actix_codec::*",
+    "actix_service::*",
+    "actix_tls::*",
+    "actix_utils::*",
+    "bytes::*",
+    "bytestring::*",
+    "encoding_rs::*",
+    "futures_core::*",
+    "h2::*",
+    "http::*",
+    "httparse::*",
+    "language_tags::*",
+    "mime::*",
+    "openssl::*",
+    "rustls::*",
+    "tokio_util::*",
+    "tokio::*",
+]

 [features]
 default = []
--- a/actix-multipart/Cargo.toml
+++ b/actix-multipart/Cargo.toml
@ -16,6 +16,21 @@ edition = "2021"
 rustdoc-args = ["--cfg", "docsrs"]
 all-features = true

+[package.metadata.cargo_check_external_types]
+allowed_external_types = [
+    "actix_http::*",
+    "actix_multipart_derive::*",
+    "actix_utils::*",
+    "actix_web::*",
+    "bytes::*",
+    "futures_core::*",
+    "mime::*",
+    "serde_json::*",
+    "serde_plain::*",
+    "serde::*",
+    "tempfile::*",
+]
+
 [features]
 default = ["tempfile", "derive"]
 derive = ["actix-multipart-derive"]
--- a/actix-router/Cargo.toml
+++ b/actix-router/Cargo.toml
@ -12,9 +12,11 @@ repository = "https://github.com/actix/actix-web.git"
 license = "MIT OR Apache-2.0"
 edition = "2021"

-[lib]
-name = "actix_router"
-path = "src/lib.rs"
+[package.metadata.cargo_check_external_types]
+allowed_external_types = [
+    "http::*",
+    "serde::*",
+]

 [features]
 default = ["http"]
--- a/actix-test/Cargo.toml
+++ b/actix-test/Cargo.toml
@ -18,6 +18,22 @@ categories = [
 license = "MIT OR Apache-2.0"
 edition = "2021"

+[package.metadata.cargo_check_external_types]
+allowed_external_types = [
+    "actix_codec::*",
+    "actix_http_test::*",
+    "actix_http::*",
+    "actix_service::*",
+    "actix_web::*",
+    "awc::*",
+    "bytes::*",
+    "futures_core::*",
+    "http::*",
+    "openssl::*",
+    "rustls::*",
+    "tokio::*",
+]
+
 [features]
 default = []

--- a/actix-web-actors/Cargo.toml
+++ b/actix-web-actors/Cargo.toml
@ -9,9 +9,15 @@ repository = "https://github.com/actix/actix-web"
 license = "MIT OR Apache-2.0"
 edition = "2021"

-[lib]
-name = "actix_web_actors"
-path = "src/lib.rs"
+[package.metadata.cargo_check_external_types]
+allowed_external_types = [
+    "actix::*",
+    "actix_http::*",
+    "actix_web::*",
+    "bytes::*",
+    "bytestring::*",
+    "futures_core::*",
+]

 [dependencies]
 actix = { version = ">=0.12, <0.14", default-features = false }
--- a/actix-web/Cargo.toml
+++ b/actix-web/Cargo.toml
@ -24,9 +24,31 @@ rust-version.workspace = true
 features = ["macros", "openssl", "rustls-0_20", "rustls-0_21", "compress-brotli", "compress-gzip", "compress-zstd", "cookies", "secure-cookies"]
 rustdoc-args = ["--cfg", "docsrs"]

-[lib]
-name = "actix_web"
-path = "src/lib.rs"
+[package.metadata.cargo_check_external_types]
+allowed_external_types = [
+    "actix_http::*",
+    "actix_router::*",
+    "actix_rt::*",
+    "actix_server::*",
+    "actix_service::*",
+    "actix_utils::*",
+    "actix_web_codegen::*",
+    "bytes::*",
+    "cookie::*",
+    "cookie",
+    "futures_core::*",
+    "http::*",
+    "language_tags::*",
+    "mime::*",
+    "openssl::*",
+    "rustls::*",
+    "serde_json::*",
+    "serde_urlencoded::*",
+    "serde::*",
+    "serde::*",
+    "tokio::*",
+    "url::*",
+]

 [features]
 default = ["macros", "compress-brotli", "compress-gzip", "compress-zstd", "cookies", "http2"]
--- a/awc/Cargo.toml
+++ b/awc/Cargo.toml
@ -15,14 +15,31 @@ repository = "https://github.com/actix/actix-web.git"
 license = "MIT OR Apache-2.0"
 edition = "2021"

-[lib]
-name = "awc"
-path = "src/lib.rs"
-
 [package.metadata.docs.rs]
 # features that docs.rs will build with
 features = ["openssl", "rustls-0_20", "rustls-0_21", "compress-brotli", "compress-gzip", "compress-zstd", "cookies"]

+[package.metadata.cargo_check_external_types]
+allowed_external_types = [
+    "actix_codec::*",
+    "actix_http::*",
+    "actix_rt::*",
+    "actix_service::*",
+    "actix_tls::*",
+    "bytes::*",
+    "cookie::*",
+    "cookie",
+    "futures_core::*",
+    "h2::*",
+    "http::*",
+    "openssl::*",
+    "rustls::*",
+    "serde_json::*",
+    "serde_urlencoded::*",
+    "serde::*",
+    "tokio::*",
+]
+
 [features]
 default = ["compress-brotli", "compress-gzip", "compress-zstd", "cookies"]

--- a/26
+++ b/26
@ -9,3 +9,29 @@ doc:
 doc-watch:
    RUSTDOCFLAGS="--cfg=docsrs" cargo +nightly doc --no-deps --workspace --features=rustls,openssl --open
    cargo watch -- RUSTDOCFLAGS="--cfg=docsrs" cargo +nightly doc --no-deps --workspace --features=rustls,openssl
+
+# Check for unintentional external type exposure on all crates in workspace.
+check-external-types-all:
+    #!/usr/bin/env bash
+    set -euo pipefail
+    exit=0
+    for f in $(find . -mindepth 2 -maxdepth 2 -name Cargo.toml | grep -vE "\-codegen/|\-derive/|\-macros/"); do
+        if ! just check-external-types-manifest "$f"; then exit=1; fi
+        echo
+        echo
+    done
+    exit $exit
+
+# Check for unintentional external type exposure on all crates in workspace.
+check-external-types-all-table:
+    #!/usr/bin/env bash
+    set -euo pipefail
+    for f in $(find . -mindepth 2 -maxdepth 2 -name Cargo.toml | grep -vE "\-codegen/|\-derive/|\-macros/"); do
+        echo
+        echo "Checking for $f"
+        just check-external-types-manifest "$f" --output-format=markdown-table
+    done
+
+# Check for unintentional external type exposure on a crate.
+check-external-types-manifest manifest_path *extra_args:
+    cargo +nightly check-external-types --manifest-path "{{manifest_path}}" {{extra_args}}
--- a/scripts/bump
+++ b/scripts/bump
@ -93,7 +93,9 @@ fi

 # done; remove backup files
 rm -f $CARGO_MANIFEST.bak
-rm -f $CHANGELOG_FILE.bak
+if [ -n "${CHANGELOG_FILE-}" ]; then
+    rm -f $CHANGELOG_FILE.bak
+fi
 rm -f $README_FILE.bak

 echo "manifest, changelog, and readme updated"