also support renaming enumerants

Author: dwrensha

capnpc/rust.capnp

@@ -1,6 +1,6 @@
 @0x83b3c14c3c8dd083;
 
-annotation name @0xc2fe4c6d100166d0 (field, struct, enum) :Text;
+annotation name @0xc2fe4c6d100166d0 (field, struct, enum, enumerant) :Text;
 # Rename something in the generated code. The value that you specify in this
 # annotion must follow capnp capitalization conventions. So, for example,
 # a struct could be named `StructFoo`, even though that will get translated

capnpc/src/codegen.rs

@@ -252,6 +252,19 @@ fn get_field_name(field: schema_capnp::field::Reader) -> capnp::Result<&str> {
     field.get_name()
 }
 
+fn get_enumerant_name(enumerant: schema_capnp::enumerant::Reader) -> capnp::Result<&str> {
+    for annotation in enumerant.get_annotations()?.iter() {
+        if annotation.get_id() == NAME_ANNOTATION_ID {
+            if let schema_capnp::value::Text(t) = annotation.get_value()?.which()? {
+                return t;
+            } else {
+                return Err(capnp::Error::failed(format!("expected rust.name annotation value to be of type Text")));
+            }
+        }
+    }
+    enumerant.get_name()
+}
+
 enum NameKind {
     // convert camel case to snake case, and avoid Rust keywords
     Module,
@@ -1464,7 +1477,7 @@ fn generate_node(gen: &GeneratorContext,
             let mut match_branches = Vec::new();
             let enumerants = enum_reader.get_enumerants()?;
             for ii in 0..enumerants.len() {
-                let enumerant = capitalize_first_letter(enumerants.get(ii).get_name()?);
+                let enumerant = capitalize_first_letter(get_enumerant_name(enumerants.get(ii))?);
                 members.push(Line(format!("{} = {},", enumerant, ii)));
                 match_branches.push(
                     Line(format!("{} => ::std::result::Result::Ok({}::{}),", ii, last_name, enumerant)));
@@ -1837,7 +1850,7 @@ fn generate_node(gen: &GeneratorContext,
                                 let enumerants = e.get_enumerants()?;
                                 if (v as u32) < enumerants.len() {
                                     let variant =
-                                        capitalize_first_letter(enumerants.get(v as u32).get_name()?);
+                                        capitalize_first_letter(get_enumerant_name(enumerants.get(v as u32))?);
                                     let type_string = typ.type_string(gen, Leaf::Owned)?;
                                     Line(format!("pub const {}: {} = {}::{};",
                                                  styled_name,

capnpc/test/test.capnp

@@ -756,8 +756,19 @@ struct TestNameAnnotation $Rust.name("RenamedStruct") {
   enum BadlyNamedEnum $Rust.name("RenamedEnum") {
     foo @0;
     bar @1;
+    baz @2 $Rust.name("qux");
   }
 
   anotherBadFieldName @2 :BadlyNamedEnum $Rust.name("anotherGoodFieldName");
-  # ...
+
+  struct NestedStruct $Rust.name("RenamedNestedStruct") {
+    badNestedFieldName @0 :Bool $Rust.name("goodNestedFieldName");
+    anotherBadNestedFieldName @1 :NestedStruct $Rust.name("anotherGoodNestedFieldName");
+
+    enum DeeplyNestedEnum $Rust.name("RenamedDeeplyNestedEnum") {
+      quux @0;
+      corge @1;
+      grault @2 $Rust.name("garply");
+    }
+  }
 }