diff --git a/Cargo.lock b/Cargo.lock index 640e0844df8..b9261a282ac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -165,27 +165,25 @@ dependencies = [ "mime", "multer", "rand 0.10.1", + "rustversion-msrv", "serde", "serde_json", "serde_plain", "tempfile", "tokio", "tokio-stream", + "trybuild", ] [[package]] name = "actix-multipart-derive" version = "0.8.0" dependencies = [ - "actix-multipart", - "actix-web", "bytesize", "darling", "proc-macro2", "quote", - "rustversion-msrv", "syn", - "trybuild", ] [[package]] diff --git a/actix-multipart-derive/Cargo.toml b/actix-multipart-derive/Cargo.toml index aee19b388da..302577a5afe 100644 --- a/actix-multipart-derive/Cargo.toml +++ b/actix-multipart-derive/Cargo.toml @@ -23,11 +23,5 @@ proc-macro2 = "1" quote = "1" syn = "2" -[dev-dependencies] -actix-multipart = "0.8" -actix-web = "4" -rustversion-msrv = "0.100" -trybuild = "1" - [lints] workspace = true diff --git a/actix-multipart-derive/src/lib.rs b/actix-multipart-derive/src/lib.rs index 161a9ba2455..0c9ab818dc5 100644 --- a/actix-multipart-derive/src/lib.rs +++ b/actix-multipart-derive/src/lib.rs @@ -53,7 +53,7 @@ struct ParsedField<'t> { /// /// Each field type should implement the `FieldReader` trait: /// -/// ``` +/// ```ignore /// use actix_multipart::form::{tempfile::TempFile, text::Text, MultipartForm}; /// /// #[derive(MultipartForm)] @@ -71,7 +71,7 @@ struct ParsedField<'t> { /// A [`Vec`] field corresponds to an upload with multiple parts under the [same field /// name](https://www.rfc-editor.org/rfc/rfc7578#section-4.3). /// -/// ``` +/// ```ignore /// use actix_multipart::form::{tempfile::TempFile, text::Text, MultipartForm}; /// /// #[derive(MultipartForm)] @@ -85,7 +85,7 @@ struct ParsedField<'t> { /// /// You can use the `#[multipart(rename = "foo")]` attribute to receive a field by a different name. /// -/// ``` +/// ```ignore /// use actix_multipart::form::{tempfile::TempFile, MultipartForm}; /// /// #[derive(MultipartForm)] @@ -102,7 +102,7 @@ struct ParsedField<'t> { /// /// Note: the form is also subject to the global limits configured using `MultipartFormConfig`. /// -/// ``` +/// ```ignore /// use actix_multipart::form::{tempfile::TempFile, text::Text, MultipartForm}; /// /// #[derive(MultipartForm)] @@ -120,7 +120,7 @@ struct ParsedField<'t> { /// By default fields with an unknown name are ignored. They can be rejected using the /// `#[multipart(deny_unknown_fields)]` attribute: /// -/// ``` +/// ```ignore /// # use actix_multipart::form::MultipartForm; /// #[derive(MultipartForm)] /// #[multipart(deny_unknown_fields)] @@ -138,7 +138,7 @@ struct ParsedField<'t> { /// /// Note that `Vec` fields will ignore this option. /// -/// ``` +/// ```ignore /// # use actix_multipart::form::MultipartForm; /// #[derive(MultipartForm)] /// #[multipart(duplicate_field = "deny")] diff --git a/actix-multipart/Cargo.toml b/actix-multipart/Cargo.toml index 317abaca4ed..05dc21ff709 100644 --- a/actix-multipart/Cargo.toml +++ b/actix-multipart/Cargo.toml @@ -12,10 +12,15 @@ homepage.workspace = true repository.workspace = true license.workspace = true edition.workspace = true +rust-version.workspace = true [package.metadata.docs.rs] all-features = true +[[test]] +name = "trybuild" +required-features = ["derive", "tempfile"] + [package.metadata.cargo_check_external_types] allowed_external_types = [ "actix_http::*", @@ -68,8 +73,10 @@ env_logger = "0.11" futures-test = "0.3" futures-util = { version = "0.3.17", default-features = false, features = ["alloc"] } multer = "3" +rustversion-msrv = "0.100" tokio = { version = "1.38.2", features = ["sync"] } tokio-stream = "0.1" +trybuild = "1" [lints] workspace = true diff --git a/actix-multipart-derive/tests/trybuild.rs b/actix-multipart/tests/trybuild.rs similarity index 100% rename from actix-multipart-derive/tests/trybuild.rs rename to actix-multipart/tests/trybuild.rs diff --git a/actix-multipart-derive/tests/trybuild/all-required.rs b/actix-multipart/tests/trybuild/all-required.rs similarity index 100% rename from actix-multipart-derive/tests/trybuild/all-required.rs rename to actix-multipart/tests/trybuild/all-required.rs diff --git a/actix-multipart-derive/tests/trybuild/deny-duplicates.rs b/actix-multipart/tests/trybuild/deny-duplicates.rs similarity index 100% rename from actix-multipart-derive/tests/trybuild/deny-duplicates.rs rename to actix-multipart/tests/trybuild/deny-duplicates.rs diff --git a/actix-multipart-derive/tests/trybuild/deny-parse-fail.rs b/actix-multipart/tests/trybuild/deny-parse-fail.rs similarity index 100% rename from actix-multipart-derive/tests/trybuild/deny-parse-fail.rs rename to actix-multipart/tests/trybuild/deny-parse-fail.rs diff --git a/actix-multipart-derive/tests/trybuild/deny-parse-fail.stderr b/actix-multipart/tests/trybuild/deny-parse-fail.stderr similarity index 100% rename from actix-multipart-derive/tests/trybuild/deny-parse-fail.stderr rename to actix-multipart/tests/trybuild/deny-parse-fail.stderr diff --git a/actix-multipart-derive/tests/trybuild/deny-unknown.rs b/actix-multipart/tests/trybuild/deny-unknown.rs similarity index 100% rename from actix-multipart-derive/tests/trybuild/deny-unknown.rs rename to actix-multipart/tests/trybuild/deny-unknown.rs diff --git a/actix-multipart-derive/tests/trybuild/optional-and-list.rs b/actix-multipart/tests/trybuild/optional-and-list.rs similarity index 100% rename from actix-multipart-derive/tests/trybuild/optional-and-list.rs rename to actix-multipart/tests/trybuild/optional-and-list.rs diff --git a/actix-multipart-derive/tests/trybuild/rename.rs b/actix-multipart/tests/trybuild/rename.rs similarity index 100% rename from actix-multipart-derive/tests/trybuild/rename.rs rename to actix-multipart/tests/trybuild/rename.rs diff --git a/actix-multipart-derive/tests/trybuild/size-limit-parse-fail.rs b/actix-multipart/tests/trybuild/size-limit-parse-fail.rs similarity index 100% rename from actix-multipart-derive/tests/trybuild/size-limit-parse-fail.rs rename to actix-multipart/tests/trybuild/size-limit-parse-fail.rs diff --git a/actix-multipart-derive/tests/trybuild/size-limit-parse-fail.stderr b/actix-multipart/tests/trybuild/size-limit-parse-fail.stderr similarity index 100% rename from actix-multipart-derive/tests/trybuild/size-limit-parse-fail.stderr rename to actix-multipart/tests/trybuild/size-limit-parse-fail.stderr diff --git a/actix-multipart-derive/tests/trybuild/size-limits.rs b/actix-multipart/tests/trybuild/size-limits.rs similarity index 100% rename from actix-multipart-derive/tests/trybuild/size-limits.rs rename to actix-multipart/tests/trybuild/size-limits.rs