Remove function from shared API

wayland-backend/src/client_api.rs

@@ -11,8 +11,6 @@ use std::{
 #[cfg(doc)]
 use std::io::ErrorKind::WouldBlock;
 
-use wayland_sys::client::wl_proxy;
-
 use crate::protocol::{Interface, Message, ObjectInfo};
 
 use super::client_impl;
@@ -288,24 +286,6 @@ impl Backend {
     pub fn dispatch_inner_queue(&self) -> Result<usize, WaylandError> {
         self.backend.dispatch_inner_queue()
     }
-
-    /// Take over handling for a proxy created by a third party.
-    ///
-    /// Returns `None` on the Rust backend.
-    ///
-    /// # Safety
-    ///
-    /// There must never be more than one party managing an object. This is only
-    /// safe to call when a third party is transferring ownership of the proxy.
-    #[inline]
-    pub unsafe fn manage_object(
-        &self,
-        interface: &'static Interface,
-        proxy: *mut wl_proxy,
-        data: Option<Arc<dyn ObjectData>>,
-    ) -> Option<ObjectId> {
-        unsafe { self.backend.manage_object(interface, proxy, data) }
-    }
 }
 
 /// Guard for synchronizing event reading across multiple threads

wayland-backend/src/rs/client_impl/mod.rs

@@ -19,7 +19,6 @@ use crate::{
     },
 };
 use smallvec::SmallVec;
-use wayland_sys::client::wl_proxy;
 
 use super::{
     client::*,
@@ -511,16 +510,6 @@ impl InnerBackend {
     pub fn dispatch_inner_queue(&self) -> Result<usize, WaylandError> {
         Ok(0)
     }
-
-    // Importing external objects is only possible with the system backend.
-    pub unsafe fn manage_object(
-        &self,
-        _interface: &'static Interface,
-        _proxy: *mut wl_proxy,
-        _data: Option<Arc<dyn ObjectData>>,
-    ) -> Option<ObjectId> {
-        None
-    }
 }
 
 impl ProtocolState {

wayland-backend/src/sys/client_impl/mod.rs

@@ -691,7 +691,7 @@ impl InnerBackend {
         // initialize the proxy
         let child_id = if let Some((child_interface, _)) = child_spec {
             drop(guard);
-            unsafe { self.manage_object(&child_interface, ret, data).unwrap() }
+            unsafe { self.manage_object(&child_interface, ret, data) }
         } else {
             Self::null_id()
         };
@@ -775,7 +775,7 @@ impl InnerBackend {
         interface: &'static Interface,
         proxy: *mut wl_proxy,
         data: Option<Arc<dyn ObjectData>>,
-    ) -> Option<ObjectId> {
+    ) -> ObjectId {
         let mut guard = self.lock_state();
 
         let alive = Arc::new(AtomicBool::new(true));
@@ -813,7 +813,7 @@ impl InnerBackend {
             );
         }
 
-        Some(object_id)
+        object_id
     }
 }
 

wayland-backend/src/sys/mod.rs

@@ -1,8 +1,13 @@
 //! Implementations of the Wayland backends using the system `libwayland`
 
-use crate::protocol::ArgumentType;
+use std::sync::Arc;
+
+use wayland_sys::client::wl_proxy;
 use wayland_sys::common::{wl_argument, wl_array};
 
+use crate::client::{ObjectData, ObjectId};
+use crate::protocol::{ArgumentType, Interface};
+
 #[cfg(any(test, feature = "client_system"))]
 mod client_impl;
 #[cfg(any(test, feature = "server_system"))]
@@ -90,6 +95,22 @@ impl client::Backend {
     pub fn display_ptr(&self) -> *mut wayland_sys::client::wl_display {
         self.backend.display_ptr()
     }
+
+    /// Take over handling for a proxy created by a third party.
+    ///
+    /// # Safety
+    ///
+    /// There must never be more than one party managing an object. This is only
+    /// safe to call when a third party is transferring ownership of the proxy.
+    #[inline]
+    pub unsafe fn manage_object(
+        &self,
+        interface: &'static Interface,
+        proxy: *mut wl_proxy,
+        data: Option<Arc<dyn ObjectData>>,
+    ) -> ObjectId {
+        unsafe { self.backend.manage_object(interface, proxy, data) }
+    }
 }
 
 // SAFETY: