chore: Move xml code from core to ruffle_common

Author: Lord-McSweeney

Cargo.lock

@@ -75,6 +75,8 @@ num-traits = "0.2.19"
 serde = "1.0.228"
 thiserror = "2.0.17"
 url = "2.5.7"
+quick-xml = "0.37.5"
+regress = { git = "https://github.com/ruffle-rs/regras3", rev = "5fcb02513c5ab4e00df4346459f5a8d0521d8fed" }
 # Make sure to match wasm-bindgen-cli version to this everywhere.
 wasm-bindgen = "=0.2.101"
 walkdir = "2.5.0"

Cargo.toml

@@ -30,7 +30,7 @@ bitflags = { workspace = true }
 smallvec = { workspace = true }
 num-traits = { workspace = true }
 num-derive = { workspace = true }
-quick-xml = "0.37.5"
+quick-xml = { workspace = true }
 url = { workspace = true }
 weak-table = "0.3.2"
 percent-encoding = { workspace = true }
@@ -42,7 +42,7 @@ rand = { version = "0.9.1", features = ["std", "os_rng"], default-features = fal
 serde = { workspace = true }
 serde_json = { workspace = true, features = ["preserve_order"] }
 nellymoser-rs = { git = "https://github.com/ruffle-rs/nellymoser", rev = "073eb48d907201f46dea0c8feb4e8d9a1d92208c", optional = true }
-regress = { git = "https://github.com/ruffle-rs/regras3", rev = "5fcb02513c5ab4e00df4346459f5a8d0521d8fed" }
+regress = { workspace = true }
 flash-lso = { git = "https://github.com/ruffle-rs/rust-flash-lso", rev = "998f47c926b9986aabd518fbb7394ff56936d0b0" }
 lzma-rs = { workspace = true, optional = true }
 dasp = { version = "0.11.0", features = ["interpolate", "interpolate-linear", "signal"], optional = true }

core/Cargo.toml

@@ -14,6 +14,8 @@ workspace = true
 hashbrown = { workspace = true }
 fnv = { workspace = true }
 gc-arena = { workspace = true }
+quick-xml = { workspace = true }
+regress = { workspace = true }
 ruffle_macros = { path = "../macros" }
 ruffle_wstr = { path = "../../wstr" }
 swf = { path = "../../swf" }

core/common/Cargo.toml

@@ -4,3 +4,4 @@ pub mod avm_string;
 pub mod buffer;
 pub mod sandbox;
 pub mod utils;
+pub mod xml;

core/common/src/lib.rs

@@ -9,13 +9,13 @@ use crate::avm1::{Activation, Attribute, Error, NativeObject, Object, Value};
 use crate::avm_warn;
 use crate::backend::navigator::Request;
 use crate::string::{AvmString, StringContext, WStr, WString};
-use crate::xml::custom_unescape;
 use gc_arena::barrier::unlock;
 use gc_arena::lock::Lock;
 use gc_arena::{Collect, Gc};
 use quick_xml::errors::IllFormedError;
 use quick_xml::events::attributes::AttrError;
 use quick_xml::{events::Event, Reader};
+use ruffle_common::xml::custom_unescape;
 use ruffle_macros::istr;
 
 #[derive(Clone, Copy, Collect)]

core/src/xml.rs renamed to core/common/src/xml.rs

@@ -10,6 +10,7 @@ use gc_arena::{
 };
 use quick_xml::escape::escape;
 use quick_xml::events::BytesStart;
+use ruffle_common::xml::custom_unescape;
 use ruffle_macros::istr;
 use std::cell::RefMut;
 use std::fmt;
@@ -92,7 +93,7 @@ impl<'gc> XmlNode<'gc> {
         let attributes = attributes?;
         for attribute in attributes.iter().rev() {
             let key = AvmString::new_utf8_bytes(activation.gc(), attribute.key.into_inner());
-            let value_str = crate::xml::custom_unescape(&attribute.value, decoder)?;
+            let value_str = custom_unescape(&attribute.value, decoder)?;
             let value = AvmString::new_utf8_bytes(activation.gc(), value_str.as_bytes());
 
             // Insert an attribute.

core/src/avm1/globals/xml.rs

@@ -3,7 +3,6 @@ use crate::avm2::function::FunctionArgs;
 use crate::avm2::object::{E4XOrXml, FunctionObject, NamespaceObject};
 use crate::avm2::{Activation, Error, Multiname, Value};
 use crate::string::{AvmString, StringContext, WStr, WString};
-use crate::xml::custom_unescape;
 
 use gc_arena::barrier::unlock;
 use gc_arena::{
@@ -17,6 +16,7 @@ use quick_xml::{
     name::ResolveResult,
     Error as XmlError, NsReader,
 };
+use ruffle_common::xml::custom_unescape;
 use ruffle_macros::istr;
 
 use std::cell::{Ref, RefMut};

core/src/avm1/xml/tree.rs

@@ -47,7 +47,6 @@ pub mod tag_utils;
 pub mod timer;
 mod types;
 mod vminterface;
-mod xml;
 
 pub mod backend;
 pub mod compatibility_rules;