Skip to content

A set of tiny fixes and improvements #658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 27, 2023
Merged

A set of tiny fixes and improvements #658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
efd5419
Add missing use of pretty_assertions::assert_eq
Mingun Sep 21, 2023
f75dd5d
Make test `async-tokio` more test-oriented: check the number of events
Mingun Sep 22, 2023
d1b7e51
Correctly use is_whitespace instead of is_ascii_whitespace
Mingun Sep 26, 2023
ffc3215
Remove unnecessary calls for setup parser behavior
Mingun Nov 6, 2022
a881551
Rename `Parser` to `ReaderState` because it is better reflects its pu…
Mingun Sep 25, 2023
7223c3f
Create deserializer via a helper that logs parsed XML
Mingun Jun 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 10 additions & 20 deletions benches/microbenches.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ fn read_event(c: &mut Criterion) {
group.bench_function("trim_text = false", |b| {
b.iter(|| {
let mut r = Reader::from_str(SAMPLE);
r.check_end_names(false).check_comments(false);
r.check_end_names(false);
let mut count = criterion::black_box(0);
loop {
match r.read_event() {
Expand All @@ -49,9 +49,7 @@ fn read_event(c: &mut Criterion) {
group.bench_function("trim_text = true", |b| {
b.iter(|| {
let mut r = Reader::from_str(SAMPLE);
r.check_end_names(false)
.check_comments(false)
.trim_text(true);
r.trim_text(true).check_end_names(false);
let mut count = criterion::black_box(0);
loop {
match r.read_event() {
Expand All @@ -76,7 +74,7 @@ fn read_resolved_event_into(c: &mut Criterion) {
group.bench_function("trim_text = false", |b| {
b.iter(|| {
let mut r = NsReader::from_str(SAMPLE);
r.check_end_names(false).check_comments(false);
r.check_end_names(false);
let mut count = criterion::black_box(0);
loop {
match r.read_resolved_event() {
Expand All @@ -95,9 +93,7 @@ fn read_resolved_event_into(c: &mut Criterion) {
group.bench_function("trim_text = true", |b| {
b.iter(|| {
let mut r = NsReader::from_str(SAMPLE);
r.check_end_names(false)
.check_comments(false)
.trim_text(true);
r.trim_text(true).check_end_names(false);
let mut count = criterion::black_box(0);
loop {
match r.read_resolved_event() {
Expand All @@ -124,9 +120,7 @@ fn one_event(c: &mut Criterion) {
b.iter(|| {
let mut r = Reader::from_str(&src);
let mut nbtxt = criterion::black_box(0);
r.check_end_names(false)
.check_comments(false)
.trim_text(true);
r.trim_text(true).check_end_names(false);
match r.read_event() {
Ok(Event::Start(ref e)) => nbtxt += e.len(),
something_else => panic!("Did not expect {:?}", something_else),
Expand All @@ -141,9 +135,7 @@ fn one_event(c: &mut Criterion) {
b.iter(|| {
let mut r = Reader::from_str(&src);
let mut nbtxt = criterion::black_box(0);
r.check_end_names(false)
.check_comments(false)
.trim_text(true);
r.trim_text(true).check_end_names(false);
match r.read_event() {
Ok(Event::Comment(e)) => nbtxt += e.unescape().unwrap().len(),
something_else => panic!("Did not expect {:?}", something_else),
Expand All @@ -158,9 +150,7 @@ fn one_event(c: &mut Criterion) {
b.iter(|| {
let mut r = Reader::from_str(&src);
let mut nbtxt = criterion::black_box(0);
r.check_end_names(false)
.check_comments(false)
.trim_text(true);
r.trim_text(true).check_end_names(false);
match r.read_event() {
Ok(Event::CData(ref e)) => nbtxt += e.len(),
something_else => panic!("Did not expect {:?}", something_else),
Expand All @@ -178,7 +168,7 @@ fn attributes(c: &mut Criterion) {
group.bench_function("with_checks = true", |b| {
b.iter(|| {
let mut r = Reader::from_str(PLAYERS);
r.check_end_names(false).check_comments(false);
r.check_end_names(false);
let mut count = criterion::black_box(0);
loop {
match r.read_event() {
Expand All @@ -199,7 +189,7 @@ fn attributes(c: &mut Criterion) {
group.bench_function("with_checks = false", |b| {
b.iter(|| {
let mut r = Reader::from_str(PLAYERS);
r.check_end_names(false).check_comments(false);
r.check_end_names(false);
let mut count = criterion::black_box(0);
loop {
match r.read_event() {
Expand All @@ -220,7 +210,7 @@ fn attributes(c: &mut Criterion) {
group.bench_function("try_get_attribute", |b| {
b.iter(|| {
let mut r = Reader::from_str(PLAYERS);
r.check_end_names(false).check_comments(false);
r.check_end_names(false);
let mut count = criterion::black_box(0);
loop {
match r.read_event() {
Expand Down
2 changes: 1 addition & 1 deletion compare/benches/bench.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ fn low_level_comparison(c: &mut Criterion) {
|b, input| {
b.iter(|| {
let mut r = Reader::from_reader(input.as_bytes());
r.check_end_names(false).check_comments(false);
r.check_end_names(false);
let mut count = criterion::black_box(0);
let mut buf = Vec::new();
loop {
Expand Down
Loading