aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkjeremy <[email protected]>2021-02-11 15:07:49 +0000
committerkjeremy <[email protected]>2021-02-11 15:07:49 +0000
commit61092bd900bc2f117ecf436c182eeec57072a1df (patch)
tree9ef49c32bcf1565b39ec624cf92624530f52ca5c
parentb0f20a795d6b1f8d36d1cbe294e54ac592b98f5e (diff)
libloading 0.7
See https://docs.rs/libloading/0.7.0/libloading/changelog/r0_7_0/index.html
-rw-r--r--Cargo.lock8
-rw-r--r--crates/proc_macro_srv/Cargo.toml2
-rw-r--r--crates/proc_macro_srv/src/dylib.rs4
3 files changed, 7 insertions, 7 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 25f312faf..99b7ccf69 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -791,9 +791,9 @@ checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c"
791 791
792[[package]] 792[[package]]
793name = "libloading" 793name = "libloading"
794version = "0.6.7" 794version = "0.7.0"
795source = "registry+https://github.com/rust-lang/crates.io-index" 795source = "registry+https://github.com/rust-lang/crates.io-index"
796checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883" 796checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a"
797dependencies = [ 797dependencies = [
798 "cfg-if", 798 "cfg-if",
799 "winapi", 799 "winapi",
@@ -1841,9 +1841,9 @@ dependencies = [
1841 1841
1842[[package]] 1842[[package]]
1843name = "unicode-normalization" 1843name = "unicode-normalization"
1844version = "0.1.16" 1844version = "0.1.17"
1845source = "registry+https://github.com/rust-lang/crates.io-index" 1845source = "registry+https://github.com/rust-lang/crates.io-index"
1846checksum = "a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606" 1846checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef"
1847dependencies = [ 1847dependencies = [
1848 "tinyvec", 1848 "tinyvec",
1849] 1849]
diff --git a/crates/proc_macro_srv/Cargo.toml b/crates/proc_macro_srv/Cargo.toml
index 208489e0d..6c8c28980 100644
--- a/crates/proc_macro_srv/Cargo.toml
+++ b/crates/proc_macro_srv/Cargo.toml
@@ -11,7 +11,7 @@ doctest = false
11 11
12[dependencies] 12[dependencies]
13object = { version = "0.23", default-features = false, features = ["std", "read_core", "elf", "macho", "pe"] } 13object = { version = "0.23", default-features = false, features = ["std", "read_core", "elf", "macho", "pe"] }
14libloading = "0.6.0" 14libloading = "0.7.0"
15memmap2 = "0.2.0" 15memmap2 = "0.2.0"
16 16
17tt = { path = "../tt", version = "0.0.0" } 17tt = { path = "../tt", version = "0.0.0" }
diff --git a/crates/proc_macro_srv/src/dylib.rs b/crates/proc_macro_srv/src/dylib.rs
index 00fcc7bdf..28a6ee547 100644
--- a/crates/proc_macro_srv/src/dylib.rs
+++ b/crates/proc_macro_srv/src/dylib.rs
@@ -60,7 +60,7 @@ fn find_registrar_symbol(file: &Path) -> io::Result<Option<String>> {
60/// It seems that on Windows that behaviour is default, so we do nothing in that case. 60/// It seems that on Windows that behaviour is default, so we do nothing in that case.
61#[cfg(windows)] 61#[cfg(windows)]
62fn load_library(file: &Path) -> Result<Library, libloading::Error> { 62fn load_library(file: &Path) -> Result<Library, libloading::Error> {
63 Library::new(file) 63 unsafe { Library::new(file) }
64} 64}
65 65
66#[cfg(unix)] 66#[cfg(unix)]
@@ -71,7 +71,7 @@ fn load_library(file: &Path) -> Result<Library, libloading::Error> {
71 const RTLD_NOW: c_int = 0x00002; 71 const RTLD_NOW: c_int = 0x00002;
72 const RTLD_DEEPBIND: c_int = 0x00008; 72 const RTLD_DEEPBIND: c_int = 0x00008;
73 73
74 UnixLibrary::open(Some(file), RTLD_NOW | RTLD_DEEPBIND).map(|lib| lib.into()) 74 unsafe { UnixLibrary::open(Some(file), RTLD_NOW | RTLD_DEEPBIND).map(|lib| lib.into()) }
75} 75}
76 76
77struct ProcMacroLibraryLibloading { 77struct ProcMacroLibraryLibloading {