Fix name collision between C enum and typedef #2326

dtolnay · 2022-10-27T01:14:49Z

Fixes #2008.

Example:

enum Enum { Variant };
typedef int16_t Enum;

This is valid and idiomatic C (though not valid C++). cbindgen uses this idiom as the default C translation of Rust enums, the equivalent of what would be enum Enum : int16_t { Variant }; in C++.

bindgen header.h before:

pub const Enum_Variant: Enum = 0;
pub type Enum = ::std::os::raw::c_uint;
pub type Enum = i16;

error[E0428]: the name `Enum` is defined multiple times
 --> generated.rs:3:1
  |
2 | pub type Enum = ::std::os::raw::c_uint;
  | --------------------------------------- previous definition of the type `Enum` here
3 | pub type Enum = i16;
  | ^^^^^^^^^^^^^^^^^^^^ `Enum` redefined here
  |
  = note: `Enum` must be defined only once in the type namespace of this module

After:

pub const Enum_Variant: Enum = 0;
pub type Enum = i16;

bors-servo · 2022-11-22T16:27:59Z

☔ The latest upstream changes (presumably f160d11) made this pull request unmergeable. Please resolve the merge conflicts.

error[E0428]: the name `Enum` is defined multiple times --> bindgen-tests/tests/expectations/tests/enum-typedef.rs:10:1 | 9 | pub type Enum = ::std::os::raw::c_uint; | --------------------------------------- previous definition of the type `Enum` here 10 | pub type Enum = i16; | ^^^^^^^^^^^^^^^^^^^^ `Enum` redefined here | = note: `Enum` must be defined only once in the type namespace of this module error[E0428]: the name `TypedefFirst` is defined multiple times --> bindgen-tests/tests/expectations/tests/enum-typedef.rs:13:1 | 11 | pub type TypedefFirst = i16; | ---------------------------- previous definition of the type `TypedefFirst` here 12 | pub const TypedefFirst_Variant2: TypedefFirst = 0; 13 | pub type TypedefFirst = ::std::os::raw::c_uint; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `TypedefFirst` redefined here | = note: `TypedefFirst` must be defined only once in the type namespace of this module

dtolnay · 2022-11-25T12:12:13Z

Rebased to resolve conflict with Add ParseCallbacks::process_comment #2347 in bindgen/codegen/mod.rs

Summary: Both waiting-in PRs have been merged and released: - rust-lang/rust-bindgen#2319 - rust-lang/rust-bindgen#2326 Adding `artifact = "bin"` removes the need for the `lib.rs` patch: - fbsource/bindgen@3579276 Reviewed By: jsgf Differential Revision: D44301594 fbshipit-source-id: d5ac1b54b099655e8e87974e42439bcd32aa5aed

Fixes rust-lang#2008. Example: ```c enum Enum { Variant }; typedef int16_t Enum; ``` This is valid and idiomatic C (though not valid C++). `cbindgen` uses this idiom as the default C translation of Rust enums, the equivalent of what would be `enum Enum : int16_t { Variant };` in C++. `bindgen header.h` before: ```rust pub const Enum_Variant: Enum = 0; pub type Enum = ::std::os::raw::c_uint; pub type Enum = i16; ``` ```console error[E0428]: the name `Enum` is defined multiple times --> generated.rs:3:1 | 2 | pub type Enum = ::std::os::raw::c_uint; | --------------------------------------- previous definition of the type `Enum` here 3 | pub type Enum = i16; | ^^^^^^^^^^^^^^^^^^^^ `Enum` redefined here | = note: `Enum` must be defined only once in the type namespace of this module ``` After: ```rust pub const Enum_Variant: Enum = 0; pub type Enum = i16; ```

dtolnay added 2 commits November 25, 2022 04:09

Fix name collision between C enum and typedef

0238fc4

dtolnay force-pushed the enum branch from 265593b to 0238fc4 Compare November 25, 2022 12:11

pvdrz approved these changes Nov 28, 2022

View reviewed changes

pvdrz merged commit 0a78cde into rust-lang:master Nov 28, 2022

dtolnay deleted the enum branch November 28, 2022 15:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix name collision between C enum and typedef #2326

Fix name collision between C enum and typedef #2326

dtolnay commented Oct 27, 2022

bors-servo commented Nov 22, 2022

dtolnay commented Nov 25, 2022

Fix name collision between C enum and typedef #2326

Fix name collision between C enum and typedef #2326

Conversation

dtolnay commented Oct 27, 2022

bors-servo commented Nov 22, 2022

dtolnay commented Nov 25, 2022