Skip to content

Commit 50b296c

Browse files
committed
Use tideorm::model attribute and code style cleanup
Replace occurrences of #[derive(Model)] / #[tideorm(...)] examples with the new #[tideorm::model(...)] attribute and update related docs and tests to reflect the model macro change. Also perform widespread minor cleanups: reorder and normalize imports (especially in benches), tidy prelude re-exports, adjust import orders in internal modules, reflow multi-line asserts and formatting, fix some trailing-newline issues, and update comments/docstrings to reference TideORM's model macros. These edits are mostly cosmetic and documentation/test updates to keep examples and code style consistent across the codebase.
1 parent b416410 commit 50b296c

58 files changed

Lines changed: 256 additions & 351 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

benches/attachments_translations_benchmarks.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
//!
66
//! Run with: cargo bench --bench attachments_translations_benchmarks
77
8-
use criterion::{BenchmarkId, Criterion, Throughput, criterion_group, criterion_main};
8+
use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
99
use serde::{Deserialize, Serialize};
1010
use std::collections::HashMap;
1111
use std::hint::black_box;

benches/cache_benchmarks.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
//!
55
//! Run with: `cargo bench --bench cache_benchmarks`
66
7-
use criterion::{BenchmarkId, Criterion, Throughput, criterion_group, criterion_main};
7+
use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
88
use std::hint::black_box;
99
use std::sync::Arc;
1010
use std::thread;
1111
use std::time::Duration;
12-
use tideorm::Database;
1312
use tideorm::cache::{CacheKeyBuilder, CacheStrategy, PreparedStatementCache, QueryCache};
1413
use tideorm::internal::{ActiveModelTrait, ConnectionTrait, InternalModel};
1514
use tideorm::prelude::*;
15+
use tideorm::Database;
1616

1717
#[derive(Model, PartialEq)]
1818
#[tideorm(table = "bench_cache_users")]

benches/crud_benchmarks.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
//!
1111
//! Run with: cargo bench --bench crud_benchmarks
1212
13-
use criterion::{BenchmarkId, Criterion, Throughput, criterion_group, criterion_main};
14-
use std::sync::OnceLock;
13+
use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
1514
use std::sync::atomic::{AtomicU64, Ordering};
15+
use std::sync::OnceLock;
1616
use std::time::Duration;
1717
use tideorm::prelude::*;
1818
use tideorm::{Database, TideConfig};

benches/fulltext_benchmarks.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
//!
66
//! Run with: cargo bench --bench fulltext_benchmarks
77
8-
use criterion::{BenchmarkId, Criterion, Throughput, criterion_group, criterion_main};
8+
use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
99
use tideorm::config::DatabaseType;
1010
use tideorm::fulltext::{
11-
FullTextConfig, FullTextIndex, PgFullTextIndexType, SearchMode, SearchWeights,
12-
generate_snippet, highlight_text, pg_headline_sql,
11+
generate_snippet, highlight_text, pg_headline_sql, FullTextConfig, FullTextIndex,
12+
PgFullTextIndexType, SearchMode, SearchWeights,
1313
};
1414

1515
// =============================================================================

benches/or_clause_benchmarks.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//!
1111
//! Run with: cargo bench --bench or_clause_benchmarks
1212
13-
use criterion::{BenchmarkId, Criterion, Throughput, criterion_group, criterion_main};
13+
use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
1414
use std::sync::OnceLock;
1515
use std::time::Duration;
1616
use tideorm::prelude::*;

benches/query_benchmarks.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//!
1111
//! Run with: cargo bench --bench query_benchmarks
1212
13-
use criterion::{BenchmarkId, Criterion, Throughput, criterion_group, criterion_main};
13+
use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
1414
use std::sync::OnceLock;
1515
use std::time::Duration;
1616
use tideorm::prelude::*;

benches/relations_benchmarks.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
//!
66
//! Run with: cargo bench --bench relations_benchmarks
77
8-
use criterion::{Criterion, criterion_group, criterion_main};
8+
use criterion::{criterion_group, criterion_main, Criterion};
99
use serde_json::json;
1010
use std::hint::black_box;
1111
use tideorm::query::Order;

benches/stability_benchmarks.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use criterion::{BenchmarkId, Criterion, criterion_group, criterion_main};
1+
use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
22
use std::hint::black_box;
33

44
// =============================================================================

benches/tokenization_benchmarks.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
//!
66
//! Run with: cargo bench --bench tokenization_benchmarks
77
8-
use criterion::{BenchmarkId, Criterion, Throughput, criterion_group, criterion_main};
8+
use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
99
use std::hint::black_box;
1010

1111
// ============================================================================

benches/validation_benchmarks.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//!
55
//! Run with: cargo bench --bench validation_benchmarks
66
7-
use criterion::{BenchmarkId, Criterion, Throughput, criterion_group, criterion_main};
7+
use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
88
use tideorm::validation::{ValidationBuilder, ValidationErrors, ValidationRule, Validator};
99

1010
// =============================================================================

0 commit comments

Comments
 (0)