Handle keyword Self after stripping enum type prefix

prost-build/src/code_generator.rs

@@ -1191,21 +1191,27 @@ fn unescape_c_escape_string(s: &str) -> Vec<u8> {
 ///
 /// It also tries to handle cases where the stripped name would be
 /// invalid - for example, if it were to begin with a number.
+///
+/// The stripped name can be `Self`, which is sanitized analogously to [to_upper_camel]
 fn strip_enum_prefix(prefix: &str, name: &str) -> String {
     let stripped = name.strip_prefix(prefix).unwrap_or(name);
 
     // If the next character after the stripped prefix is not
     // uppercase, then it means that we didn't have a true prefix -
     // for example, "Foo" should not be stripped from "Foobar".
-    if stripped
+    match if stripped
         .chars()
         .next()
         .map(char::is_uppercase)
         .unwrap_or(false)
     {
-        stripped.to_owned()
+        stripped
     } else {
-        name.to_owned()
+        name
+    } {
+        "Self" => "Self_".to_owned(),
+        // ... other cases to be added here as needed
+        s => s.to_owned(),
     }
 }
 
@@ -1329,4 +1335,10 @@ mod tests {
         assert_eq!(strip_enum_prefix("Foo", "Bar"), "Bar");
         assert_eq!(strip_enum_prefix("Foo", "Foo1"), "Foo1");
     }
+
+    #[test]
+    fn test_strip_enum_prefix_resulting_in_keyword() {
+        assert_eq!(strip_enum_prefix("Foo", "FooBar"), "Bar");
+        assert_eq!(strip_enum_prefix("Foo", "FooSelf"), "Self_");
+    }
 }

tests/src/build.rs

@@ -79,6 +79,10 @@ fn main() {
         .compile_protos(&[src.join("default_enum_value.proto")], includes)
         .unwrap();
 
+    config
+        .compile_protos(&[src.join("enum_keyword_variant.proto")], includes)
+        .unwrap();
+
     config
         .compile_protos(&[src.join("groups.proto")], includes)
         .unwrap();

tests/src/enum_keyword_variant.proto

@@ -0,0 +1,21 @@
+syntax = "proto3";
+
+package enum_keyword_variant;
+
+enum Feeding {
+  FEEDING_UNSPECIFIED = 0;
+  FEEDING_ASSISTED = 1;
+  // Careful: code generation resulted in "Self".
+  FEEDING_SELF = 2;
+}
+
+enum Grooming {
+  UNSPECIFIED = 0;
+  ASSISTED = 1;
+  SELF = 2;
+}
+
+enum Number {
+  NUMBER_UNSPECIFIED = 0;
+  NUMBER_1 = 1;
+}

tests/src/enum_keyword_variant.rs

@@ -0,0 +1,7 @@
+mod enum_keyword_variant {
+    // #![deny(unused_results)]
+    include!(concat!(env!("OUT_DIR"), "/enum_keyword_variant.rs"));
+}
+
+#[test]
+fn dummy() {}

tests/src/lib.rs

@@ -37,6 +37,8 @@ mod debug;
 #[cfg(test)]
 mod deprecated_field;
 #[cfg(test)]
+mod enum_keyword_variant;
+#[cfg(test)]
 mod generic_derive;
 #[cfg(test)]
 mod message_encoding;