Simplify

lightningcss_derive is only really intended to be used by lightningcss itself and not by other crates, so just use `crate` to refer to it.
parcel-bundler · Oct 9, 2023 · fe91be4 · fe91be4
1 parent 8f7ada0
commit fe91be4
Show file tree

Hide file tree

Showing 41 changed files with 7 additions and 90 deletions.
diff --git a/derive/src/into_owned.rs b/derive/src/into_owned.rs
@@ -116,7 +116,7 @@ pub(crate) fn derive_into_owned(input: TokenStream) -> TokenStream {
 
   for type_param in type_param_names {
     generics.make_where_clause().predicates.push_value(parse_quote! {
-      #type_param: 'static + for<'aa> lightningcss::traits::IntoOwned<'aa>
+      #type_param: 'static + for<'aa> crate::traits::IntoOwned<'aa>
     })
   }
 
@@ -142,7 +142,7 @@ pub(crate) fn derive_into_owned(input: TokenStream) -> TokenStream {
 
   let into_owned = if !has_lifetime {
     quote! {
-      impl #impl_generics lightningcss::traits::IntoOwned<'any> for #self_name #ty_generics #where_clause {
+      impl #impl_generics crate::traits::IntoOwned<'any> for #self_name #ty_generics #where_clause {
         type Owned = Self;
 
         #[inline]
@@ -154,11 +154,11 @@ pub(crate) fn derive_into_owned(input: TokenStream) -> TokenStream {
   } else {
     let params = generics.type_params();
     quote! {
-      impl #impl_generics lightningcss::traits::IntoOwned<'any> for #self_name #ty_generics #where_clause {
+      impl #impl_generics crate::traits::IntoOwned<'any> for #self_name #ty_generics #where_clause {
         type Owned = #self_name<'any, #(#params),*>;
         /// Consumes the value and returns an owned clone.
         fn into_owned(self) -> Self::Owned {
-          use lightningcss::traits::IntoOwned;
+          use crate::traits::IntoOwned;
 
           #res
         }

diff --git a/src/declaration.rs b/src/declaration.rs
@@ -5,8 +5,6 @@ use std::ops::Range;
 
 use crate::context::PropertyHandlerContext;
 use crate::error::{ParserError, PrinterError};
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::parser::ParserOptions;
 use crate::printer::Printer;
 use crate::properties::box_shadow::BoxShadowHandler;

diff --git a/src/error.rs b/src/error.rs
@@ -1,7 +1,5 @@
 //! Error types.
 
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::properties::custom::Token;
 use crate::rules::Location;
 #[cfg(feature = "into_owned")]

diff --git a/src/lib.rs b/src/lib.rs
@@ -47,11 +47,6 @@ pub mod visitor;
 #[cfg(feature = "serde")]
 mod serialization;
 
-/// hack for derive
-mod lightningcss {
-  pub use crate::traits;
-}
-
 #[cfg(test)]
 mod tests {
   use crate::css_modules::{CssModuleExport, CssModuleExports, CssModuleReference, CssModuleReferences};

diff --git a/src/media_query.rs b/src/media_query.rs
@@ -1,8 +1,5 @@
 //! Media queries.
 use crate::error::{ErrorWithLocation, MinifyError, MinifyErrorKind, ParserError, PrinterError};
-#[cfg(feature = "into_owned")]
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::macros::enum_property;
 use crate::parser::starts_with_ignore_ascii_case;
 use crate::printer::Printer;

diff --git a/src/properties/animation.rs b/src/properties/animation.rs
@@ -3,8 +3,6 @@
 use crate::context::PropertyHandlerContext;
 use crate::declaration::{DeclarationBlock, DeclarationList};
 use crate::error::{ParserError, PrinterError};
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::macros::*;
 use crate::prefixes::Feature;
 use crate::printer::Printer;

diff --git a/src/properties/background.rs b/src/properties/background.rs
@@ -3,8 +3,6 @@
 use crate::context::PropertyHandlerContext;
 use crate::declaration::{DeclarationBlock, DeclarationList};
 use crate::error::{ParserError, PrinterError};
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::macros::*;
 use crate::prefixes::Feature;
 use crate::printer::Printer;

diff --git a/src/properties/border_image.rs b/src/properties/border_image.rs
@@ -3,8 +3,6 @@
 use crate::context::PropertyHandlerContext;
 use crate::declaration::{DeclarationBlock, DeclarationList};
 use crate::error::{ParserError, PrinterError};
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::prefixes::Feature;
 use crate::printer::Printer;
 use crate::properties::{Property, PropertyId, VendorPrefix};

diff --git a/src/properties/contain.rs b/src/properties/contain.rs
@@ -2,8 +2,6 @@
 
 #![allow(non_upper_case_globals)]
 
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use cssparser::*;
 use smallvec::SmallVec;
 

diff --git a/src/properties/css_modules.rs b/src/properties/css_modules.rs
@@ -2,8 +2,6 @@
 
 use crate::dependencies::Location;
 use crate::error::{ParserError, PrinterError};
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::printer::Printer;
 use crate::traits::{Parse, ToCss};
 use crate::values::ident::{CustomIdent, CustomIdentList};

diff --git a/src/properties/custom.rs b/src/properties/custom.rs
@@ -1,8 +1,6 @@
 //! CSS custom properties and unparsed token values.
 
 use crate::error::{ParserError, PrinterError, PrinterErrorKind};
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::macros::enum_property;
 use crate::prefixes::Feature;
 use crate::printer::Printer;

diff --git a/src/properties/effects.rs b/src/properties/effects.rs
@@ -1,8 +1,6 @@
 //! CSS properties related to filters and effects.
 
 use crate::error::{ParserError, PrinterError};
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::printer::Printer;
 use crate::targets::{Browsers, Targets};
 use crate::traits::{FallbackValues, IsCompatible, Parse, ToCss, Zero};

diff --git a/src/properties/font.rs b/src/properties/font.rs
@@ -7,8 +7,6 @@ use crate::compat::Feature;
 use crate::context::PropertyHandlerContext;
 use crate::declaration::{DeclarationBlock, DeclarationList};
 use crate::error::{ParserError, PrinterError};
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::macros::*;
 use crate::printer::Printer;
 use crate::targets::should_compile;

diff --git a/src/properties/grid.rs b/src/properties/grid.rs
@@ -5,8 +5,6 @@
 use crate::context::PropertyHandlerContext;
 use crate::declaration::{DeclarationBlock, DeclarationList};
 use crate::error::{Error, ErrorLocation, ParserError, PrinterError, PrinterErrorKind};
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::macros::{define_shorthand, impl_shorthand};
 use crate::printer::Printer;
 use crate::properties::{Property, PropertyId};

diff --git a/src/properties/list.rs b/src/properties/list.rs
@@ -4,8 +4,6 @@ use super::{Property, PropertyId};
 use crate::context::PropertyHandlerContext;
 use crate::declaration::{DeclarationBlock, DeclarationList};
 use crate::error::{ParserError, PrinterError};
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::macros::{define_shorthand, enum_property, shorthand_handler, shorthand_property};
 use crate::printer::Printer;
 use crate::targets::{Browsers, Targets};

diff --git a/src/properties/masking.rs b/src/properties/masking.rs
@@ -6,8 +6,6 @@ use super::PropertyId;
 use crate::context::PropertyHandlerContext;
 use crate::declaration::{DeclarationBlock, DeclarationList};
 use crate::error::{ParserError, PrinterError};
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::macros::{define_list_shorthand, define_shorthand, enum_property, property_bitflags};
 use crate::prefixes::Feature;
 use crate::printer::Printer;

diff --git a/src/properties/mod.rs b/src/properties/mod.rs
@@ -122,8 +122,6 @@ pub mod ui;
 
 use crate::declaration::DeclarationBlock;
 use crate::error::{ParserError, PrinterError};
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::logical::{LogicalGroup, PropertyCategory};
 use crate::parser::starts_with_ignore_ascii_case;
 use crate::parser::ParserOptions;

diff --git a/src/properties/svg.rs b/src/properties/svg.rs
@@ -1,8 +1,6 @@
 //! CSS properties used in SVG.
 
 use crate::error::{ParserError, PrinterError};
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::macros::enum_property;
 use crate::printer::Printer;
 use crate::targets::{Browsers, Targets};

diff --git a/src/properties/text.rs b/src/properties/text.rs
@@ -7,8 +7,6 @@ use crate::compat;
 use crate::context::PropertyHandlerContext;
 use crate::declaration::{DeclarationBlock, DeclarationList};
 use crate::error::{ParserError, PrinterError};
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::macros::{define_shorthand, enum_property};
 use crate::prefixes::Feature;
 use crate::printer::Printer;

diff --git a/src/properties/transition.rs b/src/properties/transition.rs
@@ -5,8 +5,6 @@ use crate::compat;
 use crate::context::PropertyHandlerContext;
 use crate::declaration::{DeclarationBlock, DeclarationList};
 use crate::error::{ParserError, PrinterError};
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::macros::define_list_shorthand;
 use crate::prefixes::Feature;
 use crate::printer::Printer;

diff --git a/src/properties/ui.rs b/src/properties/ui.rs
@@ -2,8 +2,6 @@
 
 use crate::declaration::DeclarationBlock;
 use crate::error::{ParserError, PrinterError};
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::macros::{define_shorthand, enum_property, shorthand_property};
 use crate::printer::Printer;
 use crate::properties::{Property, PropertyId};

diff --git a/src/rules/container.rs b/src/rules/container.rs
@@ -5,8 +5,6 @@ use cssparser::*;
 use super::Location;
 use super::{CssRuleList, MinifyContext};
 use crate::error::{MinifyError, ParserError, PrinterError};
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::media_query::{
   define_query_features, operation_to_css, parse_query_condition, to_css_with_parens_if_needed, FeatureToCss,
   MediaFeatureType, Operator, QueryCondition, QueryConditionFlags, QueryFeature, ValueType,

diff --git a/src/rules/counter_style.rs b/src/rules/counter_style.rs
@@ -3,8 +3,6 @@
 use super::Location;
 use crate::declaration::DeclarationBlock;
 use crate::error::PrinterError;
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::printer::Printer;
 use crate::traits::ToCss;
 use crate::values::ident::CustomIdent;

diff --git a/src/rules/custom_media.rs b/src/rules/custom_media.rs
@@ -2,8 +2,6 @@
 
 use super::Location;
 use crate::error::PrinterError;
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::media_query::MediaList;
 use crate::printer::Printer;
 use crate::traits::ToCss;

diff --git a/src/rules/font_face.rs b/src/rules/font_face.rs
@@ -2,8 +2,6 @@
 
 use super::Location;
 use crate::error::{ParserError, PrinterError};
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::macros::enum_property;
 use crate::printer::Printer;
 use crate::properties::custom::CustomProperty;

diff --git a/src/rules/font_palette_values.rs b/src/rules/font_palette_values.rs
@@ -3,8 +3,6 @@
 use super::supports::SupportsRule;
 use super::{CssRule, CssRuleList, Location, MinifyContext};
 use crate::error::{ParserError, PrinterError};
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::printer::Printer;
 use crate::properties::custom::CustomProperty;
 use crate::properties::font::FontFamily;

diff --git a/src/rules/import.rs b/src/rules/import.rs
@@ -5,8 +5,6 @@ use super::supports::SupportsCondition;
 use super::Location;
 use crate::dependencies::{Dependency, ImportDependency};
 use crate::error::PrinterError;
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::media_query::MediaList;
 use crate::printer::Printer;
 use crate::traits::ToCss;

diff --git a/src/rules/keyframes.rs b/src/rules/keyframes.rs
@@ -6,8 +6,6 @@ use super::{CssRule, CssRuleList, Location};
 use crate::context::DeclarationContext;
 use crate::declaration::DeclarationBlock;
 use crate::error::{ParserError, PrinterError};
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::parser::ParserOptions;
 use crate::printer::Printer;
 use crate::properties::custom::{CustomProperty, UnparsedProperty};

diff --git a/src/rules/layer.rs b/src/rules/layer.rs
@@ -2,8 +2,6 @@
 
 use super::{CssRuleList, Location, MinifyContext};
 use crate::error::{MinifyError, ParserError, PrinterError};
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::parser::DefaultAtRule;
 use crate::printer::Printer;
 use crate::traits::{Parse, ToCss};

diff --git a/src/rules/namespace.rs b/src/rules/namespace.rs
@@ -2,8 +2,6 @@
 
 use super::Location;
 use crate::error::PrinterError;
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::printer::Printer;
 use crate::traits::ToCss;
 use crate::values::ident::Ident;

diff --git a/src/rules/page.rs b/src/rules/page.rs
@@ -3,8 +3,6 @@
 use super::Location;
 use crate::declaration::{parse_declaration, DeclarationBlock};
 use crate::error::{ParserError, PrinterError};
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::macros::enum_property;
 use crate::printer::Printer;
 use crate::stylesheet::ParserOptions;

diff --git a/src/rules/property.rs b/src/rules/property.rs
@@ -1,8 +1,6 @@
 //! The `@property` rule.
 
 use super::Location;
-#[cfg(not(doctest))]
-use crate::lightningcss;
 #[cfg(feature = "visitor")]
 use crate::visitor::Visit;
 use crate::{

diff --git a/src/rules/supports.rs b/src/rules/supports.rs
@@ -3,8 +3,6 @@
 use super::Location;
 use super::{CssRuleList, MinifyContext};
 use crate::error::{MinifyError, ParserError, PrinterError};
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::parser::DefaultAtRule;
 use crate::printer::Printer;
 use crate::properties::PropertyId;

diff --git a/src/rules/unknown.rs b/src/rules/unknown.rs
@@ -2,8 +2,6 @@
 
 use super::Location;
 use crate::error::PrinterError;
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::printer::Printer;
 use crate::properties::custom::TokenList;
 use crate::traits::ToCss;

diff --git a/src/rules/viewport.rs b/src/rules/viewport.rs
@@ -3,8 +3,6 @@
 use super::Location;
 use crate::declaration::DeclarationBlock;
 use crate::error::PrinterError;
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::printer::Printer;
 use crate::traits::ToCss;
 use crate::vendor_prefix::VendorPrefix;

diff --git a/src/stylesheet.rs b/src/stylesheet.rs
@@ -8,8 +8,6 @@ use crate::css_modules::{CssModule, CssModuleExports, CssModuleReferences};
 use crate::declaration::{DeclarationBlock, DeclarationHandler};
 use crate::dependencies::Dependency;
 use crate::error::{Error, ErrorLocation, MinifyErrorKind, ParserError, PrinterError, PrinterErrorKind};
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::parser::{DefaultAtRule, DefaultAtRuleParser, TopLevelRuleParser};
 use crate::printer::Printer;
 use crate::rules::{CssRule, CssRuleList, MinifyContext};

diff --git a/src/values/ident.rs b/src/values/ident.rs
@@ -1,8 +1,6 @@
 //! CSS identifiers.
 
 use crate::error::{ParserError, PrinterError};
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::printer::Printer;
 use crate::properties::css_modules::Specifier;
 use crate::traits::{Parse, ParseWithOptions, ToCss};

diff --git a/src/values/image.rs b/src/values/image.rs
@@ -6,8 +6,6 @@ use super::resolution::Resolution;
 use crate::compat;
 use crate::dependencies::{Dependency, UrlDependency};
 use crate::error::{ParserError, PrinterError};
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::prefixes::{is_webkit_gradient, Feature};
 use crate::printer::Printer;
 use crate::targets::{Browsers, Targets};

diff --git a/src/values/string.rs b/src/values/string.rs
@@ -1,8 +1,6 @@
 //! Types used to represent strings.
 
-#[cfg(not(doctest))]
-use crate::lightningcss;
-use crate::traits::{IntoOwned, Parse, ToCss};
+use crate::traits::{Parse, ToCss};
 #[cfg(feature = "visitor")]
 use crate::visitor::{Visit, VisitTypes, Visitor};
 use cssparser::{serialize_string, CowRcStr};
@@ -133,7 +131,8 @@ impl<'a> CowArcStr<'a> {
   }
 }
 
-impl<'any> IntoOwned<'any> for CowArcStr<'_> {
+#[cfg(feature = "into_owned")]
+impl<'any> crate::traits::IntoOwned<'any> for CowArcStr<'_> {
   type Owned = CowArcStr<'any>;
 
   /// Consumes the value and returns an owned clone.

diff --git a/src/values/syntax.rs b/src/values/syntax.rs
@@ -3,8 +3,6 @@
 use super::ident::Ident;
 use super::number::{CSSInteger, CSSNumber};
 use crate::error::{ParserError, PrinterError};
-#[cfg(not(doctest))]
-use crate::lightningcss;
 use crate::printer::Printer;
 use crate::traits::{Parse, ToCss};
 use crate::values;