worker-protocol: replace version bit-shifting with structs#15155
Merged
Ericson2314 merged 1 commit intoFeb 5, 2026
Conversation
Ericson2314
approved these changes
Feb 5, 2026
This commit replaces the `GET_PROTOCOL_MINOR(version)` macros with a proper `WorkerProto::Version` struct. As a bonus, this also fixes some version checks that were incorrectly ignoring the major version number. Co-authored-by: Amaan Qureshi <git@amaanq.com>
auto-merge was automatically disabled
February 5, 2026 16:51
Head branch was pushed to by a user without write access
4dcceca to
cccc944
Compare
amaanq
added a commit
to obsidiansystems/nix
that referenced
this pull request
Feb 6, 2026
This commit embeds the negotiated `FeatureSet` directly into `WorkerProto::Version` and introduces a `Number` subtype with total ordering, so that `Version` itself (number + features) only has partial ordering. This is a follow-up to NixOS#15155, cleaning up the separate `features` fields on `ReadConn`/`WriteConn`. Co-authored-by: Amaan Qureshi <git@amaanq.com>
amaanq
added a commit
to obsidiansystems/nix
that referenced
this pull request
Feb 6, 2026
This commit embeds the negotiated `FeatureSet` directly into `WorkerProto::Version` and introduces a `Number` subtype with total ordering, so that `Version` itself (number + features) only has partial ordering. This is a follow-up to NixOS#15155, cleaning up the separate `features` fields on `ReadConn`/`WriteConn`. Co-authored-by: Amaan Qureshi <git@amaanq.com>
amaanq
added a commit
to obsidiansystems/nix
that referenced
this pull request
Feb 6, 2026
This commit embeds the negotiated `FeatureSet` directly into `WorkerProto::Version` and introduces a `Number` subtype with total ordering, so that `Version` itself (number + features) only has partial ordering. This is a follow-up to NixOS#15155, cleaning up the separate `features` fields on `ReadConn`/`WriteConn`. Co-authored-by: Amaan Qureshi <git@amaanq.com>
amaanq
added a commit
to obsidiansystems/nix
that referenced
this pull request
Feb 6, 2026
This commit embeds the negotiated `FeatureSet` directly into `WorkerProto::Version` and introduces a `Number` inner type with total ordering, so that `Version` itself (number + features) only has partial ordering. This is a follow-up to NixOS#15155, cleaning up the separate `features` fields on `ReadConn`/`WriteConn`. Co-authored-by: Amaan Qureshi <git@amaanq.com>
amaanq
added a commit
to obsidiansystems/nix
that referenced
this pull request
Feb 6, 2026
This commit embeds the negotiated `FeatureSet` directly into `WorkerProto::Version` and introduces a `Number` inner type with total ordering, so that `Version` itself (number + features) only has partial ordering. This is a follow-up to NixOS#15155, cleaning up the separate `features` fields on `ReadConn`/`WriteConn`. Co-authored-by: Amaan Qureshi <git@amaanq.com>
amaanq
added a commit
to obsidiansystems/nix
that referenced
this pull request
Feb 6, 2026
This commit embeds the negotiated `FeatureSet` directly into `WorkerProto::Version` and introduces a `Number` inner type with total ordering, so that `Version` itself (number + features) only has partial ordering. This is a follow-up to NixOS#15155, cleaning up the separate `features` fields on `ReadConn`/`WriteConn`. Co-authored-by: Amaan Qureshi <git@amaanq.com>
amaanq
added a commit
to obsidiansystems/nix
that referenced
this pull request
Feb 6, 2026
This commit embeds the negotiated `FeatureSet` directly into `WorkerProto::Version` and introduces a `Number` inner type with total ordering, so that `Version` itself (number + features) only has partial ordering. This is a follow-up to NixOS#15155, cleaning up the separate `features` fields on `ReadConn`/`WriteConn`. Co-authored-by: Amaan Qureshi <git@amaanq.com>
amaanq
added a commit
to obsidiansystems/nix
that referenced
this pull request
Feb 6, 2026
This commit embeds the negotiated `FeatureSet` directly into `WorkerProto::Version` and introduces a `Number` inner type with total ordering, so that `Version` itself (number + features) only has partial ordering. This is a follow-up to NixOS#15155, cleaning up the separate `features` fields on `ReadConn`/`WriteConn`. Co-authored-by: Amaan Qureshi <git@amaanq.com>
amaanq
added a commit
to obsidiansystems/nix
that referenced
this pull request
Feb 6, 2026
This commit embeds the negotiated `FeatureSet` directly into `WorkerProto::Version` and introduces a `Number` inner type with total ordering, so that `Version` itself (number + features) only has partial ordering. This is a follow-up to NixOS#15155, cleaning up the separate `features` fields on `ReadConn`/`WriteConn`. Co-authored-by: Amaan Qureshi <git@amaanq.com>
brittonr
pushed a commit
to brittonr/nix
that referenced
this pull request
Apr 1, 2026
…structs worker-protocol: replace version bit-shifting with structs
brittonr
pushed a commit
to brittonr/nix
that referenced
this pull request
Apr 1, 2026
This commit embeds the negotiated `FeatureSet` directly into `WorkerProto::Version` and introduces a `Number` inner type with total ordering, so that `Version` itself (number + features) only has partial ordering. This is a follow-up to NixOS#15155, cleaning up the separate `features` fields on `ReadConn`/`WriteConn`. Co-authored-by: Amaan Qureshi <git@amaanq.com>
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
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 commit replaces the
GET_PROTOCOL_MINOR(version)macros with a properWorkerProto::Versionstruct. As a bonus, this also fixes some version checks that were incorrectly ignoring the major version number.Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.