From 527c8bf8677b5409cee6553f03e19a6c42447010 Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Fri, 17 Apr 2020 14:54:26 +1000
Subject: [PATCH] embed enum to avoid conflicts

---
 proto/backend.proto       | 15 +++++++--------
 rslib/src/notetype/mod.rs |  5 +++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/proto/backend.proto b/proto/backend.proto
index 79a6f2225..32b10b405 100644
--- a/proto/backend.proto
+++ b/proto/backend.proto
@@ -520,13 +520,12 @@ message CardTemplate {
     CardTemplateConfig config = 5;
 }
 
-enum NoteTypeKind {
-    NORMAL = 0;
-    CLOZE = 1;
-}
-
 message NoteTypeConfig {
-    NoteTypeKind kind = 1;
+    enum Kind {
+        NORMAL = 0;
+        CLOZE = 1;
+    }
+    Kind kind = 1;
     uint32 sort_field_idx = 2;
     string css = 3;
     // fixme: anki currently sets this without flushing
@@ -539,13 +538,13 @@ message NoteTypeConfig {
 }
 
 message CardRequirement {
-    enum CardRequirementKind {
+    enum Kind {
         None = 0;
         Any = 1;
         All = 2;
     }
     uint32 card_ord = 1;
-    CardRequirementKind kind = 2;
+    Kind kind = 2;
     repeated uint32 field_ords = 3;
 }
 
diff --git a/rslib/src/notetype/mod.rs b/rslib/src/notetype/mod.rs
index 6d1ff0fd8..f6cba7f34 100644
--- a/rslib/src/notetype/mod.rs
+++ b/rslib/src/notetype/mod.rs
@@ -9,8 +9,9 @@ mod stock;
 mod templates;
 
 pub use crate::backend_proto::{
-    card_requirement::CardRequirementKind, CardRequirement, CardTemplateConfig, NoteFieldConfig,
-    NoteType as NoteTypeProto, NoteTypeConfig, NoteTypeKind,
+    card_requirement::Kind as CardRequirementKind, note_type_config::Kind as NoteTypeKind,
+    CardRequirement, CardTemplateConfig, NoteFieldConfig, NoteType as NoteTypeProto,
+    NoteTypeConfig,
 };
 pub(crate) use cardgeninfo::CardGenContext;
 pub use fields::NoteField;