Don't use serde_derive hack in rls-* crates

Author: Xanewok

Cargo.lock

@@ -21,7 +21,7 @@ test = false
 path = "rls/src/main.rs"
 
 [dependencies]
-rls-analysis = "0.18.0"
+rls-analysis = "0.18.1"
 rls-data = "0.19"
 # FIXME: Release rls-rustc 0.6.0 to crates.io
 rls-rustc = { version = "0.6.0", path = "rls-rustc" }

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rls-data"
-version = "0.19.0"
+version = "0.19.1"
 edition = "2018"
 authors = ["Nick Cameron <[email protected]>"]
 description = "Data structures used by the RLS and Rust compiler"
@@ -11,8 +11,7 @@ categories = ["development-tools"]
 [dependencies]
 rls-span = "0.5.0"
 serde = "1.0"
-serde_derive = { version = "1.0", optional = true }
 
 [features]
-default = []
-derive = ["serde_derive",  "rls-span/derive"]
+default = ["derive"]
+derive = ["serde/derive",  "rls-span/derive"]

rls-data/Cargo.toml

@@ -1,3 +1,6 @@
+#[cfg(feature = "derive")]
+use serde::{Deserialize, Serialize};
+
 /// Used to configure save-analysis.
 #[derive(Debug, Clone, Default)]
 #[cfg_attr(feature = "derive", derive(Serialize, Deserialize))]

rls-data/src/config.rs

@@ -1,14 +1,11 @@
 use rls_span as span;
 
+use std::path::PathBuf;
+
 #[cfg(feature = "derive")]
-#[macro_use]
-extern crate serde_derive;
+use serde::{Deserialize, Serialize};
 
 pub mod config;
-mod serde_expanded;
-
-use std::path::PathBuf;
-
 pub use config::Config;
 
 #[derive(Debug, Clone, Default)]
@@ -273,73 +270,3 @@ pub struct SigElement {
     pub start: usize,
     pub end: usize,
 }
-
-// Following macros are copied from the `static-assertions` library:
-// https://github.com/nvzqz/static-assertions-rs/blob/9f0f8aa871390f74f2afcdba53c1e02db90b2d17/src/assert_impl.rs
-#[macro_export(local_inner_macros)]
-macro_rules! assert_impl {
-    ($($xs:tt)+) => { _assert_impl!($($xs)+); };
-}
-
-#[doc(hidden)]
-#[macro_export(local_inner_macros)]
-macro_rules! _assert_impl {
-    ($x:ty, $($t:path),+ $(,)*) => {
-        {
-            fn assert_impl<'hidden, T>() where T: ?Sized $(+ $t)+ {}
-            assert_impl::<$x>();
-        }
-    };
-    ($label:ident; $($xs:tt)+) => {
-        #[allow(dead_code, non_snake_case)]
-        fn $label() { assert_impl!($($xs)+); }
-    };
-}
-
-#[doc(hidden)]
-macro_rules! assert_serde {
-    ($($typ:path),* $(,)*) => {
-        $( assert_impl!($typ, Serialize, Deserialize<'hidden>); )*
-    };
-}
-
-/// Since we manually provide impls in `cfg(not(feature = "derive"))`, it's good
-/// to ensure that the types actually implement all the required traits.
-#[doc(hidden)]
-fn _assertions() {
-    use serde::{Deserialize, Serialize};
-
-    assert_serde!(
-        // rls-data
-        Analysis,
-        Id,
-        GlobalCrateId,
-        SpanData,
-        CompilationOptions,
-        CratePreludeData,
-        ExternalCrateData,
-        Import,
-        Def,
-        Impl,
-        Attribute,
-        Ref,
-        MacroRef,
-        Relation,
-        Signature,
-        SigElement,
-        Config,
-        // rls-span
-        span::Column<span::ZeroIndexed>,
-        span::Location<span::ZeroIndexed>,
-        span::Position<span::ZeroIndexed>,
-        span::Range<span::ZeroIndexed>,
-        span::Row<span::ZeroIndexed>,
-        span::Span<span::ZeroIndexed>,
-        span::Column<span::OneIndexed>,
-        span::Location<span::OneIndexed>,
-        span::Position<span::OneIndexed>,
-        span::Range<span::OneIndexed>,
-        span::Row<span::OneIndexed>,
-        span::Span<span::OneIndexed>,
-    );
-}