Add support for NonZero<T> #964
Closed
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
scovich
commented
May 22, 2024
| "c_short" => (IntKind::Short, true), | ||
| "c_int" => (IntKind::Int, true), | ||
| "c_long" => (IntKind::Long, true), | ||
| "c_longlong" => (IntKind::LongLong, true), |
There was a problem hiding this comment.
This PR is best reviewed with whitespace changes hidden:
scovich
commented
May 22, 2024
| @@ -592,50 +516,14 @@ impl Type { | |||
| } | |||
| } | |||
|
|
|||
| fn nonzero_to_primitive(&self) -> Option<Self> { | |||
There was a problem hiding this comment.
NOTE: This function is no longer needed, because the parser handles these types directly now.
scovich
commented
May 22, 2024
Comment on lines
+109
to
+111
| // NOTE: This performs the type erasure directly, as if `NonZero<T>` had been specified, because | ||
| // it's actually more code to register an erased typedef instead. | ||
| fn maybe_nonzero_integer(path: &str) -> Option<PrimitiveType> { |
There was a problem hiding this comment.
NOTE: This replaces Type::nonzero_to_primitive
emilio
approved these changes
May 26, 2024
| fn simplified_type(&self, config: &Config) -> Option<Self> { | ||
| let path = match *self { | ||
| Type::Path(ref p) => p, | ||
| _ => return None, | ||
| }; | ||
|
|
||
| if path.generics().is_empty() { | ||
| return self.nonzero_to_primitive(); | ||
| return Some(self.clone()); |
There was a problem hiding this comment.
You can just return None, which is the shorthand for "no simplification needed", right?
|
Merged with that tweak. |
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.
Currently, cbindgen only supports the various
NonZeroXXtype aliases, but notNonZero<T>itself. Add that support, and also simplify the handling of types in general.