Merge #7638 #7648

7638: libloading 0.7 r=kjeremy a=kjeremy See https://docs.rs/libloading/0.7.0/libloading/changelog/r0_7_0/index.html 7648: fix nightly warning `legacy_derive_helpers` r=lnicola a=peddermaster2 With a recent nightly (e.g. 2021-02-10) a warning comes up. This PR reorders the attributes to fix the warning. See rust-lang/rust#79202 Co-authored-by: kjeremy <[email protected]> Co-authored-by: Peter Wischer <[email protected]>
rust-lang · Feb 12, 2021 · a044ac9 · a044ac9
3 parents e0fc2af + 61092bd + f18fc5a
commit a044ac9
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/proc_macro_srv/Cargo.toml b/crates/proc_macro_srv/Cargo.toml
@@ -11,7 +11,7 @@ doctest = false
 
 [dependencies]
 object = { version = "0.23", default-features = false, features = ["std", "read_core", "elf", "macho", "pe"] }
-libloading = "0.6.0"
+libloading = "0.7.0"
 memmap2 = "0.2.0"
 
 tt = { path = "../tt", version = "0.0.0" }

diff --git 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>> {
 /// It seems that on Windows that behaviour is default, so we do nothing in that case.
 #[cfg(windows)]
 fn load_library(file: &Path) -> Result<Library, libloading::Error> {
-    Library::new(file)
+    unsafe { Library::new(file) }
 }
 
 #[cfg(unix)]
@@ -71,7 +71,7 @@ fn load_library(file: &Path) -> Result<Library, libloading::Error> {
     const RTLD_NOW: c_int = 0x00002;
     const RTLD_DEEPBIND: c_int = 0x00008;
 
-    UnixLibrary::open(Some(file), RTLD_NOW | RTLD_DEEPBIND).map(|lib| lib.into())
+    unsafe { UnixLibrary::open(Some(file), RTLD_NOW | RTLD_DEEPBIND).map(|lib| lib.into()) }
 }
 
 struct ProcMacroLibraryLibloading {

diff --git a/crates/rust-analyzer/src/lsp_ext.rs b/crates/rust-analyzer/src/lsp_ext.rs
@@ -230,8 +230,8 @@ pub struct SsrParams {
 
 pub enum StatusNotification {}
 
-#[serde(rename_all = "camelCase")]
 #[derive(Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
 pub enum Status {
     Loading,
     ReadyPartial,

diff --git a/docs/dev/lsp-extensions.md b/docs/dev/lsp-extensions.md
@@ -1,5 +1,5 @@
 <!---
-lsp_ext.rs hash: 7609fd6d7b4ab231
+lsp_ext.rs hash: 8f1ae8530f69e3a3
 
 If you need to change the above hash to make the test pass, please check if you
 need to adjust this doc as well and ping this  issue: