Fix docs, and improve implementation of SinglePluginFactory to not re…

…quire unsafe impls for Send/Sync
prokopyl · Nov 29, 2023 · 905a8a3 · 905a8a3
1 parent ae051dc
commit 905a8a3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/plugin/src/entry/single.rs b/plugin/src/entry/single.rs
@@ -51,12 +51,9 @@ impl<P: Plugin> Entry for SinglePluginEntry<P> {
 
 struct SinglePluginFactory<P> {
     descriptor: PluginDescriptorWrapper,
-    _plugin: PhantomData<P>,
+    _plugin: PhantomData<fn() -> P>,
 }
 
-unsafe impl<P> Send for SinglePluginFactory<P> {}
-unsafe impl<P> Sync for SinglePluginFactory<P> {}
-
 impl<P: Plugin> PluginFactory for SinglePluginFactory<P> {
     #[inline]
     fn plugin_count(&self) -> u32 {

diff --git a/plugin/src/plugin/instance.rs b/plugin/src/plugin/instance.rs
@@ -160,7 +160,7 @@ impl<'a, P: Plugin> PluginBoxInner<'a, P> {
 /// [`PluginFactory::instantiate_plugin`](crate::factory::plugin::PluginFactory::instantiate_plugin) method.
 pub struct PluginInstance<'a> {
     inner: Box<clap_plugin>,
-    lifetime: PhantomData<&'a clap_plugin>,
+    lifetime: PhantomData<&'a clap_plugin_descriptor>,
 }
 
 impl<'a> PluginInstance<'a> {