Handle the const struct * and struct * patterns
#2304
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
goffrie
reviewed
Oct 14, 2022
bindgen/ir/ty.rs
Outdated
| if !ctx.options().c_naming { | ||
| if let Some(inner_name) = dbg!(inner_spelling | ||
| .strip_prefix("const struct ") | ||
| .and_then(|s| s.strip_suffix(" *"))) |
There was a problem hiding this comment.
This textual approach seems unreliable; what if there isn't a space before the *? Possibly other cases?
There was a problem hiding this comment.
This textual representation is generated by clang and it doesn't seem to be affected by adding/removing spaces from the source code. For example:
typedef const struct foo {
char bar;
}*foo;
works just fine.
pvdrz
force-pushed
the
const-struct-ptr
branch
from
05ef029
to
2db8777
Compare
pvdrz
changed the title
const struct * pattern.const struct * and struct * patterns
pvdrz
force-pushed
the
const-struct-ptr
branch
from
2db8777
to
e0fdc7f
Compare
|
@goffrie thanks for your review! I updated the PR with some changes if you want to give it a second look |
emilio
reviewed
Oct 31, 2022
bindgen/ir/ty.rs
Outdated
| // collisions. | ||
| if !ctx.options().c_naming { | ||
| if let Some(inner_name) = inner_spelling | ||
| .strip_prefix("const struct ") |
There was a problem hiding this comment.
This feels a bit hackish, relying on libclang's serialization... Can we use pointee_type() and cursor equality instead? If not I guess this is ok...
There was a problem hiding this comment.
I did a commit using pointee_type but I don't get the cursor equality part, wdym?
pvdrz
force-pushed
the
const-struct-ptr
branch
2 times, most recently
from
f7716a5
to
e4ba626
Compare
Given that C keeps a different namespace for `struct`s and aliases. The
following patterns
```c
typedef const struct foo {
void *inner;
} *foo;
typedef struct bar {
void *inner;
} *bar;
```
are valid C code and produces both a `struct` and a pointer called `foo`
and `bar` in different namespaces. Given that Rust does not make this
distinction, we add the `_ptr` prefix to the pointer type aliases to
avoid any name collisions.
pvdrz
force-pushed
the
const-struct-ptr
branch
from
e4ba626
to
9dedf00
Compare
emilio
requested changes
Nov 10, 2022
19 tasks
LoganBarnett
pushed a commit
to LoganBarnett/rust-bindgen
that referenced
this pull request
Dec 2, 2023
Given that C keeps a different namespace for `struct`/`enum`/`union` and `typedef` aliases. The
following patterns
```c
typedef const struct foo {
void *inner;
} *foo;
typedef struct bar {
void *inner;
} *bar;
```
are valid C code and produces both a `struct` and a pointer called `foo`
and `bar` in different namespaces. Given that Rust does not make this
distinction, we add the `_ptr` prefix to the pointer type aliases to
avoid any name collisions.
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.
Given that C keeps a different namespace for
structs and aliases. The following patternis valid C code and produces both a
structand a pointer calledfoo. Given that Rust does not make this distinction, we add the_ptrprefix to the pointer type alias to avoid any name collisions.Fixes: #2227