From 67ae321df61fe4c885cb2ae3b3571f6b3d20755f Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Wed, 19 Apr 2023 19:41:09 -0300 Subject: [PATCH] refactor(core): remove `http-multipart` Cargo feature Following #6742 --- .github/workflows/lint-fmt-core.yml | 2 +- .github/workflows/test-core.yml | 2 +- core/tauri/Cargo.toml | 2 -- core/tauri/src/lib.rs | 2 -- examples/api/src-tauri/Cargo.toml | 1 - 5 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/lint-fmt-core.yml b/.github/workflows/lint-fmt-core.yml index 133d6147af9..741b2237958 100644 --- a/.github/workflows/lint-fmt-core.yml +++ b/.github/workflows/lint-fmt-core.yml @@ -50,7 +50,7 @@ jobs: clippy: - { args: '', key: 'empty' } - { - args: '--features compression,wry,linux-protocol-headers,isolation,custom-protocol,api-all,updater,system-tray,http-multipart', + args: '--features compression,wry,linux-protocol-headers,isolation,custom-protocol,api-all,updater,system-tray', key: 'all' } - { args: '--features custom-protocol', key: 'custom-protocol' } diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml index 0a08c7d29ea..d7cdf3e117d 100644 --- a/.github/workflows/test-core.yml +++ b/.github/workflows/test-core.yml @@ -76,7 +76,7 @@ jobs: key: api-all } - { - args: --features compression,wry,linux-protocol-headers,isolation,custom-protocol,api-all,updater,system-tray,http-multipart, + args: --features compression,wry,linux-protocol-headers,isolation,custom-protocol,api-all,updater,system-tray, key: all } diff --git a/core/tauri/Cargo.toml b/core/tauri/Cargo.toml index 42b91ff53da..15325f50c19 100644 --- a/core/tauri/Cargo.toml +++ b/core/tauri/Cargo.toml @@ -23,7 +23,6 @@ features = [ "fs-extract-api", "system-tray", "devtools", - "http-multipart", "icon-png", "dox" ] @@ -142,7 +141,6 @@ updater = [ "dialog-ask", "fs-extract-api" ] -http-multipart = [ "reqwest/multipart" ] shell-open-api = [ "open", "regex", "tauri-macros/shell-scope" ] fs-extract-api = [ "zip" ] native-tls = [ "reqwest/native-tls" ] diff --git a/core/tauri/src/lib.rs b/core/tauri/src/lib.rs index ed7af0926a0..f7241a0ece6 100644 --- a/core/tauri/src/lib.rs +++ b/core/tauri/src/lib.rs @@ -20,7 +20,6 @@ //! - **devtools**: Enables the developer tools (Web inspector) and [`Window::open_devtools`]. Enabled by default on debug builds. //! On macOS it uses private APIs, so you can't enable it if your app will be published to the App Store. //! - **shell-open-api**: Enables the [`api::shell`] module. -//! - **http-multipart**: Adds support to `multipart/form-data` requests. //! - **native-tls**: Provides TLS support to connect over HTTPS. //! - **native-tls-vendored**: Compile and statically link to a vendored copy of OpenSSL. //! - **rustls-tls**: Provides TLS support to connect over HTTPS using rustls. @@ -973,7 +972,6 @@ mod tests { // features that look like an allowlist feature, but are not let allowed = [ "fs-extract-api", - "http-multipart", "process-command-api", "process-relaunch-dangerous-allow-symlink-macos", "window-data-url", diff --git a/examples/api/src-tauri/Cargo.toml b/examples/api/src-tauri/Cargo.toml index 7d2e0a68fa1..60804e631e4 100644 --- a/examples/api/src-tauri/Cargo.toml +++ b/examples/api/src-tauri/Cargo.toml @@ -35,7 +35,6 @@ tauri-build = { path = "../../../core/tauri-build" } path = "../../../core/tauri" features = [ "api-all", - "http-multipart", "icon-ico", "icon-png", "isolation",