avoid ambiguous associated item in TryFrom implementations

capnproto · Jan 30, 2023 · 59f2ad3 · 59f2ad3
1 parent c1b4c3a
commit 59f2ad3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/capnpc/src/codegen.rs b/capnpc/src/codegen.rs
@@ -1937,8 +1937,7 @@ fn generate_node(
                 ))),
                 Indent(Box::new(Branch(vec![
                     Line(
-                        "fn try_from(value: u16) -> ::core::result::Result<Self, Self::Error> {"
-                            .to_string(),
+                        format!("fn try_from(value: u16) -> ::core::result::Result<Self, <{last_name} as ::core::convert::TryFrom<u16>>::Error> {{")
                     ),
                     Indent(Box::new(Branch(vec![
                         Line("match value {".to_string()),

diff --git a/capnpc/test/test.capnp b/capnpc/test/test.capnp
@@ -106,6 +106,12 @@ enum TestEnum {
   garply @7;
 }
 
+enum TestEnumWithTrickyNames {
+  foo @0;
+  bar @1;
+  error @2;
+}
+
 struct TestAllTypes {
   voidField      @0  : Void;
   boolField      @1  : Bool;