Additional keyword ident conversion tests (#183)

tokio-rs · May 11, 2019 · ff851fd · ff851fd
1 parent f51cbb2
commit ff851fd
Show file tree

Hide file tree

Showing 3 changed files with 107 additions and 1 deletion.
diff --git a/prost-build/src/ident.rs b/prost-build/src/ident.rs
@@ -157,7 +157,6 @@ mod tests {
         assert_eq!("r#box", &to_snake("box"));
         assert_eq!("r#do", &to_snake("do"));
         assert_eq!("r#final", &to_snake("final"));
-        assert_eq!("r#final", &to_snake("final"));
         assert_eq!("r#macro", &to_snake("macro"));
         assert_eq!("r#override", &to_snake("override"));
         assert_eq!("r#priv", &to_snake("priv"));

diff --git a/tests/src/ident_conversion.proto b/tests/src/ident_conversion.proto
@@ -11,6 +11,61 @@ message Foo_barBaz {
 
   StrawberryRhubarbPIE p_iE = 3;
 
+  // Rust Keywords:
+  int32 as = 4;
+  int32 break = 5;
+  int32 const = 6;
+  int32 continue = 7;
+  int32 else = 8;
+  int32 enum = 9;
+  int32 false = 10;
+  int32 fn = 11;
+  int32 for = 12;
+  int32 if = 13;
+  int32 impl = 14;
+  int32 in = 15;
+  int32 let = 16;
+  int32 loop = 17;
+  int32 match = 18;
+  int32 mod = 19;
+  int32 move = 20;
+  int32 mut = 21;
+  int32 pub = 22;
+  int32 ref = 23;
+  int32 return = 24;
+  int32 static = 25;
+  int32 struct = 26;
+  int32 trait = 27;
+  int32 true = 28;
+  int32 type = 29;
+  int32 unsafe = 30;
+  int32 use = 31;
+  int32 where = 32;
+  int32 while = 33;
+  int32 dyn = 34;
+  int32 abstract = 35;
+  int32 become = 36;
+  int32 box = 37;
+  int32 do = 38;
+  int32 final = 39;
+  int32 macro = 40;
+  int32 override = 41;
+  int32 priv = 42;
+  int32 typeof = 43;
+  int32 unsized = 44;
+  int32 virtual = 45;
+  int32 yield = 46;
+  int32 async = 47;
+  int32 await = 48;
+  int32 try = 49;
+  int32 self = 50;
+  int32 super = 51;
+  int32 extern = 52;
+  int32 crate = 53;
+
+  message Self {
+  }
+
   message fuzz_buster {
     map<int32, Foo_barBaz> t = 1;
     fuzz_buster NestedSelf = 2;

diff --git a/tests/src/lib.rs b/tests/src/lib.rs
@@ -242,8 +242,60 @@ mod tests {
                 nested_self: None,
             }],
             p_i_e: 0,
+            r#as: 4,
+            r#break: 5,
+            r#const: 6,
+            r#continue: 7,
+            r#else: 8,
+            r#enum: 9,
+            r#false: 10,
+            r#fn: 11,
+            r#for: 12,
+            r#if: 13,
+            r#impl: 14,
+            r#in: 15,
+            r#let: 16,
+            r#loop: 17,
+            r#match: 18,
+            r#mod: 19,
+            r#move: 20,
+            r#mut: 21,
+            r#pub: 22,
+            r#ref: 23,
+            r#return: 24,
+            r#static: 25,
+            r#struct: 26,
+            r#trait: 27,
+            r#true: 28,
+            r#type: 29,
+            r#unsafe: 30,
+            r#use: 31,
+            r#where: 32,
+            r#while: 33,
+            r#dyn: 34,
+            r#abstract: 35,
+            r#become: 36,
+            r#box: 37,
+            r#do: 38,
+            r#final: 39,
+            r#macro: 40,
+            r#override: 41,
+            r#priv: 42,
+            r#typeof: 43,
+            r#unsized: 44,
+            r#virtual: 45,
+            r#yield: 46,
+            r#async: 47,
+            r#await: 48,
+            r#try: 49,
+            self_: 50,
+            super_: 51,
+            extern_: 52,
+            crate_: 53,
         };
 
+        let _ = foo::bar_baz::foo_bar_baz::Self_ {};
+
         // Test enum ident conversion.
         let _ = foo::bar_baz::foo_bar_baz::StrawberryRhubarbPie::Foo;
         let _ = foo::bar_baz::foo_bar_baz::StrawberryRhubarbPie::Bar;