Clarify the distinction of NamespaceEntries contents
diff --git a/gen/src/write.rs b/gen/src/write.rs
index 7c6d098..5ca3dc5 100644
--- a/gen/src/write.rs
+++ b/gen/src/write.rs
@@ -37,7 +37,7 @@
}
fn gen_namespace_forward_declarations(out: &mut OutFile, ns_entries: &NamespaceEntries) {
- let apis = ns_entries.entries();
+ let apis = ns_entries.direct_content();
for api in apis {
match api {
@@ -49,7 +49,7 @@
}
}
- for (child_ns, child_ns_entries) in ns_entries.children() {
+ for (child_ns, child_ns_entries) in ns_entries.nested_content() {
writeln!(out, "namespace {} {{", child_ns);
gen_namespace_forward_declarations(out, child_ns_entries);
writeln!(out, "}} // namespace {}", child_ns);
@@ -57,7 +57,7 @@
}
fn gen_namespace_contents(out: &mut OutFile, ns_entries: &NamespaceEntries, opt: &Opt) {
- let apis = ns_entries.entries();
+ let apis = ns_entries.direct_content();
let mut methods_for_type = HashMap::new();
for api in apis {
@@ -128,7 +128,7 @@
}
}
- for (child_ns, child_ns_entries) in ns_entries.children() {
+ for (child_ns, child_ns_entries) in ns_entries.nested_content() {
let block = format!("namespace {}", child_ns);
out.begin_block(&block);
gen_namespace_contents(out, child_ns_entries, opt);