Skip to content

Commit 14ebf02

Browse files
committed
get_qualified_module()
1 parent 10f263e commit 14ebf02

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

capnpc/src/codegen.rs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,10 @@ impl<'a> GeneratorContext<'a> {
294294
}
295295
Ok(())
296296
}
297+
298+
fn get_qualified_module(&self, type_id: u64) -> String {
299+
self.scope_map[&type_id].join("::")
300+
}
297301
}
298302

299303
fn path_to_stem_string<P: AsRef<::std::path::Path>>(path: P) -> ::capnp::Result<String> {
@@ -572,7 +576,7 @@ pub fn getter_text(
572576
format!(",{}", params.join(","))
573577
};
574578

575-
let the_mod = gen.scope_map[&group.get_type_id()].join("::");
579+
let the_mod = gen.get_qualified_module(group.get_type_id());
576580

577581
let mut result_type = if is_reader {
578582
format!("{the_mod}::Reader<'a{params_string}>")
@@ -841,8 +845,7 @@ fn generate_setter(
841845
format!(",{}", params.join(","))
842846
};
843847

844-
let scope = &gen.scope_map[&group.get_type_id()];
845-
let the_mod = scope.join("::");
848+
let the_mod = gen.get_qualified_module(group.get_type_id());
846849

847850
initter_interior.push(zero_fields_of_group(
848851
gen,
@@ -949,7 +952,7 @@ fn generate_setter(
949952
}
950953
type_::Enum(e) => {
951954
let id = e.get_type_id();
952-
let the_mod = gen.scope_map[&id].join("::");
955+
let the_mod = gen.get_qualified_module(id);
953956
setter_interior.push(Line(format!(
954957
"self.builder.set_data_field::<u16>({offset}, value as u16)"
955958
)));
@@ -1379,7 +1382,7 @@ fn generate_pipeline_getter(
13791382
format!("<{}>", params.join(","))
13801383
};
13811384

1382-
let the_mod = gen.scope_map[&group.get_type_id()].join("::");
1385+
let the_mod = gen.get_qualified_module(group.get_type_id());
13831386
Ok(Branch(vec![
13841387
Line(format!(
13851388
"pub fn get_{}(&self) -> {}::Pipeline{} {{",

0 commit comments

Comments
 (0)