Handle ?Sized better in ZeroFrom derive #4657
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
This was referenced Mar 6, 2024
Manishearth
requested changes
Mar 7, 2024
utils/zerofrom/derive/src/lib.rs
Outdated
| let bound = bound_pair.into_value(); | ||
| if let TypeParamBound::Trait(ref trait_bound) = bound { | ||
| let sized: Path = PathSegment { | ||
| ident: quote::format_ident!("Sized"), |
There was a problem hiding this comment.
nit: I would just directly check equality on the ident here instead of constructing a new one
utils/zerofrom/derive/src/lib.rs
Outdated
| .map(|param| { | ||
| // First one doesn't work yet https://github.com/rust-lang/rust/issues/114393 | ||
| let maybe_new_param = if has_attr(¶m.attrs, "may_borrow") | ||
| || may_borrow_attrs.contains(¶m.ident) | ||
| { | ||
| // Remove `?Sized`` bound because we need a param to be Sized in order to take a ZeroFrom of it |
There was a problem hiding this comment.
issue: same comment as on Yokeable, I don't agree with this.
There was a problem hiding this comment.
Ah, this is only on may_borrow. This is fine, but please update the docs to say "we need a may_borrow param to be Sized in order to take a ZeroFrom attribute of it.
Manishearth
previously approved these changes
Mar 7, 2024
Manishearth
previously approved these changes
Mar 7, 2024
Manishearth
reviewed
Mar 7, 2024
utils/zerofrom/derive/src/lib.rs
Outdated
| } | ||
| .into(); | ||
| if trait_bound.path == sized | ||
| if trait_bound.path.get_ident() == Some("e::format_ident!("Sized")) |
There was a problem hiding this comment.
you should just be able to == str here
There was a problem hiding this comment.
.get_ident().map(|x| x == "Sized").unwrap_or(false)
Manishearth
approved these changes
Mar 7, 2024
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.
Need this to support the
Storetype parameter, which is?Sizedbut should only implementZeroFromwhen it is sized.