Update libloading (#1355)

rust-windowing · May 21, 2021 · c080390 · c080390
1 parent 080ffa5
commit c080390
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/glutin/Cargo.toml b/glutin/Cargo.toml
@@ -50,7 +50,7 @@ features = [
 ]
 
 [target.'cfg(target_os = "windows")'.dependencies]
-libloading = "0.6.1"
+libloading = "0.7"
 glutin_wgl_sys = { version = "0.1.4", path = "../glutin_wgl_sys" }
 glutin_egl_sys = { version = "0.1.4", path = "../glutin_egl_sys" }
 parking_lot = "0.11"
@@ -59,7 +59,7 @@ parking_lot = "0.11"
 osmesa-sys = "0.1"
 wayland-client = { version = "0.28", features = ["dlopen"], optional = true }
 wayland-egl = { version = "0.28", optional = true }
-libloading = "0.6.1"
+libloading = "0.7"
 glutin_egl_sys = { version = "0.1.4", path = "../glutin_egl_sys" }
 glutin_glx_sys = { version = "0.1.6", path = "../glutin_glx_sys", optional = true }
 parking_lot = "0.11"

diff --git a/glutin/src/api/dlloader.rs b/glutin/src/api/dlloader.rs
@@ -33,11 +33,13 @@ impl<T: SymTrait> SymWrapper<T> {
         for path in lib_paths {
             // Avoid loading from PATH
             #[cfg(target_os = "windows")]
-            let lib = windows::Library::load_with_flags(path, LOAD_LIBRARY_SEARCH_DEFAULT_DIRS)
-                .map(From::from);
+            let lib = unsafe {
+                windows::Library::load_with_flags(path, LOAD_LIBRARY_SEARCH_DEFAULT_DIRS)
+                    .map(From::from)
+            };
 
             #[cfg(not(target_os = "windows"))]
-            let lib = Library::new(path);
+            let lib = unsafe { Library::new(path) };
 
             if lib.is_ok() {
                 return Ok(SymWrapper {