improvements

Cargo.toml

@@ -23,8 +23,9 @@ proptest = "1.4.0"
 criterion = "0.5.1"
 
 [[bench]]
-name = "benches"
+name = "variation"
 harness = false
 
-[features]
-samples = []
+[[bench]]
+name = "pgn"
+harness = false

benches/pgn.rs

@@ -1,11 +1,11 @@
 use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
-use rpgn::pgn::samples::*;
-use rpgn::{Pgn, Turn};
+use rpgn::samples::pgn_samples;
+use rpgn::Pgn;
 
 pub fn to_pgn(c: &mut Criterion) {
     let mut group = c.benchmark_group("to_pgn");
 
-    for pgn in samples().iter().filter_map(|s| s.parsed.as_ref().ok()) {
+    for pgn in pgn_samples().iter().filter_map(|s| s.parsed.as_ref().ok()) {
         let turns = pgn.root_variation.as_ref().unwrap().turns();
         let mut id = String::with_capacity(5 * 2 + 1);
 
@@ -24,7 +24,7 @@ pub fn to_pgn(c: &mut Criterion) {
 pub fn from_pgn(c: &mut Criterion) {
     let mut group = c.benchmark_group("from_pgn");
 
-    for (pgn_string, pgn) in samples()
+    for (pgn_string, pgn) in pgn_samples()
         .iter()
         .filter_map(|s| s.parsed.as_ref().ok().map(|p| (s.string, p)))
     {

benches/variation.rs

@@ -1,10 +1,10 @@
-use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion, black_box};
+use criterion::{black_box, criterion_group, criterion_main, BenchmarkId, Criterion};
 use rpgn::samples::*;
 use rpgn::{Pgn, Turn};
 
 pub fn construct(c: &mut Criterion) {
     let mut group = c.benchmark_group("construct");
-    
+
     for var in variation_sample_fns() {
         let turns = var().turns();
         let mut id = String::with_capacity(4 * 2 + 1);
@@ -17,7 +17,7 @@ pub fn construct(c: &mut Criterion) {
             b.iter(|| black_box(var()))
         });
     }
-    
+
     group.finish()
 }
 
@@ -33,13 +33,17 @@ pub fn read_positions(c: &mut Criterion) {
         id.push('-');
         id.push_str(&turns.last().unwrap().r#move().to_string().replace('-', ""));
 
-        group.bench_with_input(BenchmarkId::from_parameter(id), &(turns, var), |b, (turns, var)| {
-            b.iter(|| {
-                for i in 0..turns.len() {
-                    let _ = var.get_position(i);
-                }
-            })
-        });
+        group.bench_with_input(
+            BenchmarkId::from_parameter(id),
+            &(turns, var),
+            |b, (turns, var)| {
+                b.iter(|| {
+                    for i in 0..turns.len() {
+                        let _ = var.get_position(i);
+                    }
+                })
+            },
+        );
     }
 
     group.finish();

src/lib.rs

@@ -40,6 +40,5 @@ dry_mods::mods! {
     time_control_field;
     pub mod pgn;
 }
-#[cfg(feature = "samples")]
 pub mod samples;
 pub use pgn::{Pgn, PgnParseError};

src/pgn/mod.rs

@@ -1,5 +1,4 @@
 mod visitor;
-pub use visitor::PgnSanError;
 dry_mods::mods! {
     mod pub use pgn,
     date,

src/pgn/pgn.rs

@@ -1,7 +1,7 @@
 use std::fmt::{Display, Formatter, Write};
 use std::io::Read;
 use pgn_reader::BufferedReader;
-use super::visitor::{Visitor, PgnSanError};
+use super::visitor::Visitor;
 use crate::{Eco, pgn::{Outcome, Date, Round}, Variation, VariationSanPlayError};
 
 #[derive(Clone, Debug, PartialEq, Eq)]

src/pgn/visitor.rs

@@ -1,7 +1,7 @@
 use pgn_reader::{RawHeader, Skip};
 use std::str::FromStr;
 use shakmaty::Chess;
-use shakmaty::san::{SanError, SanPlus};
+use shakmaty::san::SanPlus;
 use crate::{Variation, Eco, pgn::{Date, Round, Outcome, Pgn}, TurnsCapacity, VariationsCapacity, VariationSanPlayError};
 
 pub(super) struct Visitor {