From fd35268a8898f17a2b22561e1dff6ea8a58bdee9 Mon Sep 17 00:00:00 2001 From: T0mstone Date: Thu, 10 Jul 2025 02:04:51 +0200 Subject: [PATCH] cleanup --- crates/typst-library/src/foundations/symbol.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/typst-library/src/foundations/symbol.rs b/crates/typst-library/src/foundations/symbol.rs index 3bc50660f..c743ea763 100644 --- a/crates/typst-library/src/foundations/symbol.rs +++ b/crates/typst-library/src/foundations/symbol.rs @@ -102,10 +102,10 @@ impl Symbol { match &self.0 { Repr::Single(value) => value, Repr::Complex(_) => ModifierSet::<&'static str>::default() - .best_match_in(self.variants().map(|(m, c, _)| (m, c))) + .best_match_in(self.variants().map(|(m, v, _)| (m, v))) .unwrap(), Repr::Modified(arc) => { - arc.1.best_match_in(self.variants().map(|(m, c, _)| (m, c))).unwrap() + arc.1.best_match_in(self.variants().map(|(m, v, _)| (m, v))).unwrap() } } } @@ -168,7 +168,7 @@ impl Symbol { /// The characters that are covered by this symbol. pub fn variants(&self) -> impl Iterator> { match &self.0 { - Repr::Single(value) => Variants::Single(Some(*value).into_iter()), + Repr::Single(value) => Variants::Single(std::iter::once(*value)), Repr::Complex(list) => Variants::Static(list.iter()), Repr::Modified(arc) => arc.0.variants(), } @@ -291,7 +291,7 @@ impl Display for Symbol { impl Debug for Repr { fn fmt(&self, f: &mut Formatter) -> fmt::Result { match self { - Self::Single(c) => Debug::fmt(c, f), + Self::Single(value) => Debug::fmt(value, f), Self::Complex(list) => list.fmt(f), Self::Modified(lists) => lists.fmt(f), } @@ -399,7 +399,7 @@ cast! { /// Iterator over variants. enum Variants<'a> { - Single(std::option::IntoIter<&'static str>), + Single(std::iter::Once<&'static str>), Static(std::slice::Iter<'static, Variant<&'static str>>), Runtime(std::slice::Iter<'a, Variant>), }