Fix error type name "Error" (#93)

Signed-off-by: Kristupas Antanavičius <[email protected]>

bindgen/templates/BigEndianStream.cs

@@ -5,7 +5,7 @@
 // Big endian streams are not yet available in dotnet :'(
 // https://github.com/dotnet/runtime/issues/26904
 
-class StreamUnderflowException: Exception {
+class StreamUnderflowException: System.Exception {
     public StreamUnderflowException() {
     }
 }

bindgen/templates/CallbackInterfaceTemplate.cs

@@ -60,7 +60,7 @@ private static int INSTANCE_FUNC(ulong handle, uint method, IntPtr argsData, int
                     outBuf = {{ method_name }}(cb, RustBuffer.MemoryStream(argsData, argsLength));
                     return UniffiCallbackResponseCode.SUCCESS;
                     {%- endmatch %}
-                } catch (Exception e) {
+                } catch (System.Exception e) {
                     // Unexpected error
                     try {
                         // Try to serialize the error into a string

bindgen/templates/Helpers.cs

@@ -24,7 +24,7 @@ public bool IsPanic() {
 }
 
 // Base class for all uniffi exceptions
-{{ config.access_modifier() }} class UniffiException: Exception {
+{{ config.access_modifier() }} class UniffiException: System.Exception {
     public UniffiException(): base() {}
     public UniffiException(string message): base(message) {}
 }
@@ -61,7 +61,7 @@ public UniffiContractChecksumException(string message): base(message) {
 }
 
 // Each top-level error class has a companion object that can lift the error from the call status's rust buffer
-interface CallStatusErrorHandler<E> where E: Exception {
+interface CallStatusErrorHandler<E> where E: System.Exception {
     E Lift(RustBuffer error_buf);
 }
 

dotnet-tests/UniffiCS.BindingTests/TestRegressions.cs

@@ -0,0 +1,16 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+using uniffi.issue_76;
+
+namespace UniffiCS.BindingTests;
+
+public class TestRegressions
+{
+    [Fact]
+    public void TestIssue76()
+    {
+        Assert.Throws<Exception.Example>(() => Issue76Methods.AlwaysError());
+    }
+}

fixtures/Cargo.toml

@@ -10,6 +10,7 @@ crate-type = ["cdylib", "lib"]
 
 [dependencies]
 global-methods-class-name = { path = "global-methods-class-name" }
+issue-76 = { path = "regressions/issue-76" }
 null-to-empty-string = { path = "null-to-empty-string" }
 uniffi-cs-custom-types-builtin = { path = "custom-types-builtin" }
 uniffi-cs-disposable-fixture = { path = "disposable" }

fixtures/regressions/issue-76/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+name = "issue-76"
+version = "1.0.0"
+edition = "2021"
+publish = false
+
+[lib]
+crate-type = ["lib", "cdylib"]
+name = "issue_76"
+
+[dependencies]
+uniffi = {path = "../../../3rd-party/uniffi-rs/uniffi", features=["build"]}
+uniffi_macros = {path = "../../../3rd-party/uniffi-rs/uniffi_macros"}
+thiserror = "1.0"
+
+[build-dependencies]
+uniffi = {path = "../../../3rd-party/uniffi-rs/uniffi", features=["bindgen-tests"]}

fixtures/regressions/issue-76/README.md

@@ -0,0 +1,3 @@
+# https://github.com/NordSecurity/uniffi-bindgen-cs/issues/76
+
+`Error` is translated into `Exception`, and causes ambiguous type references between `System.Exception` and `Exception`.

fixtures/regressions/issue-76/src/lib.rs

@@ -0,0 +1,16 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#[derive(Debug, thiserror::Error, uniffi::Error)]
+pub enum Error {
+    #[error("Example")]
+    Example,
+}
+
+#[uniffi::export]
+pub fn always_error() -> Result<(), Error> {
+    Err(Error::Example)
+}
+
+uniffi::setup_scaffolding!();

fixtures/src/lib.rs

@@ -23,4 +23,5 @@ mod uniffi_fixtures {
     uniffi_cs_disposable::uniffi_reexport_scaffolding!();
     uniffi_cs_optional_parameters::uniffi_reexport_scaffolding!();
     stringify::uniffi_reexport_scaffolding!();
+    issue_76::uniffi_reexport_scaffolding!();
 }