Allow UniquePtr to trivial aliases.

adetaylor · adetaylor · commit 95c5758301ad · 2020-09-29T18:02:22.000-07:00
More thought needed here...
diff --git a/macro/src/expand.rs b/macro/src/expand.rs
@@ -80,7 +80,8 @@ fn expand(ffi: Module, apis: &[Api], types: &Types) -> TokenStream {
             }
         } else if let Type::UniquePtr(ptr) = ty {
             if let Type::Ident(ident) = &ptr.inner {
-                if Atom::from(ident).is_none() && !types.aliases.contains_key(ident) {
+                if Atom::from(ident).is_none() && !(types.aliases.contains_key(ident)
+                    && !types.required_trivial_aliases.contains(ident)) {
                     expanded.extend(expand_unique_ptr(namespace, ident, types));
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,8 @@ fn expand(ffi: Module, apis: &[Api], types: &Types) -> TokenStream {`
`80`	`80`	`}`
`81`	`81`	`} else if let Type::UniquePtr(ptr) = ty {`
`82`	`82`	`if let Type::Ident(ident) = &ptr.inner {`
`83`		`- if Atom::from(ident).is_none() && !types.aliases.contains_key(ident) {`
	`83`	`+ if Atom::from(ident).is_none() && !(types.aliases.contains_key(ident)`
	`84`	`+ && !types.required_trivial_aliases.contains(ident)) {`
`84`	`85`	`expanded.extend(expand_unique_ptr(namespace, ident, types));`
`85`	`86`	`}`
`86`	`87`	`}`