From 724d705d21ac787f3bd9333e97996e9f490564c9 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 3 Dec 2025 11:03:10 -0500 Subject: [PATCH] remove nightly features --- Cargo.lock | 13 +------------ benchmarks/Cargo.toml | 1 - benchmarks/src/lib.rs | 23 +++++++++-------------- parsing/src/lib.rs | 3 --- src/lib.rs | 11 ----------- src/main.rs | 11 ----------- 6 files changed, 10 insertions(+), 52 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 83b3a38..1b528e9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "ab_glyph" @@ -174,7 +174,6 @@ name = "benchmarks" version = "0.1.0" dependencies = [ "criterion", - "criterion-macro", "parsing", "pprof", ] @@ -570,16 +569,6 @@ dependencies = [ "walkdir", ] -[[package]] -name = "criterion-macro" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8421c08c2e60050bb24ebfb7232bdd2fcf44fa74c5777b00a71daa7d332a8164" -dependencies = [ - "proc-macro2", - "quote", -] - [[package]] name = "criterion-plot" version = "0.4.5" diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml index fe93c7e..cee3718 100644 --- a/benchmarks/Cargo.toml +++ b/benchmarks/Cargo.toml @@ -9,5 +9,4 @@ license = "AGPL-3.0" [dependencies] pprof = { version = "0.9", features = ["flamegraph"] } criterion = "0.3" -criterion-macro = "0.3" parsing = { path = "../parsing" } diff --git a/benchmarks/src/lib.rs b/benchmarks/src/lib.rs index bb32dd0..c2e7684 100644 --- a/benchmarks/src/lib.rs +++ b/benchmarks/src/lib.rs @@ -1,17 +1,10 @@ -#![feature(custom_test_frameworks)] -#![test_runner(criterion::runner)] +use parsing::{split_function_chars, SplitType}; -#[allow(unused_imports)] -use parsing::split_function_chars; - -#[allow(unused_imports)] use std::time::Duration; use std::{fs::File, os::raw::c_int, path::Path}; use criterion::profiler::Profiler; -#[allow(unused_imports)] -use criterion::{BenchmarkId, Criterion}; -use criterion_macro::criterion; +use criterion::{criterion_group, criterion_main, Criterion}; use pprof::ProfilerGuard; pub struct FlamegraphProfiler<'a> { @@ -62,7 +55,6 @@ fn custom_criterion_flamegraph() -> Criterion { custom_criterion().with_profiler(FlamegraphProfiler::new(100)) } -#[criterion(custom_criterion())] fn mutli_split_function(c: &mut Criterion) { let data_chars = vec![ "sin(x)cos(x)", @@ -86,20 +78,23 @@ fn mutli_split_function(c: &mut Criterion) { for entry in data_chars { group.bench_function(entry.iter().collect::(), |b| { b.iter(|| { - split_function_chars(&entry, parsing::suggestions::SplitType::Multiplication); + split_function_chars(&entry, SplitType::Multiplication); }) }); } group.finish(); } -// #[criterion(custom_criterion_flamegraph())] +// Uncomment to enable flamegraph profiling // fn single_split_function(c: &mut Criterion) { // let data_chars = "(2x+1)(3x+1)".chars().collect::>(); - +// // c.bench_function("split_function", |b| { // b.iter(|| { -// split_function_chars(&data_chars); +// split_function_chars(&data_chars, SplitType::Multiplication); // }); // }); // } + +criterion_group!(benches, mutli_split_function); +criterion_main!(benches); diff --git a/parsing/src/lib.rs b/parsing/src/lib.rs index dc63f86..3af4cdc 100644 --- a/parsing/src/lib.rs +++ b/parsing/src/lib.rs @@ -1,6 +1,3 @@ -#![feature(const_trait_impl)] -#![feature(const_mut_refs)] -#![feature(const_for)] mod autocomplete; mod autocomplete_hashmap; mod parsing; diff --git a/src/lib.rs b/src/lib.rs index 6236c85..1a075ae 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,14 +1,3 @@ -#![feature(const_mut_refs)] -#![feature(let_chains)] -#![feature(const_trait_impl)] -#![feature(const_fn_floating_point_arithmetic)] -#![feature(const_assume)] -#![feature(const_option_ext)] -#![feature(const_slice_index)] -#![feature(slice_split_at_unchecked)] -#![feature(inline_const)] -#![feature(const_for)] - #[macro_use] extern crate static_assertions; diff --git a/src/main.rs b/src/main.rs index 3ac6d8a..d7a7c4e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,14 +1,3 @@ -#![feature(const_mut_refs)] -#![feature(let_chains)] -#![feature(const_trait_impl)] -#![feature(const_fn_floating_point_arithmetic)] -#![feature(const_assume)] -#![feature(const_option_ext)] -#![feature(const_slice_index)] -#![feature(slice_split_at_unchecked)] -#![feature(inline_const)] -#![feature(const_for)] - #[macro_use] extern crate static_assertions;