Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Place Config::format behind the format feature flag. #1022

Merged
merged 1 commit into from
Apr 28, 2024

Conversation

gibbz00
Copy link
Contributor

@gibbz00 gibbz00 commented Mar 30, 2024

Fixes: #1021

Depends upon: #1020.

@caspermeijn
Copy link
Collaborator

Please make this PR independent of #1020.

My reasoning:

  • The current diff is unreadable
  • The other PR is in draft.

@gibbz00
Copy link
Contributor Author

gibbz00 commented Apr 3, 2024

Valid points 😊

Though of doing this at first, I wanted to avoid having to fix the conflicts that would arise. Do you think that this will be merged before #1020? I wouldn't mind making this an independent PR is that's the case.

@caspermeijn
Copy link
Collaborator

Well, from my point of view:

The last commit of this branch seems like an improvement, so I think it makes sense to keep the PR open. I suggest making it independent and solve the merge conflict at a later time.

@gibbz00
Copy link
Contributor Author

gibbz00 commented Apr 6, 2024

Alrighty, a rebase later shouldn't be too hard anyway. I've now made this PR independent of the rest.

prost-build/src/lib.rs Outdated Show resolved Hide resolved
prost-build/src/lib.rs Outdated Show resolved Hide resolved
Copy link
Collaborator

@caspermeijn caspermeijn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please rebase to fix the merge conflict

@gibbz00
Copy link
Contributor Author

gibbz00 commented Apr 27, 2024

Rebased and fixed suggestions!

@caspermeijn caspermeijn added this pull request to the merge queue Apr 28, 2024
Merged via the queue into tokio-rs:master with commit ee96a04 Apr 28, 2024
14 checks passed
@gibbz00 gibbz00 deleted the format_feature branch April 28, 2024 17:40
@caspermeijn
Copy link
Collaborator

Thank you for your contribution

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.

Consider placing Config::format behind a feature flag.
2 participants