migrate to sauron 0.27

6 files changed, 15 insertions, 6 deletions

diff --git a/Cargo.toml b/Cargo.toml
index 59e188d..d430286 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,3 +3,7 @@ members = [
     "svgbob",
     "svgbob_cli",
 ]
+
+[patch.crates-io]
+sauron = { path = "../sauron" }
+
diff --git a/svgbob/Cargo.toml b/svgbob/Cargo.toml
index 2b70f02..3e2675e 100644
--- a/svgbob/Cargo.toml
+++ b/svgbob/Cargo.toml
@@ -13,12 +13,10 @@ license = "Apache-2.0"
 nalgebra = "0.18.0"
 ncollide2d = "0.19.1"
 lazy_static = "1.3.0"
-sauron = { version = "0.24.0", default-features = false}
+sauron = { version = "0.27.0", default-features = false}
 unicode-width = "0.1.5"
 itertools = "0.8.0"
 pom = { version = "3.1.0" }
 
 [features]
 with-dom = ["sauron/with-dom"]
-
-
diff --git a/svgbob/src/buffer/fragment_buffer/fragment/circle.rs b/svgbob/src/buffer/fragment_buffer/fragment/circle.rs
index 03a7e65..7edb926 100644
--- a/svgbob/src/buffer/fragment_buffer/fragment/circle.rs
+++ b/svgbob/src/buffer/fragment_buffer/fragment/circle.rs
@@ -2,6 +2,7 @@ use crate::{fragment::Bounds, util, Cell, Point};
 use std::{cmp::Ordering, fmt};
 
 use sauron::{
+    html::attributes::*,
     svg::{attributes::*, *},
     Node,
 };
diff --git a/svgbob/src/buffer/fragment_buffer/fragment/line.rs b/svgbob/src/buffer/fragment_buffer/fragment/line.rs
index f51eb27..122c993 100644
--- a/svgbob/src/buffer/fragment_buffer/fragment/line.rs
+++ b/svgbob/src/buffer/fragment_buffer/fragment/line.rs
@@ -15,6 +15,7 @@ use std::{cmp::Ordering, fmt};
 
 use crate::fragment::Arc;
 use sauron::{
+    html::attributes::*,
     svg,
     svg::{attributes::*, *},
     Node,
diff --git a/svgbob/src/buffer/fragment_buffer/fragment/polygon.rs b/svgbob/src/buffer/fragment_buffer/fragment/polygon.rs
index ce82ae4..dc0f1b3 100644
--- a/svgbob/src/buffer/fragment_buffer/fragment/polygon.rs
+++ b/svgbob/src/buffer/fragment_buffer/fragment/polygon.rs
@@ -9,6 +9,7 @@ use crate::{
 use nalgebra::Point2;
 use ncollide2d::shape::{shape::Shape, Polyline};
 use sauron::{
+    html::attributes::*,
     svg::{attributes::*, *},
     Node,
 };
diff --git a/svgbob/src/lib.rs b/svgbob/src/lib.rs
index c8b118e..92fea4a 100644
--- a/svgbob/src/lib.rs
+++ b/svgbob/src/lib.rs
@@ -10,18 +10,22 @@ pub use buffer::{
     Signal,
 };
 pub use point::Point;
-pub use sauron::Node;
+pub use sauron::{Node, Render};
 
 /// convert svgbob ascii art to svg
 pub fn to_svg(ascii: &str) -> String {
     let cb = CellBuffer::from(ascii);
     let node: Node<()> = cb.get_node();
-    node.to_string()
+    let mut buffer = String::new();
+    node.render(&mut buffer).expect("must render");
+    buffer
 }
 
 /// convert ascii art into an svg
 pub fn to_svg_with_settings(ascii: &str, settings: &Settings) -> String {
     let cb = CellBuffer::from(ascii);
     let (node, _w, _h): (Node<()>, f32, f32) = cb.get_node_with_size(settings);
-    node.to_string()
+    let mut buffer = String::new();
+    node.render(&mut buffer).expect("must render");
+    buffer
 }