BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-07-04 10:41:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

rust generator: fix enum member comments (#4911)

Browse Source
This commit is contained in:
Robert
2018-09-04 13:52:31 -07:00
committed by GitHub
parent 919c929d30
commit c504a45404
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/idl_gen_rust.cpp
View File

@@ -555,7 +555,6 @@ class RustGenerator : public BaseGenerator {
void GenEnum(const EnumDef &enum_def) { void GenEnum(const EnumDef &enum_def) {
code_.SetValue("ENUM_NAME", Name(enum_def)); code_.SetValue("ENUM_NAME", Name(enum_def));
code_.SetValue("BASE_TYPE", GetEnumTypeForDecl(enum_def.underlying_type)); code_.SetValue("BASE_TYPE", GetEnumTypeForDecl(enum_def.underlying_type));
code_.SetValue("SEP", "");
GenComment(enum_def.doc_comment); GenComment(enum_def.doc_comment);
code_ += "#[allow(non_camel_case_types)]"; code_ += "#[allow(non_camel_case_types)]";
@@ -572,8 +571,7 @@ class RustGenerator : public BaseGenerator {
GenComment(ev.doc_comment, " "); GenComment(ev.doc_comment, " ");
code_.SetValue("KEY", Name(ev)); code_.SetValue("KEY", Name(ev));
code_.SetValue("VALUE", NumToString(ev.value)); code_.SetValue("VALUE", NumToString(ev.value));
code_ += "{{SEP}} {{KEY}} = {{VALUE}}\\"; code_ += " {{KEY}} = {{VALUE}},";
code_.SetValue("SEP", ",\n");
minv = !minv || minv->value > ev.value ? &ev : minv; minv = !minv || minv->value > ev.value ? &ev : minv;
maxv = !maxv || maxv->value < ev.value ? &ev : maxv; maxv = !maxv || maxv->value < ev.value ? &ev : maxv;

6
tests/monster_test_generated.rs
View File

@@ -169,7 +169,8 @@ pub mod example {
pub enum Color { pub enum Color {
Red = 1, Red = 1,
Green = 2, Green = 2,
Blue = 8 Blue = 8,
} }
const ENUM_MIN_COLOR: i8 = 1; const ENUM_MIN_COLOR: i8 = 1;
@@ -237,7 +238,8 @@ pub enum Any {
NONE = 0, NONE = 0,
Monster = 1, Monster = 1,
TestSimpleTableWithEnum = 2, TestSimpleTableWithEnum = 2,
MyGame_Example2_Monster = 3 MyGame_Example2_Monster = 3,
} }
const ENUM_MIN_ANY: u8 = 0; const ENUM_MIN_ANY: u8 = 0;

3
tests/namespace_test/namespace_test1_generated.rs
View File

@@ -30,7 +30,8 @@ pub mod namespace_b {
pub enum EnumInNestedNS { pub enum EnumInNestedNS {
A = 0, A = 0,
B = 1, B = 1,
C = 2 C = 2,
} }
const ENUM_MIN_ENUM_IN_NESTED_N_S: i8 = 0; const ENUM_MIN_ENUM_IN_NESTED_N_S: i8 = 0;