diff --git a/Cargo.lock b/Cargo.lock index 028156746..122cd271d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6368,6 +6368,15 @@ name = "quick-xml" version = "0.37.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb" +dependencies = [ + "memchr", +] + +[[package]] +name = "quick-xml" +version = "0.38.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9845d9dccf565065824e69f9f235fafba1587031eda353c1f1561cd6a6be78f4" dependencies = [ "memchr", "tokio", @@ -9008,7 +9017,7 @@ dependencies = [ "phf 0.12.1", "png", "quartz_nbt", - "quick-xml 0.37.5", + "quick-xml 0.38.1", "rand 0.8.5", "regex", "reqwest", diff --git a/Cargo.toml b/Cargo.toml index 3eafc66a8..17dd57fa8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -103,7 +103,7 @@ phf = { version = "0.12.1", features = ["macros"] } png = "0.17.16" prometheus = "0.14.0" quartz_nbt = "0.2.9" -quick-xml = "0.37.5" +quick-xml = "0.38.1" rand = "=0.8.5" # Locked on 0.8 until argon2 and p256 update to 0.9 rand_chacha = "=0.3.1" # Locked on 0.3 until we can update rand to 0.9 redis = "0.32.4" diff --git a/packages/app-lib/src/state/process.rs b/packages/app-lib/src/state/process.rs index d8ed187e7..67be68d10 100644 --- a/packages/app-lib/src/state/process.rs +++ b/packages/app-lib/src/state/process.rs @@ -442,13 +442,13 @@ impl Process { } Ok(Event::Text(mut e)) => { if in_message || in_throwable { - if let Ok(text) = e.unescape() { + if let Ok(text) = e.xml_content() { current_content.push_str(&text); } } else if !in_event && !e.inplace_trim_end() && !e.inplace_trim_start() - && let Ok(text) = e.unescape() + && let Ok(text) = e.xml_content() && let Err(e) = Process::append_to_log_file( &log_path, &format!("{text}\n"), @@ -461,12 +461,7 @@ impl Process { } } Ok(Event::CData(e)) => { - if (in_message || in_throwable) - && let Ok(text) = e - .escape() - .map_err(|x| x.into()) - .and_then(|x| x.unescape()) - { + if (in_message || in_throwable) && let Ok(text) = e.xml_content() { current_content.push_str(&text); } }