From 2fa8409d1652b5f81c01d8ccb53bc30202249d95 Mon Sep 17 00:00:00 2001 From: Emilio Cobos Álvarez Date: Tue, 22 Nov 2016 19:38:22 +0100 Subject: codegen: Don't bother generating an empty module. --- libbindgen/src/codegen/mod.rs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'libbindgen/src/codegen/mod.rs') diff --git a/libbindgen/src/codegen/mod.rs b/libbindgen/src/codegen/mod.rs index 0469a5be..ba52fa83 100644 --- a/libbindgen/src/codegen/mod.rs +++ b/libbindgen/src/codegen/mod.rs @@ -269,7 +269,7 @@ impl CodeGenerator for Module { item: &Item) { debug!("::codegen: item = {:?}", item); - let codegen_self = |result: &mut CodegenResult| { + let codegen_self = |result: &mut CodegenResult, found_any: &mut bool| { // FIXME: This could be less expensive, I guess. for &whitelisted_item in whitelisted_items { if whitelisted_item == item.id() { @@ -278,21 +278,28 @@ impl CodeGenerator for Module { let child = ctx.resolve_item(whitelisted_item); if child.parent_id() == item.id() { + *found_any = true; child.codegen(ctx, result, whitelisted_items, &()); } } }; if !ctx.options().enable_cxx_namespaces { - codegen_self(result); + codegen_self(result, &mut false); return; } + let mut found_any = false; let inner_items = result.inner(|result| { result.push(root_import(ctx)); - codegen_self(result); + codegen_self(result, &mut found_any); }); + // Don't bother creating an empty module. + if !found_any { + return; + } + let module = ast::ItemKind::Mod(ast::Mod { inner: ctx.span(), items: inner_items, -- cgit v1.2.3