more simplification enabled by GeneratorContext::node_parents

Author: dwrensha

capnpc/src/codegen.rs

@@ -2038,7 +2038,6 @@ fn generate_node(
                     method.get_param_brand()?,
                     Leaf::Owned,
                     &param_scopes.join("::"),
-                    Some(node_id),
                 )?;
 
                 let result_id = method.get_result_struct_type();
@@ -2061,7 +2060,6 @@ fn generate_node(
                     method.get_result_brand()?,
                     Leaf::Owned,
                     &result_scopes.join("::"),
-                    Some(node_id),
                 )?;
 
                 dispatch_arms.push(
@@ -2136,15 +2134,8 @@ fn generate_node(
                     base_dispatch_arms.push(Line(format!(
                         "0x{type_id:x} => {}::dispatch_call_internal(&mut self.server, method_id, params, results),",
                         do_branding(
-                            gen, type_id, brand, Leaf::ServerDispatch, &the_mod, None)?)));
-                    base_traits.push(do_branding(
-                        gen,
-                        type_id,
-                        brand,
-                        Leaf::Server,
-                        &the_mod,
-                        None,
-                    )?);
+                            gen, type_id, brand, Leaf::ServerDispatch, &the_mod)?)));
+                    base_traits.push(do_branding(gen, type_id, brand, Leaf::Server, &the_mod)?);
                 }
                 if !extends.is_empty() {
                     format!(": {}", base_traits.join(" + "))

capnpc/src/codegen_types.rs

@@ -195,15 +195,13 @@ impl<'a> RustTypeInfo for type_::Reader<'a> {
                 st.get_brand()?,
                 module,
                 &gen.get_qualified_module(st.get_type_id()),
-                None,
             ),
             type_::Interface(interface) => do_branding(
                 gen,
                 interface.get_type_id(),
                 interface.get_brand()?,
                 module,
                 &gen.get_qualified_module(interface.get_type_id()),
-                None,
             ),
             type_::List(ot1) => {
                 let element_type = ot1.get_element_type()?;
@@ -345,7 +343,6 @@ pub fn do_branding(
     brand: brand::Reader,
     leaf: Leaf,
     the_mod: &str,
-    mut parent_scope_id: Option<u64>,
 ) -> Result<String, Error> {
     let scopes = brand.get_scopes()?;
     let mut brand_scopes = HashMap::new();
@@ -356,7 +353,7 @@ pub fn do_branding(
     let mut current_node_id = node_id;
     let mut accumulator: Vec<Vec<String>> = Vec::new();
     loop {
-        let Some(current_node) = gen.node_map.get(&current_node_id) else { break };
+        let current_node = gen.node_map[&current_node_id];
         let params = current_node.get_parameters()?;
         let mut arguments: Vec<String> = Vec::new();
         match brand_scopes.get(&current_node_id) {
@@ -388,11 +385,10 @@ pub fn do_branding(
             },
         }
         accumulator.push(arguments);
-        current_node_id = current_node.get_scope_id();
-        if let (0, Some(id)) = (current_node_id, parent_scope_id) {
-            current_node_id = id
-        }
-        parent_scope_id = None; // Only consider on the first time around.
+        current_node_id = match gen.node_parents.get(&current_node_id).copied() {
+            Some(0) | None => break,
+            Some(id) => id,
+        };
     }
 
     // Now add a lifetime parameter if the leaf has one.