Skip to content

Conversation

@tgross35
Copy link
Contributor

As a resolution to #271, vendor the multipart crate https://github.com/abonander/multipart.

The first commit adds an exact copy of multipart from its current git repository.

After the merge, the FCWs are fixed by switching multipart from buf-redux to buffer-redux (the maintained fork) and applying @MightyPork's patch from #271, plus a few updates so it builds with default features. cargo fmt also needs to be run (this should get a .git-blame-ignore-revs entry).

Finally, the merged crate is renamed to rouille-multipart so it can be published as a new crate. I think it would be good to strip out all features that rouille does not need before publishing, but that is easiest done as a follow up.

tgross35 added 6 commits June 14, 2025 18:01
Squash merge the `multipart` repository into `rouille` so FCWs can be
resolved and unneeded features stripped out.

Original HEAD ref: f4fee608af ("Merge pull request tomaka#134 ...")
Apply Ondřej's patch from [1] to resolve future compatibility warnings
in multipart, then update it further to resolve FCWs in all default
features (the patch only resolved issues with the features that Rouille
uses).

Co-authored-by: Ondřej Hruška <ondra@ondrovo.com>

[1]: tomaka#271
`buffer-redux` [1] is a maintained fork of `buf-redux` [2]. Switch to it
in `multipart`.

[1]: https://docs.rs/buffer-redux/latest/buffer_redux/
[2]: https://docs.rs/buf_redux/latest/buf_redux/
@tgross35
Copy link
Contributor Author

Version of #293 that squashes multipart's history

@tgross35 tgross35 changed the title Vendor multipart Vendor multipart, resolve FCWs, and prepare to publish Jun 14, 2025
@tgross35 tgross35 changed the title Vendor multipart, resolve FCWs, and prepare to publish Vendor multipart, resolve FCWs, and prepare to republish Jun 14, 2025
In preparation for republishing this crate as a version that suit
Rouille's needs, rename it.
@bradfier
Copy link
Collaborator

Cool - since if we republish multipart as a stripped back version we're presumably not going to try and keep up with upstream, it's fine to start from a single squashed commit here I think, thanks!

@bradfier bradfier merged commit 31f772c into tomaka:master Jun 17, 2025
9 checks passed
@tgross35 tgross35 deleted the vendor-multipart branch June 17, 2025 16:05
@tgross35
Copy link
Contributor Author

By the way @bradfier - if you have any interest in any maintenance assistance, I would be happy to help out here. Nothing super active, but I'd be willing to at least get the nonbreaking modernization-type changes over the line into a minor release.

You have been pretty responsive here so no worries if you have things covered. I just figured there is no harm in offering since I was planning to anyway :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants