1 files changed, 7 insertions, 52 deletions
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/CallbackInterfaceRuntime.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/CallbackInterfaceRuntime.py
index 0fe2ab8dc0..d802c90fde 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/CallbackInterfaceRuntime.py
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/CallbackInterfaceRuntime.py
@@ -1,42 +1,3 @@
-import threading
-
-class ConcurrentHandleMap:
-    """
-    A map where inserting, getting and removing data is synchronized with a lock.
-    """
-
-    def __init__(self):
-        # type Handle = int
-        self._left_map = {}  # type: Dict[Handle, Any]
-        self._right_map = {}  # type: Dict[Any, Handle]
-
-        self._lock = threading.Lock()
-        self._current_handle = 0
-        self._stride = 1
-
-
-    def insert(self, obj):
-        with self._lock:
-            if obj in self._right_map:
-                return self._right_map[obj]
-            else:
-                handle = self._current_handle
-                self._current_handle += self._stride
-                self._left_map[handle] = obj
-                self._right_map[obj] = handle
-                return handle
-
-    def get(self, handle):
-        with self._lock:
-            return self._left_map.get(handle)
-
-    def remove(self, handle):
-        with self._lock:
-            if handle in self._left_map:
-                obj = self._left_map.pop(handle)
-                del self._right_map[obj]
-                return obj
-
 # Magic number for the Rust proxy to call using the same mechanism as every other method,
 # to free the callback once it's dropped by Rust.
 IDX_CALLBACK_FREE = 0
@@ -45,22 +6,12 @@ _UNIFFI_CALLBACK_SUCCESS = 0
 _UNIFFI_CALLBACK_ERROR = 1
 _UNIFFI_CALLBACK_UNEXPECTED_ERROR = 2
 
-class _UniffiConverterCallbackInterface:
-    _handle_map = ConcurrentHandleMap()
-
-    def __init__(self, cb):
-        self._foreign_callback = cb
-
-    def drop(self, handle):
-        self.__class__._handle_map.remove(handle)
+class UniffiCallbackInterfaceFfiConverter:
+    _handle_map = _UniffiHandleMap()
 
     @classmethod
     def lift(cls, handle):
-        obj = cls._handle_map.get(handle)
-        if not obj:
-            raise InternalError("The object in the handle map has been dropped already")
-
-        return obj
+        return cls._handle_map.get(handle)
 
     @classmethod
     def read(cls, buf):
@@ -68,6 +19,10 @@ class _UniffiConverterCallbackInterface:
         cls.lift(handle)
 
     @classmethod
+    def check_lower(cls, cb):
+        pass
+
+    @classmethod
     def lower(cls, cb):
         handle = cls._handle_map.insert(cb)
         return handle