forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adapt path type of dynamically_load_plugin (#6734)

Browse Source 
# Objective

- Fixes #6711

## Solution

- Change the `path` function parameter of `dynamically_load_plugin` and `DynamicPluginExt::load_plugin` to a generic with `AsRef<OsStr>` bound
This commit is contained in:
polygon 2022-12-05 23:39:43 +00:00
parent f9ad051e61
commit 9f0c41f26d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crates/bevy_dynamic_plugin/src/loader.rs
View File

@ -1,4 +1,5 @@
use libloading::{Library, Symbol}; use libloading::{Library, Symbol};
use std::ffi::OsStr;
use thiserror::Error; use thiserror::Error;
use bevy_app::{App, CreatePlugin, Plugin}; use bevy_app::{App, CreatePlugin, Plugin};
@ -20,8 +21,8 @@ pub enum DynamicPluginLoadError {
/// The specified plugin must be linked against the exact same libbevy.so as this program. /// The specified plugin must be linked against the exact same libbevy.so as this program.
/// In addition the `_bevy_create_plugin` symbol must not be manually created, but instead created /// In addition the `_bevy_create_plugin` symbol must not be manually created, but instead created
/// by deriving `DynamicPlugin` on a unit struct implementing [`Plugin`]. /// by deriving `DynamicPlugin` on a unit struct implementing [`Plugin`].
pub unsafe fn dynamically_load_plugin( pub unsafe fn dynamically_load_plugin<P: AsRef<OsStr>>(
path: &str, path: P,
) -> Result<(Library, Box<dyn Plugin>), DynamicPluginLoadError> { ) -> Result<(Library, Box<dyn Plugin>), DynamicPluginLoadError> {
let lib = Library::new(path).map_err(DynamicPluginLoadError::Library)?; let lib = Library::new(path).map_err(DynamicPluginLoadError::Library)?;
let func: Symbol<CreatePlugin> = lib let func: Symbol<CreatePlugin> = lib
@ -35,11 +36,11 @@ pub trait DynamicPluginExt {
/// # Safety /// # Safety
/// ///
/// Same as [`dynamically_load_plugin`]. /// Same as [`dynamically_load_plugin`].
unsafe fn load_plugin(&mut self, path: &str) -> &mut Self; unsafe fn load_plugin<P: AsRef<OsStr>>(&mut self, path: P) -> &mut Self;
} }
impl DynamicPluginExt for App { impl DynamicPluginExt for App {
unsafe fn load_plugin(&mut self, path: &str) -> &mut Self { unsafe fn load_plugin<P: AsRef<OsStr>>(&mut self, path: P) -> &mut Self {
let (lib, plugin) = dynamically_load_plugin(path).unwrap(); let (lib, plugin) = dynamically_load_plugin(path).unwrap();
std::mem::forget(lib); // Ensure that the library is not automatically unloaded std::mem::forget(lib); // Ensure that the library is not automatically unloaded
plugin.build(self); plugin.build(self);