Update desc/sourceinfo to not wrap descriptors #622
Merged
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
jhump
commented
Sep 2, 2024
Comment on lines
-37
to
-40
| // | ||
| // Deprecated: the new protobuf runtime (v1.4+) verifies that import paths are | ||
| // correct and that descriptors can be linked during package initialization. So | ||
| // registering alternate paths is no longer useful or necessary. |
There was a problem hiding this comment.
I also un-deprecated these while in here. I was mistaken when I wrote this comment: the protobuf runtime does not verify that import paths are correct. Instead it will happily delay the errors until you need to use reflection. At reflection time, it can provide "placeholder" descriptors for files that are imported using the wrong name. So all of the work-arounds in this file for patching import paths are, in fact, still useful.
jhump
commented
Sep 2, 2024
| @@ -33,7 +34,7 @@ var ( | |||
| // re-processed if the same file is fetched again later. | |||
| func LoadFileDescriptor(file string) (*FileDescriptor, error) { | |||
| d, err := sourceinfo.GlobalFiles.FindFileByPath(file) | |||
| if err == protoregistry.NotFound { | |||
| if errors.Is(err, protoregistry.NotFound) { | |||
There was a problem hiding this comment.
Some other low-hanging fruit clean-up while in here.
…re better named and allow returning an error
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.
The
desc/sourceinfopackage previously wrapped descriptors, by returning an implementation of the variousprotoreflect.Descriptorinterfaces that embedded the original descriptor values. However, these various interfaces are all defined as "do not implement". So, to avoid future issues where the protobuf runtime may type-assert implementations to their own internal types (which would panic/fail with the concrete wrapper types in this package), we no longer wrap this way.This also happens to resolve #618 (since there's no more wrapping, an incorrect typed-nil wrapper can't escape).