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 https://github.com/rust-lang/rust/issues/79202

Co-authored-by: kjeremy <kjeremy@gmail.com>
Co-authored-by: Peter Wischer <peter.wischer@lwl.org>

Cargo.lock

@@ -791,9 +791,9 @@ checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c"
 
 [[package]]
 name = "libloading"
-version = "0.6.7"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883"
+checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a"
 dependencies = [
  "cfg-if",
  "winapi",
@@ -1841,9 +1841,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.16"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606"
+checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef"
 dependencies = [
  "tinyvec",
 ]

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" }

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 {

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,

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: