mesh_protobuf: Only deduplicate descriptors by package and name #1821
+17
−14
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
mattkur
reviewed
Aug 8, 2025
|
Thanks for making this change! Do we validate somewhere that the saved state is stable in light of this change? (Does this change touch any of the machinery that we use to generate save state)? |
|
I'm not sure if this is involved in save state, but it will be covered by our existing servicing tests. |
chris-oo
approved these changes
Aug 18, 2025
jstarks
reviewed
Aug 19, 2025
| @@ -44,8 +44,6 @@ impl<'a> DescriptorWriter<'a> { | |||
|
|
|||
| // Sort the descriptors to get a consistent order from run to run and build to build. | |||
| descriptors.sort_by_key(|desc| (desc.package, desc.message.name)); | |||
| // Deduplicate by package and name. TODO: ensure duplicates match. | |||
| descriptors.dedup_by_key(|desc| (desc.package, desc.message.name)); | |||
There was a problem hiding this comment.
We're already doing it now in the earlier step, this one wouldn't add anything. referenced_descriptors won't return any duplicates anymore.
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.
As a new warning in Rust 1.89 points out, comparisons of function pointers are unreliable (https://doc.rust-lang.org/nightly/core/ptr/fn.fn_addr_eq.html). The derive of PartialEq on a type containing a function pointer will produce such a comparison, triggering this warning. Instead of deriving the trait and inserting MessageDescriptors into a HashMap, just use their package and name as a deduplication key, under the assumption that nobody would declare two different types with the same package and name.