diff --git a/crates/ruff_benchmark/benches/lexer.rs b/crates/ruff_benchmark/benches/lexer.rs index 0fa89cdf5c..40d06761dd 100644 --- a/crates/ruff_benchmark/benches/lexer.rs +++ b/crates/ruff_benchmark/benches/lexer.rs @@ -1,4 +1,6 @@ -use ruff_benchmark::criterion::{ +use ruff_benchmark::criterion; + +use criterion::{ criterion_group, criterion_main, measurement::WallTime, BenchmarkId, Criterion, Throughput, }; use ruff_benchmark::{ diff --git a/crates/ruff_benchmark/benches/linter.rs b/crates/ruff_benchmark/benches/linter.rs index d2ce1fb9ed..870d945f33 100644 --- a/crates/ruff_benchmark/benches/linter.rs +++ b/crates/ruff_benchmark/benches/linter.rs @@ -1,4 +1,6 @@ -use ruff_benchmark::criterion::{ +use ruff_benchmark::criterion; + +use criterion::{ criterion_group, criterion_main, BenchmarkGroup, BenchmarkId, Criterion, Throughput, }; use ruff_benchmark::{ diff --git a/crates/ruff_benchmark/benches/parser.rs b/crates/ruff_benchmark/benches/parser.rs index 0509bc5b86..a78a64c85b 100644 --- a/crates/ruff_benchmark/benches/parser.rs +++ b/crates/ruff_benchmark/benches/parser.rs @@ -1,4 +1,6 @@ -use ruff_benchmark::criterion::{ +use ruff_benchmark::criterion; + +use criterion::{ criterion_group, criterion_main, measurement::WallTime, BenchmarkId, Criterion, Throughput, }; use ruff_benchmark::{ diff --git a/crates/ruff_benchmark/benches/red_knot.rs b/crates/ruff_benchmark/benches/red_knot.rs index 4c65b2348c..27e2490040 100644 --- a/crates/ruff_benchmark/benches/red_knot.rs +++ b/crates/ruff_benchmark/benches/red_knot.rs @@ -1,21 +1,23 @@ #![allow(clippy::disallowed_names)] +use ruff_benchmark::criterion; use std::borrow::Cow; use std::ops::Range; +use criterion::{criterion_group, criterion_main, BatchSize, Criterion}; use rayon::ThreadPoolBuilder; +use rustc_hash::FxHashSet; + use red_knot_project::metadata::options::{EnvironmentOptions, Options}; use red_knot_project::metadata::value::RangedValue; use red_knot_project::watch::{ChangeEvent, ChangedKind}; use red_knot_project::{Db, ProjectDatabase, ProjectMetadata}; -use ruff_benchmark::criterion::{criterion_group, criterion_main, BatchSize, Criterion}; use ruff_benchmark::TestFile; use ruff_db::diagnostic::{DiagnosticId, OldDiagnosticTrait, Severity}; use ruff_db::files::{system_path_to_file, File}; use ruff_db::source::source_text; use ruff_db::system::{MemoryFileSystem, SystemPath, SystemPathBuf, TestSystem}; use ruff_python_ast::PythonVersion; -use rustc_hash::FxHashSet; struct Case { db: ProjectDatabase, diff --git a/crates/ruff_db/src/diagnostic/mod.rs b/crates/ruff_db/src/diagnostic/mod.rs index 970c0b1ca0..09065d24cc 100644 --- a/crates/ruff_db/src/diagnostic/mod.rs +++ b/crates/ruff_db/src/diagnostic/mod.rs @@ -235,8 +235,8 @@ impl SubDiagnostic { /// /// If a sub-diagnostic has not been marked as printed before being /// dropped, then its `Drop` implementation will panic in debug mode. + #[cfg(debug_assertions)] pub(crate) fn printed(&mut self) { - #[cfg(debug_assertions)] { self.inner.printed = true; }