Switch to using refs instead of owned for autofmt write block out (#2573)
This commit is contained in:
1 parent
d4831edcf7
commit
1404d26455
8 files changed
+11
-11
No files matched your search
@@ -132,7 +132,7 @@ pub fn fmt_file(contents: &str, indent: IndentOptions) -> Vec<FormattedBlock> {
|
|||||||
formatted_blocks
|
formatted_blocks
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn write_block_out(body: CallBody) -> Option<String> {
|
pub fn write_block_out(body: &CallBody) -> Option<String> {
|
||||||
let mut buf = Writer::new("");
|
let mut buf = Writer::new("");
|
||||||
|
|
||||||
write_body(&mut buf, &body);
|
write_body(&mut buf, &body);
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ pub fn convert_html_to_formatted_rsx(dom: &Dom, component: bool) -> String {
|
|||||||
|
|
||||||
match component {
|
match component {
|
||||||
true => write_callbody_with_icon_section(callbody),
|
true => write_callbody_with_icon_section(callbody),
|
||||||
false => dioxus_autofmt::write_block_out(callbody).unwrap(),
|
false => dioxus_autofmt::write_block_out(&callbody).unwrap(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -61,7 +61,7 @@ fn write_callbody_with_icon_section(mut callbody: CallBody) -> String {
|
|||||||
|
|
||||||
rsx_rosetta::collect_svgs(&mut callbody.roots, &mut svgs);
|
rsx_rosetta::collect_svgs(&mut callbody.roots, &mut svgs);
|
||||||
|
|
||||||
let mut out = write_component_body(dioxus_autofmt::write_block_out(callbody).unwrap());
|
let mut out = write_component_body(dioxus_autofmt::write_block_out(&callbody).unwrap());
|
||||||
|
|
||||||
if !svgs.is_empty() {
|
if !svgs.is_empty() {
|
||||||
write_svg_section(&mut out, svgs);
|
write_svg_section(&mut out, svgs);
|
||||||
@@ -81,7 +81,7 @@ fn write_svg_section(out: &mut String, svgs: Vec<BodyNode>) {
|
|||||||
out.push_str("\n\nmod icons {");
|
out.push_str("\n\nmod icons {");
|
||||||
out.push_str("\n use super::*;");
|
out.push_str("\n use super::*;");
|
||||||
for (idx, icon) in svgs.into_iter().enumerate() {
|
for (idx, icon) in svgs.into_iter().enumerate() {
|
||||||
let raw = dioxus_autofmt::write_block_out(CallBody { roots: vec![icon] }).unwrap();
|
let raw = dioxus_autofmt::write_block_out(&CallBody { roots: vec![icon] }).unwrap();
|
||||||
out.push_str("\n\n pub fn icon_");
|
out.push_str("\n\n pub fn icon_");
|
||||||
out.push_str(&idx.to_string());
|
out.push_str(&idx.to_string());
|
||||||
out.push_str("() -> Element {\n rsx! {");
|
out.push_str("() -> Element {\n rsx! {");
|
||||||
|
|||||||
@@ -89,5 +89,5 @@ pub fn translate_rsx(contents: String, _component: bool) -> String {
|
|||||||
let callbody = rsx_rosetta::rsx_from_html(&dom);
|
let callbody = rsx_rosetta::rsx_from_html(&dom);
|
||||||
|
|
||||||
// Convert the HTML to RSX
|
// Convert the HTML to RSX
|
||||||
dioxus_autofmt::write_block_out(callbody).unwrap()
|
dioxus_autofmt::write_block_out(&callbody).unwrap()
|
||||||
}
|
}
|
||||||
@@ -18,7 +18,7 @@ fn main() {
|
|||||||
|
|
||||||
let body = rsx_rosetta::rsx_from_html(&dom);
|
let body = rsx_rosetta::rsx_from_html(&dom);
|
||||||
|
|
||||||
let out = dioxus_autofmt::write_block_out(body).unwrap();
|
let out = dioxus_autofmt::write_block_out(&body).unwrap();
|
||||||
|
|
||||||
println!("{out}");
|
println!("{out}");
|
||||||
}
|
}
|
||||||
@@ -18,7 +18,7 @@ fn h_tags_translate() {
|
|||||||
|
|
||||||
let body = rsx_rosetta::rsx_from_html(&dom);
|
let body = rsx_rosetta::rsx_from_html(&dom);
|
||||||
|
|
||||||
let out = dioxus_autofmt::write_block_out(body).unwrap();
|
let out = dioxus_autofmt::write_block_out(&body).unwrap();
|
||||||
|
|
||||||
let expected = r#"
|
let expected = r#"
|
||||||
div {
|
div {
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ fn raw_attribute() {
|
|||||||
|
|
||||||
let body = rsx_rosetta::rsx_from_html(&dom);
|
let body = rsx_rosetta::rsx_from_html(&dom);
|
||||||
|
|
||||||
let out = dioxus_autofmt::write_block_out(body).unwrap();
|
let out = dioxus_autofmt::write_block_out(&body).unwrap();
|
||||||
|
|
||||||
let expected = r#"
|
let expected = r#"
|
||||||
div {
|
div {
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ fn simple_elements() {
|
|||||||
|
|
||||||
let body = rsx_rosetta::rsx_from_html(&dom);
|
let body = rsx_rosetta::rsx_from_html(&dom);
|
||||||
|
|
||||||
let out = dioxus_autofmt::write_block_out(body).unwrap();
|
let out = dioxus_autofmt::write_block_out(&body).unwrap();
|
||||||
|
|
||||||
let expected = r#"
|
let expected = r#"
|
||||||
div {
|
div {
|
||||||
@@ -50,7 +50,7 @@ fn deeply_nested() {
|
|||||||
|
|
||||||
let body = rsx_rosetta::rsx_from_html(&dom);
|
let body = rsx_rosetta::rsx_from_html(&dom);
|
||||||
|
|
||||||
let out = dioxus_autofmt::write_block_out(body).unwrap();
|
let out = dioxus_autofmt::write_block_out(&body).unwrap();
|
||||||
|
|
||||||
let expected = r#"
|
let expected = r#"
|
||||||
div {
|
div {
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ fn web_components_translate() {
|
|||||||
|
|
||||||
let body = rsx_rosetta::rsx_from_html(&dom);
|
let body = rsx_rosetta::rsx_from_html(&dom);
|
||||||
|
|
||||||
let out = dioxus_autofmt::write_block_out(body).unwrap();
|
let out = dioxus_autofmt::write_block_out(&body).unwrap();
|
||||||
|
|
||||||
let expected = r#"
|
let expected = r#"
|
||||||
div {
|
div {
|
||||||
|
|||||||
Reference in new issue
Block a user