Use lower camel case names for error types in Swift bindings

Author: crazytonyli

fixtures/error-types/tests/bindings/test.swift

@@ -22,76 +22,76 @@ do {
     try oopsEnum(i: 0)
     fatalError("Should have thrown")
 } catch let e as Error {
-    assert(e == Error.Oops)
-    assert(String(describing: e) == "Oops")
-    assert(String(reflecting: e) == "error_types.Error.Oops")
+    assert(e == Error.oops)
+    assert(String(describing: e) == "oops")
+    assert(String(reflecting: e) == "error_types.Error.oops")
 }
 do {
     try oopsEnum(i: 0)
     fatalError("Should have thrown")
 } catch {
-    assert(String(describing: error) == "Oops")
-    assert(String(reflecting: error) == "error_types.Error.Oops")
-    assert(error.localizedDescription == "error_types.Error.Oops")
+    assert(String(describing: error) == "oops")
+    assert(String(reflecting: error) == "error_types.Error.oops")
+    assert(error.localizedDescription == "error_types.Error.oops")
 }
 
 do {
     try oopsEnum(i: 1)
     fatalError("Should have thrown")
 } catch {
-    assert(String(describing: error) == "Value(value: \"value\")")
-    assert(String(reflecting: error) == "error_types.Error.Value(value: \"value\")")
-    assert(error.localizedDescription == "error_types.Error.Value(value: \"value\")")
+    assert(String(describing: error) == "value(value: \"value\")")
+    assert(String(reflecting: error) == "error_types.Error.value(value: \"value\")")
+    assert(error.localizedDescription == "error_types.Error.value(value: \"value\")")
 }
 
 do {
     try oopsEnum(i: 2)
     fatalError("Should have thrown")
 } catch {
-    assert(String(describing: error) == "IntValue(value: 2)")
-    assert(String(reflecting: error) == "error_types.Error.IntValue(value: 2)")
-    assert(error.localizedDescription == "error_types.Error.IntValue(value: 2)")
+    assert(String(describing: error) == "intValue(value: 2)")
+    assert(String(reflecting: error) == "error_types.Error.intValue(value: 2)")
+    assert(error.localizedDescription == "error_types.Error.intValue(value: 2)")
 }
 
 do {
     try oopsEnum(i: 3)
     fatalError("Should have thrown")
 } catch let e as Error {
-    assert(String(describing: e) == "FlatInnerError(error: error_types.FlatInner.CaseA(message: \"inner\"))")
-    assert(String(reflecting: e) == "error_types.Error.FlatInnerError(error: error_types.FlatInner.CaseA(message: \"inner\"))")
+    assert(String(describing: e) == "flatInnerError(error: error_types.FlatInner.caseA(message: \"inner\"))")
+    assert(String(reflecting: e) == "error_types.Error.flatInnerError(error: error_types.FlatInner.caseA(message: \"inner\"))")
 }
 
 do {
     try oopsEnum(i: 4)
     fatalError("Should have thrown")
 } catch let e as Error {
-    assert(String(describing: e) == "FlatInnerError(error: error_types.FlatInner.CaseB(message: \"NonUniffiTypeValue: value\"))")
-    assert(String(reflecting: e) == "error_types.Error.FlatInnerError(error: error_types.FlatInner.CaseB(message: \"NonUniffiTypeValue: value\"))")
+    assert(String(describing: e) == "flatInnerError(error: error_types.FlatInner.caseB(message: \"NonUniffiTypeValue: value\"))")
+    assert(String(reflecting: e) == "error_types.Error.flatInnerError(error: error_types.FlatInner.caseB(message: \"NonUniffiTypeValue: value\"))")
 }
 
 do {
     try oopsEnum(i: 5)
     fatalError("Should have thrown")
 } catch let e as Error {
-    assert(String(describing: e) == "InnerError(error: error_types.Inner.CaseA(\"inner\"))")
+    assert(String(describing: e) == "innerError(error: error_types.Inner.caseA(\"inner\"))")
 }
 
 do {
     try oopsTuple(i: 0)
     fatalError("Should have thrown")
 } catch {
-    assert(String(describing: error) == "Oops(\"oops\")")
-    assert(String(reflecting: error) == "error_types.TupleError.Oops(\"oops\")")
-    assert(error.localizedDescription == "error_types.TupleError.Oops(\"oops\")")
+    assert(String(describing: error) == "oops(\"oops\")")
+    assert(String(reflecting: error) == "error_types.TupleError.oops(\"oops\")")
+    assert(error.localizedDescription == "error_types.TupleError.oops(\"oops\")")
 }
 
 do {
     try oopsTuple(i: 1)
     fatalError("Should have thrown")
 } catch {
-    assert(String(describing: error) == "Value(1)")
-    assert(String(reflecting: error) == "error_types.TupleError.Value(1)")
-    assert(error.localizedDescription == "error_types.TupleError.Value(1)")
+    assert(String(describing: error) == "value(1)")
+    assert(String(reflecting: error) == "error_types.TupleError.value(1)")
+    assert(error.localizedDescription == "error_types.TupleError.value(1)")
 }
 
 do {

uniffi_bindgen/src/bindings/swift/gen_swift/mod.rs

@@ -748,9 +748,9 @@ pub mod filters {
         Ok(quote_general_keyword(oracle().enum_variant_name(nm)))
     }
 
-    /// Like enum_variant_swift_quoted, but a class name.
+    /// Same as enum_variant_swift_quoted, because error types are exported as Swift enums.
     pub fn error_variant_swift_quoted(nm: &str) -> Result<String, rinja::Error> {
-        Ok(quote_general_keyword(oracle().class_name(nm)))
+        Ok(quote_general_keyword(oracle().enum_variant_name(nm)))
     }
 
     /// Get the idiomatic Swift rendering of an FFI callback function name

uniffi_bindgen/src/bindings/swift/templates/ErrorTemplate.swift

@@ -4,13 +4,13 @@ public enum {{ type_name }} {
     {% if e.is_flat() %}
     {% for variant in e.variants() %}
     {%- call swift::docstring(variant, 4) %}
-    case {{ variant.name()|class_name }}(message: String)
+    case {{ variant.name()|error_variant_swift_quoted }}(message: String)
     {% endfor %}
 
     {%- else %}
     {% for variant in e.variants() %}
     {%- call swift::docstring(variant, 4) %}
-    case {{ variant.name()|class_name }}{% if variant.fields().len() > 0 %}(
+    case {{ variant.name()|error_variant_swift_quoted }}{% if variant.fields().len() > 0 %}(
         {%- call swift::field_list_decl(variant, variant.has_nameless_fields()) %}
     ){% endif -%}
     {% endfor %}
@@ -32,7 +32,7 @@ public struct {{ ffi_converter_name }}: FfiConverterRustBuffer {
         {% if e.is_flat() %}
 
         {% for variant in e.variants() %}
-        case {{ loop.index }}: return .{{ variant.name()|class_name }}(
+        case {{ loop.index }}: return .{{ variant.name()|error_variant_swift_quoted }}(
             message: try {{ Type::String.borrow()|read_fn }}(from: &buf)
         )
         {% endfor %}
@@ -63,7 +63,7 @@ public struct {{ ffi_converter_name }}: FfiConverterRustBuffer {
         {% if e.is_flat() %}
 
         {% for variant in e.variants() %}
-        case .{{ variant.name()|class_name }}(_ /* message is ignored*/):
+        case .{{ variant.name()|error_variant_swift_quoted }}(_ /* message is ignored*/):
             writeInt(&buf, Int32({{ loop.index }}))
         {%- endfor %}
 
@@ -77,7 +77,7 @@ public struct {{ ffi_converter_name }}: FfiConverterRustBuffer {
             {{ field|write_fn }}({% call swift::field_name(field, loop.index) %}, into: &buf)
             {% endfor -%}
         {% else %}
-        case .{{ variant.name()|class_name }}:
+        case .{{ variant.name()|error_variant_swift_quoted }}:
             writeInt(&buf, Int32({{ loop.index }}))
         {% endif %}
         {%- endfor %}