Make trailers module a submodle of transfer #309
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This needs a rebase to fix the merge conflicts (and to separate out the formatting changes which should now be redundant), but otherwise this looks good to me. |
|
@brightly-salty That merge doesn't seem to have addressed the conflicts. Also, please don't back-merge main into a PR branch. Could you rebase this, please? |
brightly-salty
force-pushed
the
move-trailers
branch
from
65cd9b7 to
71a3944
Compare
|
@joshtriplett Okay, I've rebased it but I'm afraid I might have resolved the conflicts incorrectly. Let me know if something is wrong. |
Fishrock123
previously requested changes
Jan 27, 2021
This reverts commit 71a3944.
OneOfOne
added a commit
to OneOfOne/http-types-rs
that referenced
this pull request
Apr 7, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #300