diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-03-05 12:19:25 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-05 12:19:25 -0500 |
commit | f36f4e3e38d5a4f9c712a5bbde68403ce716dab6 (patch) | |
tree | 656a73545312d459bc01ce76433ac0720a0592bb /src/codegen/mod.rs | |
parent | f9fe3d157192ab0738e08f1da69c4be30ed289d4 (diff) | |
parent | 4c6c9977c8ce93a5753d28278a3eb7571aaddef7 (diff) |
Auto merge of #1268 - emilio:enum-replace, r=fitzgen
ir: Allow replacing enums and enum variants.
Fixes #1267.
Diffstat (limited to 'src/codegen/mod.rs')
-rw-r--r-- | src/codegen/mod.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/codegen/mod.rs b/src/codegen/mod.rs index b21c0dc4..1801520a 100644 --- a/src/codegen/mod.rs +++ b/src/codegen/mod.rs @@ -2228,7 +2228,7 @@ impl<'a> EnumBuilder<'a> { self, ctx: &BindgenContext, variant: &EnumVariant, - mangling_prefix: Option<&String>, + mangling_prefix: Option<&str>, rust_ty: quote::Tokens, result: &mut CodegenResult<'b>, ) -> Self { @@ -2548,9 +2548,9 @@ impl CodeGenerator for Enum { let constant_mangling_prefix = if ctx.options().prepend_enum_name { if enum_ty.name().is_none() { - parent_canonical_name.as_ref().map(|n| &*n) + parent_canonical_name.as_ref().map(|n| &**n) } else { - Some(&name) + Some(&*name) } } else { None |