[librsvg: 1/5] Use just properties::Foo everywhere, instead of scattering among property_defs and font_props

[Marge Bot <marge-bot src gnome org>]

commit d0d15aac752e4785a31be7ee9e47bab30a046d89
Author: Federico Mena Quintero <federico gnome org>
Date:   Mon Jun 7 11:21:16 2021 -0500

    Use just properties::Foo everywhere, instead of scattering among property_defs and font_props
    
    The properties module now re-exports all of property_defs and font_props.
    
    Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/542>

 src/drawing_ctx.rs                |  7 +++----
 src/filters/blend.rs              |  2 +-
 src/filters/color_matrix.rs       |  2 +-
 src/filters/component_transfer.rs |  2 +-
 src/filters/composite.rs          |  2 +-
 src/filters/context.rs            |  2 +-
 src/filters/convolve_matrix.rs    |  2 +-
 src/filters/displacement_map.rs   |  2 +-
 src/filters/gaussian_blur.rs      |  2 +-
 src/filters/lighting.rs           |  2 +-
 src/filters/merge.rs              |  2 +-
 src/filters/mod.rs                |  2 +-
 src/filters/morphology.rs         |  2 +-
 src/filters/offset.rs             |  2 +-
 src/filters/tile.rs               |  2 +-
 src/filters/turbulence.rs         |  2 +-
 src/font_props.rs                 |  3 +++
 src/layout.rs                     | 11 +++++------
 src/properties.rs                 |  6 ++++--
 src/property_defs.rs              |  3 +++
 src/text.rs                       |  8 +++-----
 21 files changed, 36 insertions(+), 32 deletions(-)
---
diff --git a/src/drawing_ctx.rs b/src/drawing_ctx.rs
index 1aead6ad..ce2b4164 100644
--- a/src/drawing_ctx.rs
+++ b/src/drawing_ctx.rs
@@ -29,10 +29,9 @@ use crate::node::{CascadedValues, Node, NodeBorrow, NodeDraw};
 use crate::paint_server::{PaintSource, UserSpacePaintSource};
 use crate::path_builder::*;
 use crate::pattern::UserSpacePattern;
-use crate::properties::ComputedValues;
-use crate::property_defs::{
-    ClipRule, FillRule, Filter, MixBlendMode, Opacity, Overflow, PaintTarget, ShapeRendering,
-    StrokeLinecap, StrokeLinejoin, TextRendering,
+use crate::properties::{
+    ClipRule, ComputedValues, FillRule, Filter, MixBlendMode, Opacity, Overflow, PaintTarget,
+    ShapeRendering, StrokeLinecap, StrokeLinejoin, TextRendering,
 };
 use crate::rect::Rect;
 use crate::surface_utils::{
diff --git a/src/filters/blend.rs b/src/filters/blend.rs
index 512fc10f..c56d68b8 100644
--- a/src/filters/blend.rs
+++ b/src/filters/blend.rs
@@ -7,7 +7,7 @@ use crate::element::{ElementResult, SetAttributes};
 use crate::error::*;
 use crate::node::{CascadedValues, Node};
 use crate::parsers::{Parse, ParseValue};
-use crate::property_defs::ColorInterpolationFilters;
+use crate::properties::ColorInterpolationFilters;
 use crate::rect::IRect;
 use crate::surface_utils::shared_surface::Operator;
 use crate::xml::Attributes;
diff --git a/src/filters/color_matrix.rs b/src/filters/color_matrix.rs
index ee372481..a9af7a91 100644
--- a/src/filters/color_matrix.rs
+++ b/src/filters/color_matrix.rs
@@ -8,7 +8,7 @@ use crate::element::{ElementResult, SetAttributes};
 use crate::error::*;
 use crate::node::{CascadedValues, Node};
 use crate::parsers::{NumberList, Parse, ParseValue};
-use crate::property_defs::ColorInterpolationFilters;
+use crate::properties::ColorInterpolationFilters;
 use crate::rect::IRect;
 use crate::surface_utils::{
     iterators::Pixels, shared_surface::ExclusiveImageSurface, ImageSurfaceDataExt, Pixel,
diff --git a/src/filters/component_transfer.rs b/src/filters/component_transfer.rs
index 799306c8..2e8f8725 100644
--- a/src/filters/component_transfer.rs
+++ b/src/filters/component_transfer.rs
@@ -9,7 +9,7 @@ use crate::element::{Draw, Element, ElementResult, SetAttributes};
 use crate::error::*;
 use crate::node::{CascadedValues, Node, NodeBorrow};
 use crate::parsers::{NumberList, Parse, ParseValue};
-use crate::property_defs::ColorInterpolationFilters;
+use crate::properties::ColorInterpolationFilters;
 use crate::rect::IRect;
 use crate::surface_utils::{
     iterators::Pixels, shared_surface::ExclusiveImageSurface, ImageSurfaceDataExt, Pixel,
diff --git a/src/filters/composite.rs b/src/filters/composite.rs
index 7ffc6c1d..2a2e47ed 100644
--- a/src/filters/composite.rs
+++ b/src/filters/composite.rs
@@ -7,7 +7,7 @@ use crate::element::{ElementResult, SetAttributes};
 use crate::error::*;
 use crate::node::{CascadedValues, Node};
 use crate::parsers::{Parse, ParseValue};
-use crate::property_defs::ColorInterpolationFilters;
+use crate::properties::ColorInterpolationFilters;
 use crate::rect::IRect;
 use crate::surface_utils::shared_surface::Operator as SurfaceOperator;
 use crate::xml::Attributes;
diff --git a/src/filters/context.rs b/src/filters/context.rs
index a391f1a8..5e778bb9 100644
--- a/src/filters/context.rs
+++ b/src/filters/context.rs
@@ -9,7 +9,7 @@ use crate::drawing_ctx::DrawingCtx;
 use crate::filter::UserSpaceFilter;
 use crate::paint_server::UserSpacePaintSource;
 use crate::parsers::CustomIdent;
-use crate::property_defs::ColorInterpolationFilters;
+use crate::properties::ColorInterpolationFilters;
 use crate::rect::{IRect, Rect};
 use crate::surface_utils::shared_surface::{SharedImageSurface, SurfaceType};
 use crate::transform::Transform;
diff --git a/src/filters/convolve_matrix.rs b/src/filters/convolve_matrix.rs
index afb7265c..bd796730 100644
--- a/src/filters/convolve_matrix.rs
+++ b/src/filters/convolve_matrix.rs
@@ -8,7 +8,7 @@ use crate::element::{ElementResult, SetAttributes};
 use crate::error::*;
 use crate::node::{CascadedValues, Node};
 use crate::parsers::{NonNegative, NumberList, NumberOptionalNumber, Parse, ParseValue};
-use crate::property_defs::ColorInterpolationFilters;
+use crate::properties::ColorInterpolationFilters;
 use crate::rect::IRect;
 use crate::surface_utils::{
     iterators::{PixelRectangle, Pixels},
diff --git a/src/filters/displacement_map.rs b/src/filters/displacement_map.rs
index 606c8e90..ed6e5ba7 100644
--- a/src/filters/displacement_map.rs
+++ b/src/filters/displacement_map.rs
@@ -7,7 +7,7 @@ use crate::element::{ElementResult, SetAttributes};
 use crate::error::*;
 use crate::node::{CascadedValues, Node};
 use crate::parsers::{Parse, ParseValue};
-use crate::property_defs::ColorInterpolationFilters;
+use crate::properties::ColorInterpolationFilters;
 use crate::rect::IRect;
 use crate::surface_utils::{iterators::Pixels, shared_surface::ExclusiveImageSurface};
 use crate::xml::Attributes;
diff --git a/src/filters/gaussian_blur.rs b/src/filters/gaussian_blur.rs
index 2cfe6150..114b1d69 100644
--- a/src/filters/gaussian_blur.rs
+++ b/src/filters/gaussian_blur.rs
@@ -9,7 +9,7 @@ use crate::drawing_ctx::DrawingCtx;
 use crate::element::{ElementResult, SetAttributes};
 use crate::node::{CascadedValues, Node};
 use crate::parsers::{NonNegative, NumberOptionalNumber, ParseValue};
-use crate::property_defs::ColorInterpolationFilters;
+use crate::properties::ColorInterpolationFilters;
 use crate::rect::IRect;
 use crate::surface_utils::{
     shared_surface::{BlurDirection, Horizontal, SharedImageSurface, Vertical},
diff --git a/src/filters/lighting.rs b/src/filters/lighting.rs
index 26fafca8..9a9c188e 100644
--- a/src/filters/lighting.rs
+++ b/src/filters/lighting.rs
@@ -19,7 +19,7 @@ use crate::filters::{
 use crate::node::{CascadedValues, Node, NodeBorrow};
 use crate::paint_server::resolve_color;
 use crate::parsers::{NonNegative, NumberOptionalNumber, ParseValue};
-use crate::property_defs::ColorInterpolationFilters;
+use crate::properties::ColorInterpolationFilters;
 use crate::rect::IRect;
 use crate::surface_utils::{
     shared_surface::{ExclusiveImageSurface, SharedImageSurface, SurfaceType},
diff --git a/src/filters/merge.rs b/src/filters/merge.rs
index e616c0ea..74746598 100644
--- a/src/filters/merge.rs
+++ b/src/filters/merge.rs
@@ -5,7 +5,7 @@ use crate::drawing_ctx::DrawingCtx;
 use crate::element::{Draw, Element, ElementResult, SetAttributes};
 use crate::node::{CascadedValues, Node, NodeBorrow};
 use crate::parsers::ParseValue;
-use crate::property_defs::ColorInterpolationFilters;
+use crate::properties::ColorInterpolationFilters;
 use crate::rect::IRect;
 use crate::surface_utils::shared_surface::{Operator, SharedImageSurface, SurfaceType};
 use crate::xml::Attributes;
diff --git a/src/filters/mod.rs b/src/filters/mod.rs
index f4e19a6e..e79eabbd 100644
--- a/src/filters/mod.rs
+++ b/src/filters/mod.rs
@@ -15,7 +15,7 @@ use crate::length::*;
 use crate::node::{Node, NodeBorrow};
 use crate::paint_server::UserSpacePaintSource;
 use crate::parsers::{CustomIdent, Parse, ParseValue};
-use crate::property_defs::ColorInterpolationFilters;
+use crate::properties::ColorInterpolationFilters;
 use crate::surface_utils::shared_surface::{SharedImageSurface, SurfaceType};
 use crate::transform::Transform;
 use crate::xml::Attributes;
diff --git a/src/filters/morphology.rs b/src/filters/morphology.rs
index cfdedd01..f1a3791a 100644
--- a/src/filters/morphology.rs
+++ b/src/filters/morphology.rs
@@ -9,7 +9,7 @@ use crate::element::{ElementResult, SetAttributes};
 use crate::error::*;
 use crate::node::Node;
 use crate::parsers::{NonNegative, NumberOptionalNumber, Parse, ParseValue};
-use crate::property_defs::ColorInterpolationFilters;
+use crate::properties::ColorInterpolationFilters;
 use crate::rect::IRect;
 use crate::surface_utils::{
     iterators::{PixelRectangle, Pixels},
diff --git a/src/filters/offset.rs b/src/filters/offset.rs
index 119ec297..1f97b612 100644
--- a/src/filters/offset.rs
+++ b/src/filters/offset.rs
@@ -5,7 +5,7 @@ use crate::drawing_ctx::DrawingCtx;
 use crate::element::{ElementResult, SetAttributes};
 use crate::node::Node;
 use crate::parsers::ParseValue;
-use crate::property_defs::ColorInterpolationFilters;
+use crate::properties::ColorInterpolationFilters;
 use crate::rect::IRect;
 use crate::xml::Attributes;
 
diff --git a/src/filters/tile.rs b/src/filters/tile.rs
index c7e9647b..8c397b3e 100644
--- a/src/filters/tile.rs
+++ b/src/filters/tile.rs
@@ -2,7 +2,7 @@ use crate::document::AcquiredNodes;
 use crate::drawing_ctx::DrawingCtx;
 use crate::element::{ElementResult, SetAttributes};
 use crate::node::Node;
-use crate::property_defs::ColorInterpolationFilters;
+use crate::properties::ColorInterpolationFilters;
 use crate::rect::IRect;
 use crate::xml::Attributes;
 
diff --git a/src/filters/turbulence.rs b/src/filters/turbulence.rs
index 158b83ee..2f40f7f2 100644
--- a/src/filters/turbulence.rs
+++ b/src/filters/turbulence.rs
@@ -7,7 +7,7 @@ use crate::element::{ElementResult, SetAttributes};
 use crate::error::*;
 use crate::node::{CascadedValues, Node};
 use crate::parsers::{NonNegative, NumberOptionalNumber, Parse, ParseValue};
-use crate::property_defs::ColorInterpolationFilters;
+use crate::properties::ColorInterpolationFilters;
 use crate::rect::IRect;
 use crate::surface_utils::{
     shared_surface::{ExclusiveImageSurface, SurfaceType},
diff --git a/src/font_props.rs b/src/font_props.rs
index f45e04b0..ae6ec573 100644
--- a/src/font_props.rs
+++ b/src/font_props.rs
@@ -1,4 +1,7 @@
 //! CSS font properties.
+//!
+//! Do not import things directly from this module; use the `properties` module instead,
+//! which re-exports things from here.
 
 use cast::{f64, u16};
 use cssparser::{Parser, Token};
diff --git a/src/layout.rs b/src/layout.rs
index 2586cf1e..8d8088bc 100644
--- a/src/layout.rs
+++ b/src/layout.rs
@@ -9,16 +9,15 @@ use crate::coord_units::CoordUnits;
 use crate::dasharray::Dasharray;
 use crate::document::AcquiredNodes;
 use crate::element::Element;
-use crate::font_props::{FontFamily, FontWeight};
 use crate::length::*;
 use crate::node::*;
 use crate::paint_server::PaintSource;
 use crate::path_builder::Path;
-use crate::properties::ComputedValues;
-use crate::property_defs::{
-    ClipRule, Direction, FillRule, Filter, FontStretch, FontStyle, FontVariant, MixBlendMode,
-    Opacity, Overflow, PaintOrder, ShapeRendering, StrokeDasharray, StrokeLinecap, StrokeLinejoin,
-    StrokeMiterlimit, TextDecoration, TextRendering, UnicodeBidi, WritingMode, XmlLang,
+use crate::properties::{
+    ClipRule, ComputedValues, Direction, FillRule, Filter, FontFamily, FontStretch, FontStyle,
+    FontVariant, FontWeight, MixBlendMode, Opacity, Overflow, PaintOrder, ShapeRendering,
+    StrokeDasharray, StrokeLinecap, StrokeLinejoin, StrokeMiterlimit, TextDecoration,
+    TextRendering, UnicodeBidi, WritingMode, XmlLang,
 };
 use crate::rect::Rect;
 use crate::surface_utils::shared_surface::SharedImageSurface;
diff --git a/src/properties.rs b/src/properties.rs
index abae1601..39aad9f8 100644
--- a/src/properties.rs
+++ b/src/properties.rs
@@ -28,12 +28,14 @@ use std::collections::HashSet;
 
 use crate::css::{DeclParser, Declaration, Origin};
 use crate::error::*;
-use crate::font_props::*;
 use crate::parsers::{Parse, ParseValue};
-use crate::property_defs::*;
 use crate::property_macros::Property;
 use crate::xml::Attributes;
 
+// Re-export the actual properties so they are easy to find from a single place `properties::*`.
+pub use crate::font_props::*;
+pub use crate::property_defs::*;
+
 /// Representation of a single CSS property value.
 ///
 /// `Unspecified` is the `Default`; it means that the corresponding property is not present.
diff --git a/src/property_defs.rs b/src/property_defs.rs
index cb271262..0fcf1563 100644
--- a/src/property_defs.rs
+++ b/src/property_defs.rs
@@ -1,5 +1,8 @@
 //! Definitions for CSS property types.
 //!
+//! Do not import things directly from this module; use the `properties` module instead,
+//! which re-exports things from here.
+//!
 //! This module defines most of the CSS property types that librsvg supports.  Each
 //! property requires a Rust type that will hold its values, and that type should
 //! implement a few traits, as follows.
diff --git a/src/text.rs b/src/text.rs
index 1c77b238..9182f1fb 100644
--- a/src/text.rs
+++ b/src/text.rs
@@ -9,15 +9,13 @@ use crate::document::{AcquiredNodes, NodeId};
 use crate::drawing_ctx::DrawingCtx;
 use crate::element::{Draw, Element, ElementResult, SetAttributes};
 use crate::error::*;
-use crate::font_props::FontWeight;
 use crate::layout::{self, FontProperties, StackingContext, Stroke};
 use crate::length::*;
 use crate::node::{CascadedValues, Node, NodeBorrow};
 use crate::parsers::ParseValue;
-use crate::properties::ComputedValues;
-use crate::property_defs::{
-    Direction, FontStretch, FontStyle, FontVariant, TextAnchor, UnicodeBidi, WritingMode, XmlLang,
-    XmlSpace,
+use crate::properties::{
+    ComputedValues, Direction, FontStretch, FontStyle, FontVariant, FontWeight, TextAnchor,
+    UnicodeBidi, WritingMode, XmlLang, XmlSpace,
 };
 use crate::space::{xml_space_normalize, NormalizeDefault, XmlSpaceNormalize};
 use crate::xml::Attributes;