From c504a45404ed1f0d68b1a036f40edae8c8960c7a Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 4 Sep 2018 13:52:31 -0700 Subject: [PATCH] rust generator: fix enum member comments (#4911) --- src/idl_gen_rust.cpp | 4 +--- tests/monster_test_generated.rs | 6 ++++-- tests/namespace_test/namespace_test1_generated.rs | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/idl_gen_rust.cpp b/src/idl_gen_rust.cpp index c3d733d12..fe313b3e4 100644 --- a/src/idl_gen_rust.cpp +++ b/src/idl_gen_rust.cpp @@ -555,7 +555,6 @@ class RustGenerator : public BaseGenerator { void GenEnum(const EnumDef &enum_def) { code_.SetValue("ENUM_NAME", Name(enum_def)); code_.SetValue("BASE_TYPE", GetEnumTypeForDecl(enum_def.underlying_type)); - code_.SetValue("SEP", ""); GenComment(enum_def.doc_comment); code_ += "#[allow(non_camel_case_types)]"; @@ -572,8 +571,7 @@ class RustGenerator : public BaseGenerator { GenComment(ev.doc_comment, " "); code_.SetValue("KEY", Name(ev)); code_.SetValue("VALUE", NumToString(ev.value)); - code_ += "{{SEP}} {{KEY}} = {{VALUE}}\\"; - code_.SetValue("SEP", ",\n"); + code_ += " {{KEY}} = {{VALUE}},"; minv = !minv || minv->value > ev.value ? &ev : minv; maxv = !maxv || maxv->value < ev.value ? &ev : maxv; diff --git a/tests/monster_test_generated.rs b/tests/monster_test_generated.rs index b66f99aa2..1b3f1ab6f 100644 --- a/tests/monster_test_generated.rs +++ b/tests/monster_test_generated.rs @@ -169,7 +169,8 @@ pub mod example { pub enum Color { Red = 1, Green = 2, - Blue = 8 + Blue = 8, + } const ENUM_MIN_COLOR: i8 = 1; @@ -237,7 +238,8 @@ pub enum Any { NONE = 0, Monster = 1, TestSimpleTableWithEnum = 2, - MyGame_Example2_Monster = 3 + MyGame_Example2_Monster = 3, + } const ENUM_MIN_ANY: u8 = 0; diff --git a/tests/namespace_test/namespace_test1_generated.rs b/tests/namespace_test/namespace_test1_generated.rs index e10e5558c..b4720444c 100644 --- a/tests/namespace_test/namespace_test1_generated.rs +++ b/tests/namespace_test/namespace_test1_generated.rs @@ -30,7 +30,8 @@ pub mod namespace_b { pub enum EnumInNestedNS { A = 0, B = 1, - C = 2 + C = 2, + } const ENUM_MIN_ENUM_IN_NESTED_N_S: i8 = 0;