v0.1.0 release branch

atoms/Cargo.toml

@@ -1,10 +1,12 @@
 [package]
-name = "servo_atoms"
-version = "0.0.1"
+name = "stylo_atoms"
+version = "0.1.0"
 authors = ["The Servo Project Developers"]
+documentation = "https://docs.rs/stylo_atoms/"
+description = "Support crate for Stylo CSS engine"
+repository = "https://github.com/servo/stylo"
 license = "MPL-2.0"
 edition = "2018"
-publish = false
 build = "build.rs"
 
 [lib]

atoms/build.rs

@@ -22,7 +22,7 @@ fn main() {
             }
         }
     }
-    include!("../style/counter_style/predefined.rs");
+    include!("./counter_styles.rs");
 
     atom_type
         .atoms(static_atoms.lines().map(Result::unwrap))

atoms/counter_styles.rs

@@ -0,0 +1,61 @@
+/* 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/. */
+
+predefined! {
+    "decimal",
+    "decimal-leading-zero",
+    "arabic-indic",
+    "armenian",
+    "upper-armenian",
+    "lower-armenian",
+    "bengali",
+    "cambodian",
+    "khmer",
+    "cjk-decimal",
+    "devanagari",
+    "georgian",
+    "gujarati",
+    "gurmukhi",
+    "hebrew",
+    "kannada",
+    "lao",
+    "malayalam",
+    "mongolian",
+    "myanmar",
+    "oriya",
+    "persian",
+    "lower-roman",
+    "upper-roman",
+    "tamil",
+    "telugu",
+    "thai",
+    "tibetan",
+    "lower-alpha",
+    "lower-latin",
+    "upper-alpha",
+    "upper-latin",
+    "cjk-earthly-branch",
+    "cjk-heavenly-stem",
+    "lower-greek",
+    "hiragana",
+    "hiragana-iroha",
+    "katakana",
+    "katakana-iroha",
+    "disc",
+    "circle",
+    "square",
+    "disclosure-open",
+    "disclosure-closed",
+    "japanese-informal",
+    "japanese-formal",
+    "korean-hangul-formal",
+    "korean-hanja-informal",
+    "korean-hanja-formal",
+    "simp-chinese-informal",
+    "simp-chinese-formal",
+    "trad-chinese-informal",
+    "trad-chinese-formal",
+    "cjk-ideographic",
+    "ethiopic-numeric",
+}

dom/Cargo.toml

@@ -1,10 +1,13 @@
 [package]
-name = "dom"
-version = "0.0.1"
+name = "stylo_dom"
+version = "0.1.0"
 authors = ["The Servo Project Developers"]
+documentation = "https://docs.rs/stylo_dom/"
+description = "Support crate for Stylo CSS engine"
+repository = "https://github.com/servo/stylo"
+keywords = ["css", "style"]
 license = "MPL-2.0"
 edition = "2021"
-publish = false
 
 [lib]
 path = "lib.rs"

malloc_size_of/Cargo.toml

@@ -1,10 +1,13 @@
 [package]
-name = "malloc_size_of"
-version = "0.0.1"
+name = "stylo_malloc_size_of"
+version = "0.1.1"
 authors = ["The Servo Project Developers"]
-license = "MIT OR Apache-2.0"
+documentation = "https://docs.rs/stylo_malloc_size_of/"
+description = "Support crate for Stylo CSS engine"
 repository = "https://github.com/servo/stylo"
-publish = false
+keywords = ["css", "style"]
+license = "MIT OR Apache-2.0"
+edition = "2021"
 
 [lib]
 path = "lib.rs"
@@ -22,7 +25,6 @@ servo = [
     "string_cache",
     "url",
     "uuid",
-    "webrender_api",
     "xml5ever",
 ]
 gecko = ["thin-vec/gecko-ffi"]
@@ -33,15 +35,15 @@ app_units = "0.7"
 content-security-policy = { version = "0.5", features = ["serde"], optional = true }
 crossbeam-channel = { version = "0.5", optional = true }
 cssparser = "0.34"
-dom = { path = "../dom" }
+dom = { path = "../dom", version = "0.1", package = "stylo_dom" }
 euclid = "0.22"
 http = { version = "0.2", optional = true }
 indexmap = { version = "2.2", optional = true }
 keyboard-types = { version = "0.7", optional = true }
-selectors = { path = "../selectors" }
+selectors = { version = "0.26", path = "../selectors", package = "stylo_selectors" }
 serde = { version = "1.0.195", optional = true }
 serde_bytes = { version = "0.11", optional = true }
-servo_arc = { path = "../servo_arc" }
+servo_arc = { path = "../servo_arc", version = "0.4", package = "stylo_arc" }
 smallbitvec = "2.3.0"
 smallvec = "1.13"
 string_cache = { version = "0.8", optional = true }
@@ -50,5 +52,4 @@ tokio = { version = "1", features = ["sync"] }
 url = { version = "2.5", features = ["serde"], optional = true }
 uuid = { version = "1.7.0", optional = true }
 void = "1.0.2"
-webrender_api = { git = "https://github.com/servo/webrender", branch = "0.65", optional = true }
 xml5ever = { version = "0.20", optional = true }

malloc_size_of/lib.rs

@@ -46,39 +46,6 @@
 //!   Note: WebRender has a reduced fork of this crate, so that we can avoid
 //!   publishing this crate on crates.io.
 
-#[cfg(feature = "servo")]
-extern crate accountable_refcell;
-extern crate app_units;
-#[cfg(feature = "servo")]
-extern crate content_security_policy;
-#[cfg(feature = "servo")]
-extern crate crossbeam_channel;
-extern crate cssparser;
-extern crate euclid;
-#[cfg(feature = "servo")]
-extern crate http;
-#[cfg(feature = "servo")]
-extern crate keyboard_types;
-extern crate selectors;
-#[cfg(feature = "servo")]
-extern crate serde;
-#[cfg(feature = "servo")]
-extern crate serde_bytes;
-extern crate servo_arc;
-extern crate smallbitvec;
-extern crate smallvec;
-#[cfg(feature = "servo")]
-extern crate string_cache;
-#[cfg(feature = "url")]
-extern crate url;
-#[cfg(feature = "servo")]
-extern crate uuid;
-extern crate void;
-#[cfg(feature = "webrender_api")]
-extern crate webrender_api;
-#[cfg(feature = "servo")]
-extern crate xml5ever;
-
 #[cfg(feature = "servo")]
 use content_security_policy as csp;
 #[cfg(feature = "servo")]
@@ -882,46 +849,6 @@ impl MallocSizeOf for url::Host {
         }
     }
 }
-#[cfg(feature = "webrender_api")]
-malloc_size_of_is_0!(webrender_api::BorderRadius);
-#[cfg(feature = "webrender_api")]
-malloc_size_of_is_0!(webrender_api::BorderStyle);
-#[cfg(feature = "webrender_api")]
-malloc_size_of_is_0!(webrender_api::BoxShadowClipMode);
-#[cfg(feature = "webrender_api")]
-malloc_size_of_is_0!(webrender_api::ColorF);
-#[cfg(feature = "webrender_api")]
-malloc_size_of_is_0!(webrender_api::ComplexClipRegion);
-#[cfg(feature = "webrender_api")]
-malloc_size_of_is_0!(webrender_api::ExtendMode);
-#[cfg(feature = "webrender_api")]
-malloc_size_of_is_0!(webrender_api::FilterOp);
-#[cfg(feature = "webrender_api")]
-malloc_size_of_is_0!(webrender_api::ExternalScrollId);
-#[cfg(feature = "webrender_api")]
-malloc_size_of_is_0!(webrender_api::FontInstanceKey);
-#[cfg(feature = "webrender_api")]
-malloc_size_of_is_0!(webrender_api::GradientStop);
-#[cfg(feature = "webrender_api")]
-malloc_size_of_is_0!(webrender_api::GlyphInstance);
-#[cfg(feature = "webrender_api")]
-malloc_size_of_is_0!(webrender_api::NinePatchBorder);
-#[cfg(feature = "webrender_api")]
-malloc_size_of_is_0!(webrender_api::ImageKey);
-#[cfg(feature = "webrender_api")]
-malloc_size_of_is_0!(webrender_api::ImageRendering);
-#[cfg(feature = "webrender_api")]
-malloc_size_of_is_0!(webrender_api::LineStyle);
-#[cfg(feature = "webrender_api")]
-malloc_size_of_is_0!(webrender_api::MixBlendMode);
-#[cfg(feature = "webrender_api")]
-malloc_size_of_is_0!(webrender_api::NormalBorder);
-#[cfg(feature = "webrender_api")]
-malloc_size_of_is_0!(webrender_api::RepeatMode);
-#[cfg(feature = "webrender_api")]
-malloc_size_of_is_0!(webrender_api::StickyOffsetBounds);
-#[cfg(feature = "webrender_api")]
-malloc_size_of_is_0!(webrender_api::TransformStyle);
 
 #[cfg(feature = "servo")]
 impl MallocSizeOf for keyboard_types::Key {

selectors/Cargo.toml

@@ -1,9 +1,9 @@
 [package]
-name = "selectors"
-version = "0.25.0"
+name = "stylo_selectors"
+version = "0.26.0"
 authors = ["The Servo Project Developers"]
-documentation = "https://docs.rs/selectors/"
-description = "CSS Selectors matching for Rust"
+documentation = "https://docs.rs/stylo_selectors/"
+description = "Temporary fork of the selectors crate for Stylo"
 repository = "https://github.com/servo/stylo"
 readme = "README.md"
 keywords = ["css", "selectors"]
@@ -12,7 +12,7 @@ edition = "2021"
 build = "build.rs"
 
 [lib]
-name = "selectors"
+name = "stylo_selectors"
 path = "lib.rs"
 
 [features]
@@ -27,10 +27,10 @@ fxhash = "0.2"
 log = "0.4"
 phf = "0.11"
 precomputed-hash = "0.1"
-servo_arc = { version = "0.4", path = "../servo_arc" }
+servo_arc = { version = "0.4", path = "../servo_arc", package = "stylo_arc" }
 smallvec = "1.0"
-to_shmem = { version = "0.1", path = "../to_shmem", features = ["servo_arc"], optional = true }
-to_shmem_derive = { version = "0.1", path = "../to_shmem_derive", optional = true }
+to_shmem = { version = "0.1", path = "../to_shmem", package = "stylo_to_shmem", features = ["servo_arc"], optional = true }
+to_shmem_derive = { version = "0.1", path = "../to_shmem_derive", package = "stylo_to_shmem_derive", optional = true }
 new_debug_unreachable = "1"
 
 [build-dependencies]

servo_arc/Cargo.toml

@@ -1,14 +1,15 @@
 [package]
-name = "servo_arc"
+name = "stylo_arc"
 version = "0.4.0"
 authors = ["The Servo Project Developers"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/servo/stylo"
+documentation = "https://docs.rs/stylo_arc/"
 description = "A fork of std::sync::Arc with some extra functionality and without weak references"
 edition = "2021"
 
 [lib]
-name = "servo_arc"
+name = "stylo_arc"
 path = "lib.rs"
 
 [features]

style/Cargo.toml

@@ -1,23 +1,25 @@
 [package]
-name = "style"
-version = "0.0.1"
+name = "stylo"
+version = "0.1.0"
 authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
+documentation = "https://docs.rs/stylo/"
+description = "The Stylo CSS engine (used in Servo and Gecko)"
 repository = "https://github.com/servo/stylo"
-publish = false
-
+keywords = ["css", "style"]
+license = "MPL-2.0"
 build = "build.rs"
 edition = "2018"
 
 # https://github.com/rust-lang/cargo/issues/3544
 links = "servo_style_crate"
 
 [lib]
-name = "style"
+name = "stylo"
 path = "lib.rs"
 doctest = false
 
 [features]
+default = ["servo"]
 gecko = [
     "bindgen",
     "malloc_size_of/gecko",
@@ -58,7 +60,7 @@ bitflags = "2"
 byteorder = "1.0"
 cssparser = "0.34"
 derive_more = { version = "0.99", default-features = false, features = ["add", "add_assign", "deref", "deref_mut", "from"] }
-dom = { path = "../dom" }
+dom = { path = "../dom", version = "0.1", package = "stylo_dom" }
 new_debug_unreachable = "1.0"
 encoding_rs = {version = "0.8", optional = true}
 euclid = "0.22"
@@ -69,7 +71,7 @@ itertools = "0.10"
 itoa = "1.0"
 lazy_static = "1"
 log = "0.4"
-malloc_size_of = { path = "../malloc_size_of" }
+malloc_size_of = { version = "0.1", path = "../malloc_size_of", package = "stylo_malloc_size_of" }
 malloc_size_of_derive = "0.1"
 markup5ever = { version = "0.14", optional = true }
 matches = "0.1"
@@ -82,20 +84,20 @@ parking_lot = "0.12"
 precomputed-hash = "0.1.1"
 rayon = "1"
 rayon-core = "1"
-selectors = { path = "../selectors" }
+selectors = { version = "0.26", path = "../selectors", package = "stylo_selectors" }
 serde = {version = "1.0", optional = true, features = ["derive"]}
-servo_arc = { path = "../servo_arc" }
-servo_atoms = {path = "../atoms", optional = true}
+servo_arc = { path = "../servo_arc", version = "0.4", package = "stylo_arc" }
+servo_atoms = { version = "0.1", path = "../atoms", package = "stylo_atoms", optional = true}
 smallbitvec = "2.3.0"
 smallvec = "1.0"
 static_assertions = "1.1"
-static_prefs = { path = "../style_static_prefs" }
+static_prefs = { version = "0.1", path = "../style_static_prefs", package = "stylo_static_prefs" }
 string_cache = { version = "0.8", optional = true }
-style_config = { path = "../style_config", optional = true }
-style_derive = {path = "../style_derive"}
-style_traits = {path = "../style_traits"}
-to_shmem = {path = "../to_shmem"}
-to_shmem_derive = {path = "../to_shmem_derive"}
+style_config = { version = "0.1", path = "../style_config", package = "stylo_config", optional = true }
+style_derive = { version = "0.1", path = "../style_derive", package = "stylo_derive" }
+style_traits = { version = "0.1", path = "../style_traits", package = "stylo_traits" }
+to_shmem = { version = "0.1", path = "../to_shmem", package = "stylo_to_shmem"}
+to_shmem_derive = { version = "0.1", path = "../to_shmem_derive", package = "stylo_to_shmem_derive"}
 thin-vec = "0.2.1"
 uluru = "3.0"
 unicode-bidi = { version = "0.3", default-features = false }