Merge remote-tracking branch 'origin/rust' into open-source

Author: Benjamin Gill

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Rust2Codegen.java

@@ -275,7 +275,10 @@ public String toApiName(String name) {
      */
     @Override
     public String escapeReservedWord(String name) {
-        return "_" + name;  // add an underscore to the name
+        if (this.reservedWordsMappings().containsKey(name)) {
+            return this.reservedWordsMappings().get(name);
+        }
+        return "_" + name; // add an underscore to the name
     }
 
     /**
@@ -312,7 +315,8 @@ else if (name.matches("^\\d.*")) {
 
     @Override
     public String toParamName(String name) {
-        return underscore(super.toParamName(name));
+        // should be the same as variable name (stolen from RubyClientCodegen)
+        return toVarName(name);
     }
 
     @Override