Skip to content

Commit

Permalink
feat(stream): Add strip_str
Browse files Browse the repository at this point in the history
  • Loading branch information
epage committed Mar 7, 2023
1 parent 28bf7e4 commit d6dbbbc
Show file tree
Hide file tree
Showing 9 changed files with 3,737 additions and 2 deletions.
32 changes: 31 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions crates/anstyle-stream/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,14 @@ pre-release-replacements = [

[dependencies]
anstyle = { version = "0.2.5", path = "../anstyle" }
anstyle-parse = { version = "0.1.0", path = "../anstyle-parse", default-features = false }

[dev-dependencies]
criterion = "0.4.0"
proptest = "1.1.0"
strip-ansi-escapes = "0.1.1"
anstyle-parse = { version = "0.1.0", path = "../anstyle-parse", default-features = false, features = ["utf8"] }

[[bench]]
name = "strip"
harness = false
91 changes: 91 additions & 0 deletions crates/anstyle-stream/benches/strip.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
use criterion::{black_box, Criterion};

#[derive(Default)]
struct Strip(String);
impl Strip {
fn with_capacity(capacity: usize) -> Self {
Self(String::with_capacity(capacity))
}
}
impl anstyle_parse::Perform for Strip {
fn print(&mut self, c: char) {
self.0.push(c);
}

fn execute(&mut self, byte: u8) {
if byte.is_ascii_whitespace() {
self.0.push(byte as char);
}
}
}

fn strip(c: &mut Criterion) {
for (name, content) in [
#[cfg(feature = "utf8")]
("demo.vte", &include_bytes!("../tests/demo.vte")[..]),
("rg_help.vte", &include_bytes!("../tests/rg_help.vte")[..]),
("rg_linus.vte", &include_bytes!("../tests/rg_linus.vte")[..]),
(
"state_changes",
&b"\x1b]2;X\x1b\\ \x1b[0m \x1bP0@\x1b\\"[..],
),
] {
// Make sure the comparison is fair
if let Ok(content) = std::str::from_utf8(content) {
let mut stripped = Strip::with_capacity(content.len());
let mut parser = anstyle_parse::Parser::<anstyle_parse::DefaultCharAccumulator>::new();
for byte in content.as_bytes() {
parser.advance(&mut stripped, *byte);
}
assert_eq!(
stripped.0,
anstyle_stream::adapter::strip_str(content).to_string()
);
}

let mut group = c.benchmark_group(name);
group.bench_function("advance_strip", |b| {
b.iter(|| {
let mut stripped = Strip::with_capacity(content.len());
let mut parser =
anstyle_parse::Parser::<anstyle_parse::DefaultCharAccumulator>::new();

for byte in content {
parser.advance(&mut stripped, *byte);
}

black_box(stripped.0)
})
});
group.bench_function("strip_ansi_escapes", |b| {
b.iter(|| {
let stripped = strip_ansi_escapes::strip(content).unwrap();

black_box(stripped)
})
});
if let Ok(content) = std::str::from_utf8(content) {
group.bench_function("strip_str", |b| {
b.iter(|| {
let stripped = anstyle_stream::adapter::strip_str(content).to_string();

black_box(stripped)
})
});
group.bench_function("StripStr", |b| {
b.iter(|| {
let mut stripped = String::with_capacity(content.len());
let mut state = anstyle_stream::adapter::StripStr::new();
for printable in state.strip_next(content) {
stripped.push_str(printable);
}

black_box(stripped)
})
});
}
}
}

criterion::criterion_group!(benches, strip);
criterion::criterion_main!(benches);
8 changes: 8 additions & 0 deletions crates/anstyle-stream/src/adapter/mod.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
//! Gracefully degrade styled output

mod strip;

pub use strip::strip_str;
pub use strip::StripStr;
pub use strip::StripStrIter;
pub use strip::StrippedStr;
Loading

0 comments on commit d6dbbbc

Please sign in to comment.