libexpr: Make Bindings::iterator a proper strong type instead of pointer#13983
Merged
Ericson2314 merged 2 commits intoNixOS:masterfrom Sep 14, 2025
Merged
libexpr: Make Bindings::iterator a proper strong type instead of pointer#13983Ericson2314 merged 2 commits intoNixOS:masterfrom
Ericson2314 merged 2 commits intoNixOS:masterfrom
Conversation
Contributor
Author
|
Nevermind, this will pessimise the binary search a bunch. Will fix |
As evident from the number of tests that were holding this API completely wrong (the end() iterator returned from find() is NEVER nullptr) we should not have this footgun. A proper strong type guarantees that this confusion will not happen again. Also this will be helpful down the road when Bindings becomes something smarter than an array of Attr.
fd8e632 to
ddabd94
Compare
xokdvium
commented
Sep 14, 2025
Comment on lines
140
to
149
| const_iterator find(Symbol name) const | ||
| { | ||
| Attr key(name, 0); | ||
| const_iterator i = std::lower_bound(begin(), end(), key); | ||
| if (i != end() && i->name == name) | ||
| return i; | ||
| auto first = attrs; | ||
| auto last = attrs + size_; | ||
| const Attr * i = std::lower_bound(first, last, key); | ||
| if (i != last && i->name == name) | ||
| return const_iterator{i}; | ||
| return end(); | ||
| } |
Contributor
Author
There was a problem hiding this comment.
This function will get removed in a follow-up commit anyway, so code duplication is not a concern.
Ericson2314
approved these changes
Sep 14, 2025
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
2 participants
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
As evident from the number of tests that were holding this API completely
wrong (the
end()iterator returned fromfind()is NEVERnullptr) we shouldnot have this footgun. A proper strong type guarantees that this confusion
will not happen again.
Also this will be helpful down the road when Bindings becomes something
smarter than an array of Attr.
Context
Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.