From 0cc92c974400b97d25d9692d1b8aba0ea935c164 Mon Sep 17 00:00:00 2001 From: FredApps <153173854+FredApps@users.noreply.github.com> Date: Sat, 14 Nov 2026 13:29:49 +0100 Subject: [PATCH] #6040: pin merged feature catalogs and handle escaped character literals --- craft-i18n.rev | 2 +- crates/ui-egui/tests/display_names.rs | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/craft-i18n.rev b/craft-i18n.rev index 3bd45d9a0d..b91ff589cd 100644 --- a/craft-i18n.rev +++ b/craft-i18n.rev @@ -1 +1 @@ -1e515422afdda2f317af430c1f9d68a5f83935b4 +e56d26244bbac099bfd42e23fb12f78a4be418a7 diff --git a/crates/ui-egui/tests/display_names.rs b/crates/ui-egui/tests/display_names.rs index 77b325e82d..72dc7feaee 100644 --- a/crates/ui-egui/tests/display_names.rs +++ b/crates/ui-egui/tests/display_names.rs @@ -94,6 +94,8 @@ fn literals(source: &str) -> Vec { if !test_module { out.push(text); } + } else if chars[at] == '\'' && chars.get(at + 1) == Some(&'\\') && chars.get(at + 3) == Some(&'\'') { + at += 4; // An escaped character literal must not start a string. } else if chars[at] == '\'' && chars.get(at + 2) == Some(&'\'') { at += 3; // A character literal such as '"', not the start of a string. } else { @@ -181,3 +183,11 @@ fn guard_scans_production_after_test_only_items_and_parses_raw_labels() { assert!(literals(source).iter().any(|label| banned_display(label))); assert_eq!(literals("#[cfg(test)] mod tests; fn live() { let _ = \"SmartArt\"; }"), ["SmartArt"]); } + +#[test] +fn guard_skips_escaped_character_literals_without_hiding_labels() { + let source = r#"let quote = '\"'; let label = "WordArt"; // "ignored""#; + assert_eq!(literals(source), ["WordArt"]); + assert!(literals(source).iter().any(|label| banned_display(label))); + assert_eq!(literals(r#"let quote = '\"'; // "WordArt""#), Vec::::new()); +}