Bug 1918093: Inline derive_common crate into style_derive (r=emilio)

Signed-off-by: Nico Burns <nico@nicoburns.com>

Differential Revision: https://phabricator.services.mozilla.com/D221816

servo/components/derive_common/Cargo.toml

@@ -1,17 +0,0 @@
-[package]
-name = "derive_common"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2021"
-publish = false
-
-[lib]
-path = "lib.rs"
-
-[dependencies]
-darling = { version = "0.20", default-features = false }
-proc-macro2 = "1"
-quote = "1"
-syn = { version = "2", default-features = false, features = ["clone-impls", "parsing"] }
-synstructure = "0.13"

servo/components/derive_common/lib.rs

@@ -1,5 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-pub mod cg;

servo/components/style_derive/Cargo.toml

@@ -11,7 +11,6 @@ proc-macro = true
 
 [dependencies]
 darling = { version = "0.20", default-features = false }
-derive_common = { path = "../derive_common" }
 proc-macro2 = "1"
 quote = "1"
 syn = { version = "2", default-features = false, features = ["clone-impls", "derive", "parsing"] }

servo/components/style_derive/animate.rs

@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use darling::util::PathList;
-use derive_common::cg;
+use crate::cg;
 use proc_macro2::TokenStream;
 use quote::TokenStreamExt;
 use syn::{DeriveInput, WhereClause};

servo/components/style_derive/cg.rs

@@ -32,7 +32,7 @@ use synstructure::{self, BindStyle, BindingInfo, VariantAst, VariantInfo};
 /// ```
 ///
 /// This needs to run before adding other bounds to the type parameters.
-pub fn propagate_clauses_to_output_type(
+pub(crate) fn propagate_clauses_to_output_type(
     where_clause: &mut Option<syn::WhereClause>,
     generics: &syn::Generics,
     trait_path: &Path,
@@ -79,21 +79,21 @@ pub fn propagate_clauses_to_output_type(
     }
 }
 
-pub fn add_predicate(where_clause: &mut Option<syn::WhereClause>, pred: WherePredicate) {
+pub(crate) fn add_predicate(where_clause: &mut Option<syn::WhereClause>, pred: WherePredicate) {
     where_clause
         .get_or_insert(parse_quote!(where))
         .predicates
         .push(pred);
 }
 
-pub fn fmap_match<F>(input: &DeriveInput, bind_style: BindStyle, f: F) -> TokenStream
+pub(crate) fn fmap_match<F>(input: &DeriveInput, bind_style: BindStyle, f: F) -> TokenStream
 where
     F: FnMut(&BindingInfo) -> TokenStream,
 {
     fmap2_match(input, bind_style, f, |_| None)
 }
 
-pub fn fmap2_match<F, G>(
+pub(crate) fn fmap2_match<F, G>(
     input: &DeriveInput,
     bind_style: BindStyle,
     mut f: F,
@@ -128,7 +128,11 @@ where
     })
 }
 
-pub fn fmap_trait_output(input: &DeriveInput, trait_path: &Path, trait_output: &Ident) -> Path {
+pub(crate) fn fmap_trait_output(
+    input: &DeriveInput,
+    trait_path: &Path,
+    trait_output: &Ident,
+) -> Path {
     let segment = PathSegment {
         ident: input.ident.clone(),
         arguments: PathArguments::AngleBracketed(AngleBracketedGenericArguments {
@@ -158,7 +162,12 @@ pub fn fmap_trait_output(input: &DeriveInput, trait_path: &Path, trait_output: &
     segment.into()
 }
 
-pub fn map_type_params<F>(ty: &Type, params: &[&TypeParam], self_type: &Path, f: &mut F) -> Type
+pub(crate) fn map_type_params<F>(
+    ty: &Type,
+    params: &[&TypeParam],
+    self_type: &Path,
+    f: &mut F,
+) -> Type
 where
     F: FnMut(&Ident) -> Type,
 {
@@ -289,7 +298,7 @@ fn path_to_ident(path: &Path) -> Option<&Ident> {
     }
 }
 
-pub fn parse_field_attrs<A>(field: &Field) -> A
+pub(crate) fn parse_field_attrs<A>(field: &Field) -> A
 where
     A: FromField,
 {
@@ -299,7 +308,7 @@ where
     }
 }
 
-pub fn parse_input_attrs<A>(input: &DeriveInput) -> A
+pub(crate) fn parse_input_attrs<A>(input: &DeriveInput) -> A
 where
     A: FromDeriveInput,
 {
@@ -309,7 +318,7 @@ where
     }
 }
 
-pub fn parse_variant_attrs_from_ast<A>(variant: &VariantAst) -> A
+pub(crate) fn parse_variant_attrs_from_ast<A>(variant: &VariantAst) -> A
 where
     A: FromVariant,
 {
@@ -322,7 +331,7 @@ where
     parse_variant_attrs(&v)
 }
 
-pub fn parse_variant_attrs<A>(variant: &Variant) -> A
+pub(crate) fn parse_variant_attrs<A>(variant: &Variant) -> A
 where
     A: FromVariant,
 {
@@ -332,7 +341,7 @@ where
     }
 }
 
-pub fn ref_pattern<'a>(
+pub(crate) fn ref_pattern<'a>(
     variant: &'a VariantInfo,
     prefix: &str,
 ) -> (TokenStream, Vec<BindingInfo<'a>>) {
@@ -344,7 +353,10 @@ pub fn ref_pattern<'a>(
     (v.pat(), v.bindings().to_vec())
 }
 
-pub fn value<'a>(variant: &'a VariantInfo, prefix: &str) -> (TokenStream, Vec<BindingInfo<'a>>) {
+pub(crate) fn value<'a>(
+    variant: &'a VariantInfo,
+    prefix: &str,
+) -> (TokenStream, Vec<BindingInfo<'a>>) {
     let mut v = variant.clone();
     v.bindings_mut().iter_mut().for_each(|b| {
         b.binding = Ident::new(&format!("{}_{}", b.binding, prefix), Span::call_site())
@@ -357,7 +369,7 @@ pub fn value<'a>(variant: &'a VariantInfo, prefix: &str) -> (TokenStream, Vec<Bi
 ///
 /// If the first Camel segment is "Moz", "Webkit", or "Servo", the result string
 /// is prepended with "-".
-pub fn to_css_identifier(mut camel_case: &str) -> String {
+pub(crate) fn to_css_identifier(mut camel_case: &str) -> String {
     camel_case = camel_case.trim_end_matches('_');
     let mut first = true;
     let mut result = String::with_capacity(camel_case.len());
@@ -378,7 +390,7 @@ pub fn to_css_identifier(mut camel_case: &str) -> String {
 }
 
 /// Transforms foo-bar to FOO_BAR.
-pub fn to_scream_case(css_case: &str) -> String {
+pub(crate) fn to_scream_case(css_case: &str) -> String {
     css_case.to_uppercase().replace('-', "_")
 }
 

servo/components/style_derive/compute_squared_distance.rs

@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use crate::animate::{AnimationFieldAttrs, AnimationInputAttrs, AnimationVariantAttrs};
-use derive_common::cg;
+use crate::cg;
 use proc_macro2::TokenStream;
 use quote::TokenStreamExt;
 use syn::{DeriveInput, WhereClause};

servo/components/style_derive/lib.rs

@@ -6,7 +6,6 @@
 
 #[macro_use]
 extern crate darling;
-extern crate derive_common;
 extern crate proc_macro;
 extern crate proc_macro2;
 #[macro_use]
@@ -17,6 +16,7 @@ extern crate synstructure;
 
 use proc_macro::TokenStream;
 
+mod cg;
 mod animate;
 mod compute_squared_distance;
 mod parse;

servo/components/style_derive/parse.rs

@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use crate::to_css::{CssBitflagAttrs, CssVariantAttrs};
-use derive_common::cg;
+use crate::cg;
 use proc_macro2::{Span, TokenStream};
 use quote::TokenStreamExt;
 use syn::{self, DeriveInput, Ident, Path};

servo/components/style_derive/specified_value_info.rs

@@ -4,7 +4,7 @@
 
 use crate::parse::ParseVariantAttrs;
 use crate::to_css::{CssFieldAttrs, CssInputAttrs, CssVariantAttrs};
-use derive_common::cg;
+use crate::cg;
 use proc_macro2::TokenStream;
 use quote::TokenStreamExt;
 use syn::{Data, DeriveInput, Fields, Ident, Type};

servo/components/style_derive/to_animated_zero.rs

@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use crate::animate::{AnimationFieldAttrs, AnimationInputAttrs, AnimationVariantAttrs};
-use derive_common::cg;
+use crate::cg;
 use proc_macro2::TokenStream;
 use quote::TokenStreamExt;
 use syn;

servo/components/style_derive/to_computed_value.rs

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use derive_common::cg;
+use crate::cg;
 use proc_macro2::TokenStream;
 use syn::{DeriveInput, Ident, Path};
 use synstructure::{BindStyle, BindingInfo};

servo/components/style_derive/to_css.rs

@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use darling::util::Override;
-use derive_common::cg;
+use crate::cg;
 use proc_macro2::{Span, TokenStream};
 use quote::{ToTokens, TokenStreamExt};
 use syn::{self, Data, Ident, Path, WhereClause};

servo/components/style_derive/to_resolved_value.rs

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use derive_common::cg;
+use crate::cg;
 use proc_macro2::TokenStream;
 use syn::DeriveInput;
 use synstructure::BindStyle;

tools/lint/clippy.yml

@@ -17,7 +17,6 @@ clippy:
         - mozglue/static/rust/
         - netwerk/base/mozurl/
         - security/manager/ssl/data_storage/
-        - servo/components/derive_common/
         - servo/components/selectors/
         - servo/components/servo_arc/
         - servo/components/style/