chore(workspace): add workspace deps

a11ywatch · Oct 6, 2023 · 8e23dc0 · 8e23dc0
1 parent aeda6c3
commit 8e23dc0
Show file tree

Hide file tree

Showing 16 changed files with 20 additions and 1,452 deletions.
diff --git a/kayle_innate/Cargo.lock b/kayle_innate/Cargo.lock
diff --git a/kayle_innate/Cargo.toml b/kayle_innate/Cargo.toml
@@ -8,3 +8,8 @@ members = [
 
 [workspace.dependencies]
 smallvec = "1"
+selectors = "0.21.0"
+cssparser = "0.25.0"
+html5ever = "0.26"
+ego-tree = "0.6.2"
+lazy_static = "1.4"
diff --git a/kayle_innate/kayle_innate/Cargo.toml b/kayle_innate/kayle_innate/Cargo.toml
@@ -19,22 +19,20 @@ wasm-bindgen = { version = "0.2.87", features = ["serde-serialize"] }
 console_error_panic_hook = { version = "0.1.6", optional = true }
 wee_alloc = { version = "0.4.5", optional = true }
 url = "2.4.0"
-lazy_static = "1.4.0"
+lazy_static = { workspace = true }
 case_insensitive_string = "0.1.0"
 scraper_forky = { version = "0.17.1", features = ["main"], default-features = false, path = "../kayle_scraper" }
 getrandom = { version = "0.2", features = ["js"] }
 taffy = { version = "0.3.13", optional = true }
 serde = { version = "1.0", features = ["derive"] }
 serde-wasm-bindgen = "0.4"
 js-sys = "0.3.64"
-selectors = "=0.21.0"
+selectors = { workspace = true }
 smallvec = { workspace = true }
-ego-tree = "0.6.2"
+ego-tree = { workspace = true }
 victor_tree = { version = "0.0.7", path = "../kayle_victor/victor" }
 markup5ever = "0.11.0"
-
-[dependencies.cssparser]
-version = "^0.25.0"
+cssparser = { workspace = true }
 
 [dev-dependencies]
 wasm-bindgen-test = "0.3.37"

diff --git a/kayle_innate/kayle_scraper/Cargo.toml b/kayle_innate/kayle_scraper/Cargo.toml
@@ -15,10 +15,10 @@ repository = "https://github.com/causal-agent/scraper"
 readme = "README.md"
 
 [dependencies]
-cssparser = "0.25.0"
-ego-tree = "0.6.2"
-html5ever = "0.26"
-selectors = "0.21.0"
+cssparser = { workspace = true }
+ego-tree = { workspace = true }
+html5ever = { workspace = true }
+selectors = { workspace = true }
 smallvec = "0.6.14"
 tendril = "0.4.3"
 ahash = "0.8"

diff --git a/kayle_innate/kayle_victor/victor/Cargo.toml b/kayle_innate/kayle_victor/victor/Cargo.toml
@@ -12,19 +12,18 @@ doctest = false
 
 [dependencies]
 atomic_refcell = "0.1"
-cssparser = "0.25.0"
+cssparser = { workspace = true }
 dtoa = "0.4"
 euclid = "0.19"
-html5ever = "0.26"
+html5ever = { workspace = true }
 itoa = "0.4"
-lazy_static = "1.3"
+lazy_static = { workspace = true }
 lock_api = "0.1"
 num-traits = "0.2"
-parking_lot = "0.6"
 rayon = "1"
 rayon_croissant = "0.1.1"
 scraper_forky = { version = "0.17.1", features = ["main"], default-features = false, path = "../../kayle_scraper" }
-selectors = "=0.21.0"
+selectors = { workspace = true }
 smallbitvec = "2.4"
 smallvec = { workspace = true }
 victor-tree-internal-proc-macros = {path = "../proc-macros", version = "0.0.1"}

diff --git a/kayle_innate/kayle_victor/victor/src/dom/mod.rs b/kayle_innate/kayle_victor/victor/src/dom/mod.rs
@@ -1,7 +1,6 @@
 //! This is *a* Document Object Model, but is not necessarily compatible with *the* DOM.
 
 mod html;
-mod xml;
 
 use crate::style::{StyleSet, StyleSetBuilder};
 use html5ever::{LocalName, QualName};
@@ -10,8 +9,6 @@ use std::borrow::Cow;
 use std::fmt;
 use std::iter::successors;
 
-pub use self::xml::XmlError;
-
 pub struct Document {
     pub nodes: Vec<Node>,
     pub style_elements: Vec<NodeId>,

diff --git a/kayle_innate/kayle_victor/victor/src/dom/xml.rs b/kayle_innate/kayle_victor/victor/src/dom/xml.rs
diff --git a/kayle_innate/kayle_victor/victor/src/lib.rs b/kayle_innate/kayle_victor/victor/src/lib.rs
@@ -1,25 +1,19 @@
 pub use euclid;
-
 pub mod dom;
 pub mod fonts;
-pub mod pdf;
 pub mod primitives;
 pub mod text;
-pub mod text_plain;
 
 #[macro_use]
 mod tagged_union_with_jump_tables;
 mod geom;
 pub mod layout;
-mod paint;
 pub mod style;
 
 #[macro_use]
 extern crate cssparser;
-
 #[macro_use]
 extern crate html5ever;
-
 #[macro_use]
 extern crate victor_tree_internal_proc_macros;
 

diff --git a/kayle_innate/kayle_victor/victor/src/main.rs b/kayle_innate/kayle_victor/victor/src/main.rs
@@ -6,7 +6,5 @@ fn main() -> Result<(), Box<std::error::Error>> {
     let output = next()?;
     let bytes = std::fs::read(&input)?;
     let doc = victor_tree::dom::Document::parse_html(&bytes);
-    let pdf = doc.to_pdf_bytes();
-    std::fs::write(&output, &pdf)?;
     Ok(())
 }