Factor out commonality between WorkerProto::Basic{Client,Server}Connection #11125
Conversation
This file contains 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
github-actions
bot
added
new-cli
edolstra
force-pushed
the
basic-connection
branch
from
ff96f7d
to
936fe81
Compare
Ericson2314
reviewed
Jul 18, 2024
Comment on lines
+1040
to
+1043
| WorkerProto::BasicServerConnection conn; | ||
| conn.to = std::move(to); | ||
| conn.from = std::move(from); | ||
| conn.protoVersion = clientVersion; |
There was a problem hiding this comment.
Can this use designated initializer syntax? I think so
Suggested change
| WorkerProto::BasicServerConnection conn; | |
| conn.to = std::move(to); | |
| conn.from = std::move(from); | |
| conn.protoVersion = clientVersion; | |
| WorkerProto::BasicServerConnection conn {{ | |
| .to = to, | |
| .from = from, | |
| .protoVersion = clientVersion, | |
| }}; |
There was a problem hiding this comment.
No, that doesn't work with inheritance.
Ericson2314
reviewed
Jul 18, 2024
Ericson2314
approved these changes
Jul 18, 2024
…ction This also renames clientVersion and daemonVersion to the more correct protoVersion (since it's the version agreed to by both sides).
This wasn't moving the underlying buffer, so if the buffer was non-empty, it could lose data.
edolstra
force-pushed
the
basic-connection
branch
from
decd1cc
to
fa7aa03
Compare
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.
Motivation
This gets rid of some duplicate code. It also renames
clientVersionanddaemonVersionto the more correctprotoVersion(since it's the version agreed to by both sides).This is in preparation of another PR that adds more fine-grained protocol negotiation.
This also fixes a bug in
FdSource::operator =where it wouldn't move the underlyingBufferedSource, so it could lose data if the buffer wasn't empty.Context
Priorities and Process
Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.