pep/xmpp-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tokio-xmpp: Improve highlight_xml()

Browse source 
First switch to LazyLock from OnceLock, to simplify the code.

Then concatenate the colour reset escape code instead of using
format!(), since the vast majority of those strings have more capacity
than their length it will avoid a reallocation in most cases.
This commit is contained in:
Emmanuel Gil Peyrot 2024-09-01 12:30:18 +02:00
parent 263839a5f8
commit 425be4bef4
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
tokio-xmpp/src/xmlstream/mod.rs
View file

@ -62,7 +62,7 @@ use core::pin::Pin;
use core::task::{Context, Poll}; use core::task::{Context, Poll};
use std::io; use std::io;
#[cfg(feature = "syntax-highlighting")] #[cfg(feature = "syntax-highlighting")]
use std::sync::OnceLock; use std::sync::LazyLock;
use futures::{ready, Sink, SinkExt, Stream}; use futures::{ready, Sink, SinkExt, Stream};
@ -85,25 +85,25 @@ pub use self::responder::{AcceptedStream, PendingFeaturesSend};
pub use self::xmpp::XmppStreamElement; pub use self::xmpp::XmppStreamElement;
#[cfg(feature = "syntax-highlighting")] #[cfg(feature = "syntax-highlighting")]
static PS: OnceLock<syntect::parsing::SyntaxSet> = OnceLock::new(); static PS: LazyLock<syntect::parsing::SyntaxSet> =
LazyLock::new(syntect::parsing::SyntaxSet::load_defaults_newlines);
#[cfg(feature = "syntax-highlighting")] #[cfg(feature = "syntax-highlighting")]
static SYNTAX: OnceLock<syntect::parsing::SyntaxReference> = OnceLock::new(); static SYNTAX: LazyLock<&syntect::parsing::SyntaxReference> =
LazyLock::new(|| PS.find_syntax_by_extension("xml").unwrap());
#[cfg(feature = "syntax-highlighting")] #[cfg(feature = "syntax-highlighting")]
static THEME: OnceLock<syntect::highlighting::Theme> = OnceLock::new(); static THEME: LazyLock<syntect::highlighting::Theme> = LazyLock::new(|| {
syntect::highlighting::ThemeSet::load_defaults().themes["Solarized (dark)"].clone()
});
#[cfg(feature = "syntax-highlighting")] #[cfg(feature = "syntax-highlighting")]
fn highlight_xml(xml: &str) -> String { fn highlight_xml(xml: &str) -> String {
let ps = PS.get_or_init(syntect::parsing::SyntaxSet::load_defaults_newlines); let mut h = syntect::easy::HighlightLines::new(&SYNTAX, &THEME);
let mut h = syntect::easy::HighlightLines::new( let ranges: Vec<_> = h.highlight_line(&xml, &PS).unwrap();
SYNTAX.get_or_init(|| ps.find_syntax_by_extension("xml").unwrap().clone()), let mut escaped = syntect::util::as_24_bit_terminal_escaped(&ranges[..], false);
THEME.get_or_init(|| { escaped += "\x1b[0m";
syntect::highlighting::ThemeSet::load_defaults().themes["Solarized (dark)"].clone() escaped
}),
);
let ranges: Vec<_> = h.highlight_line(&xml, ps).unwrap();
let escaped = syntect::util::as_24_bit_terminal_escaped(&ranges[..], false);
format!("{}\x1b[0m", escaped)
} }
struct LogXsoBuf<'x>(&'x [u8]); struct LogXsoBuf<'x>(&'x [u8]);