From c9e13984e3d48b2a7edc9ee4bac7bfdc365ecfe2 Mon Sep 17 00:00:00 2001 From: Jonathan Kelley Date: Fri, 23 Dec 2022 18:27:53 -0500 Subject: [PATCH] chore: use safe span split --- packages/rsx/src/lib.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/rsx/src/lib.rs b/packages/rsx/src/lib.rs index 5caebdbef..60404d84e 100644 --- a/packages/rsx/src/lib.rs +++ b/packages/rsx/src/lib.rs @@ -114,11 +114,10 @@ impl<'a> ToTokens for TemplateRenderer<'a> { }; let spndbg = format!("{:?}", self.roots[0].span()); - let root_col = if spndbg.len() >= 9 { - spndbg[9..].split("..").next().unwrap() - } else { - "" - }; + let root_col = spndbg + .rsplit_once("..") + .and_then(|(_, after)| after.split_once(')').map(|(before, _)| before)) + .unwrap_or_default(); let root_printer = self.roots.iter().enumerate().map(|(idx, root)| { context.current_path.push(idx as u8);