Reorganize

devongovett · devongovett · commit 0485c456ce8f · 2021-10-29T10:41:19.000-04:00
diff --git a/src/declaration.rs b/src/declaration.rs
@@ -1,16 +1,16 @@
 use cssparser::*;
 use crate::properties::Property;
-use crate::values::traits::{PropertyHandler, ToCss};
+use crate::traits::{PropertyHandler, ToCss};
 use crate::printer::Printer;
 use crate::properties::{
   align::AlignHandler,
   background::BackgroundHandler,
   flex::FlexHandler,
   font::FontHandler,
   margin_padding::*,
-  outline::OutlineHandler
+  outline::OutlineHandler,
+  border::BorderHandler
 };
-use crate::values::{border::BorderHandler};
 
 #[derive(Debug, Clone, PartialEq)]
 pub struct Declaration {
diff --git a/src/lib.rs b/src/lib.rs
@@ -15,11 +15,13 @@ mod selector;
 mod properties;
 mod values;
 mod printer;
+mod traits;
+mod macros;
 
 use napi::{CallContext, JsObject, JsUndefined};
 use serde::{Deserialize, Serialize};
 use cssparser::{Parser, ParserInput, RuleListParser};
-use values::traits::ToCss;
+use crate::traits::ToCss;
 use printer::Printer;
 use std::fmt::Write;
 
diff --git a/src/macros.rs b/src/macros.rs
diff --git a/src/media_query.rs b/src/media_query.rs
@@ -1,7 +1,7 @@
 use cssparser::*;
-use crate::values::traits::{ToCss, Parse};
+use crate::traits::{ToCss, Parse};
 use crate::printer::Printer;
-use crate::values::macros::enum_property;
+use crate::macros::enum_property;
 use std::fmt::Write;
 
 /// A type that encapsulates a media query list.
diff --git a/src/parser.rs b/src/parser.rs
@@ -4,7 +4,7 @@ use std::fmt;
 use std::cell::RefCell;
 use crate::media_query::*;
 use crate::printer::Printer;
-use crate::values::traits::{Parse, ToCss};
+use crate::traits::{Parse, ToCss};
 use std::fmt::Write;
 use crate::selector::{Selectors, SelectorParser};
 use crate::rules::keyframes::{KeyframeListParser, KeyframesRule};
diff --git a/src/properties/align.rs b/src/properties/align.rs
@@ -1,7 +1,7 @@
 use cssparser::*;
-use crate::values::macros::*;
+use crate::macros::*;
 use crate::values::length::{LengthPercentageOrAuto, LengthPercentage, Length, Percentage};
-use crate::values::traits::{Parse, ToCss, PropertyHandler};
+use crate::traits::{Parse, ToCss, PropertyHandler};
 use super::Property;
 use crate::printer::Printer;
 
diff --git a/src/properties/background.rs b/src/properties/background.rs
@@ -1,7 +1,7 @@
 use cssparser::*;
 use crate::values::length::{HorizontalPosition, HorizontalPositionKeyword, VerticalPosition, VerticalPositionKeyword, LengthPercentage, LengthPercentageOrAuto, Percentage};
-use crate::values::traits::{Parse, ToCss, PropertyHandler};
-use crate::values::macros::*;
+use crate::traits::{Parse, ToCss, PropertyHandler};
+use crate::macros::*;
 use crate::values::{color::CssColor, image::Image};
 use crate::properties::Property;
 use itertools::izip;
diff --git a/src/properties/border.rs b/src/properties/border.rs
@@ -1,10 +1,10 @@
-use super::length::*;
+use crate::values::length::*;
 use cssparser::*;
-use super::traits::{Parse, ToCss, PropertyHandler};
-use super::color::CssColor;
+use crate::traits::{Parse, ToCss, PropertyHandler};
+use crate::values::color::CssColor;
 use crate::properties::Property;
-use super::rect::Rect;
-use super::macros::*;
+use crate::values::rect::Rect;
+use crate::macros::*;
 use super::border_image::*;
 use super::border_radius::*;
 use crate::printer::Printer;
diff --git a/src/properties/border_image.rs b/src/properties/border_image.rs
@@ -1,10 +1,10 @@
-use super::length::{*, NumberOrPercentage};
+use crate::values::length::{*, NumberOrPercentage};
 use cssparser::*;
-use super::traits::{Parse, ToCss, PropertyHandler};
+use crate::traits::{Parse, ToCss, PropertyHandler};
 use crate::properties::Property;
-use super::rect::Rect;
-use super::image::Image;
-use super::macros::*;
+use crate::values::rect::Rect;
+use crate::values::image::Image;
+use crate::macros::*;
 use crate::printer::Printer;
 
 // https://www.w3.org/TR/css-backgrounds-3/#border-image-repeat
diff --git a/src/properties/border_radius.rs b/src/properties/border_radius.rs
@@ -1,8 +1,8 @@
-use super::length::*;
+use crate::values::length::*;
 use cssparser::*;
-use super::traits::{Parse, ToCss, PropertyHandler};
+use crate::traits::{Parse, ToCss, PropertyHandler};
 use crate::properties::Property;
-use super::rect::Rect;
+use crate::values::rect::Rect;
 use crate::printer::Printer;
 
 #[derive(Debug, Clone, PartialEq)]
diff --git a/src/properties/box_shadow.rs b/src/properties/box_shadow.rs
@@ -1,7 +1,7 @@
 use cssparser::*;
 use crate::values::length::{HorizontalPosition, HorizontalPositionKeyword, VerticalPosition, VerticalPositionKeyword, Length, Unit, LengthPercentage, LengthPercentageOrAuto, Percentage};
-use crate::values::traits::{Parse, ToCss, PropertyHandler};
-use crate::values::macros::*;
+use crate::traits::{Parse, ToCss, PropertyHandler};
+use crate::macros::*;
 use crate::values::{color::CssColor, image::Image};
 use crate::properties::Property;
 use itertools::izip;
diff --git a/src/properties/flex.rs b/src/properties/flex.rs
@@ -1,7 +1,7 @@
 use cssparser::*;
-use crate::values::macros::*;
+use crate::macros::*;
 use crate::values::length::{LengthPercentageOrAuto, LengthPercentage, Length, Percentage};
-use crate::values::traits::{Parse, ToCss, PropertyHandler};
+use crate::traits::{Parse, ToCss, PropertyHandler};
 use super::Property;
 use crate::printer::Printer;
 
diff --git a/src/properties/font.rs b/src/properties/font.rs
@@ -1,7 +1,7 @@
 use cssparser::*;
-use crate::values::macros::*;
+use crate::macros::*;
 use crate::values::length::{LengthPercentage, Angle, Percentage};
-use crate::values::traits::{Parse, ToCss, PropertyHandler};
+use crate::traits::{Parse, ToCss, PropertyHandler};
 use super::Property;
 use crate::printer::Printer;
 use std::fmt::Write;
diff --git a/src/properties/margin_padding.rs b/src/properties/margin_padding.rs
@@ -1,6 +1,6 @@
 use crate::values::{length::{Size2D, LengthPercentageOrAuto}, rect::Rect};
 use crate::properties::Property;
-use crate::values::traits::PropertyHandler;
+use crate::traits::PropertyHandler;
 
 #[derive(Debug, PartialEq)]
 enum SideCategory {
diff --git a/src/properties/mod.rs b/src/properties/mod.rs
@@ -6,6 +6,9 @@ pub mod flex;
 pub mod align;
 pub mod font;
 pub mod box_shadow;
+pub mod border;
+pub mod border_image;
+pub mod border_radius;
 
 use cssparser::*;
 use custom::*;
@@ -15,8 +18,11 @@ use flex::*;
 use align::*;
 use font::*;
 use box_shadow::*;
-use crate::values::{image::*, length::*, border::*, border_image::*, border_radius::*, rect::*, color::*};
-use super::values::traits::{Parse, ToCss};
+use border::*;
+use border_image::*;
+use border_radius::*;
+use crate::values::{image::*, length::*, rect::*, color::*};
+use crate::traits::{Parse, ToCss};
 use crate::printer::Printer;
 use std::fmt::Write;
 
diff --git a/src/properties/outline.rs b/src/properties/outline.rs
@@ -1,6 +1,6 @@
 use cssparser::*;
-use crate::values::border::{BorderStyle, GenericBorder, BorderSideWidth};
-use crate::values::traits::{Parse, ToCss, PropertyHandler};
+use super::border::{BorderStyle, GenericBorder, BorderSideWidth};
+use crate::traits::{Parse, ToCss, PropertyHandler};
 use crate::values::color::CssColor;
 use super::Property;
 use crate::printer::Printer;
diff --git a/src/rules/keyframes.rs b/src/rules/keyframes.rs
@@ -1,6 +1,6 @@
 use cssparser::*;
 use crate::values::length::Percentage;
-use crate::values::traits::{Parse, ToCss};
+use crate::traits::{Parse, ToCss};
 use crate::properties::Property;
 use crate::parser::{PropertyDeclarationParser, DeclarationBlock};
 use crate::printer::Printer;
diff --git a/src/selector.rs b/src/selector.rs
@@ -2,7 +2,7 @@ use cssparser::*;
 use selectors::{SelectorList, parser::{SelectorImpl, Selector, Combinator, Component}};
 use std::fmt;
 use crate::printer::Printer;
-use crate::values::traits::ToCss;
+use crate::traits::ToCss;
 use std::fmt::Write;
 use super::parser::CssString;
 
diff --git a/src/traits.rs b/src/traits.rs
diff --git a/src/values/calc.rs b/src/values/calc.rs
@@ -1,12 +1,10 @@
 use super::length::*;
 use cssparser::*;
-use super::traits::{Parse, ToCss, PropertyHandler};
+use crate::traits::{Parse, ToCss, PropertyHandler};
 use super::color::CssColor;
 use crate::properties::Property;
 use super::rect::Rect;
-use super::macros::*;
-use super::border_image::*;
-use super::border_radius::*;
+use crate::macros::*;
 use crate::printer::Printer;
 use std::fmt::Write;
 
diff --git a/src/values/color.rs b/src/values/color.rs
@@ -1,5 +1,5 @@
 use cssparser::*;
-use super::traits::{Parse, ToCss};
+use crate::traits::{Parse, ToCss};
 use crate::printer::Printer;
 use std::fmt::Write;
 
diff --git a/src/values/image.rs b/src/values/image.rs
@@ -1,5 +1,5 @@
 use cssparser::*;
-use super::traits::{Parse, ToCss};
+use crate::traits::{Parse, ToCss};
 use crate::printer::Printer;
 
 /// https://www.w3.org/TR/css-images-3/#typedef-image
diff --git a/src/values/length.rs b/src/values/length.rs
@@ -1,6 +1,6 @@
 use cssparser::*;
-use super::traits::{Parse, ToCss};
-use super::macros::enum_property;
+use crate::traits::{Parse, ToCss};
+use crate::macros::enum_property;
 use crate::printer::Printer;
 use std::fmt::Write;
 use super::calc::Calc;
diff --git a/src/values/mod.rs b/src/values/mod.rs
@@ -1,10 +1,5 @@
 pub mod image;
 pub mod length;
-pub mod border;
-pub mod border_image;
-pub mod border_radius;
 pub mod rect;
 pub mod color;
-pub mod traits;
 pub mod calc;
-pub mod macros;
diff --git a/src/values/rect.rs b/src/values/rect.rs
@@ -1,5 +1,5 @@
 use cssparser::*;
-use super::traits::{Parse, ToCss};
+use crate::traits::{Parse, ToCss};
 use crate::printer::Printer;
 
 #[derive(Clone, Debug, PartialEq, Eq)]
