Skip to content

Commit 1162214

Browse files
committed
Format
1 parent 682f518 commit 1162214

File tree

20 files changed

+40
-32
lines changed

20 files changed

+40
-32
lines changed

benchmark/src/create.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use std::error::Error;
55
use std::time::Instant;
66

77
use fastrace::prelude::SpanContext;
8-
use fastrace::{func_path, Span};
8+
use fastrace::{Span, func_path};
99
use firewood::db::Db;
1010
use firewood::v2::api::{Db as _, Proposal as _};
1111
use log::info;

benchmark/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ use firewood::manager::{CacheReadStrategy, RevisionManagerConfig};
3131

3232
use fastrace::collector::Config;
3333

34-
use opentelemetry::trace::SpanKind;
3534
use opentelemetry::InstrumentationScope;
35+
use opentelemetry::trace::SpanKind;
3636
use opentelemetry_otlp::{SpanExporter, WithExportConfig};
3737
use opentelemetry_sdk::Resource;
3838

ffi/src/metrics.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ use std::{
33
io::Write,
44
net::Ipv6Addr,
55
ops::Deref,
6-
sync::{atomic::Ordering, Arc, Once},
6+
sync::{Arc, Once, atomic::Ordering},
77
time::SystemTime,
88
};
99

10-
use oxhttp::model::{Body, Response, StatusCode};
1110
use oxhttp::Server;
11+
use oxhttp::model::{Body, Response, StatusCode};
1212
use std::net::Ipv4Addr;
1313
use std::time::Duration;
1414

firewood/benches/hashops.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// hash benchmarks; run with 'cargo bench'
55

66
use criterion::profiler::Profiler;
7-
use criterion::{criterion_group, criterion_main, BatchSize, Criterion};
7+
use criterion::{BatchSize, Criterion, criterion_group, criterion_main};
88
use firewood::db::{BatchOp, DbConfig};
99
use firewood::merkle::Merkle;
1010
use firewood::v2::api::{Db as _, Proposal as _};

firewood/src/merkle.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1036,7 +1036,7 @@ impl<'a, T: PartialEq> PrefixOverlap<'a, T> {
10361036
mod tests {
10371037
use super::*;
10381038
use rand::rngs::StdRng;
1039-
use rand::{rng, Rng, SeedableRng};
1039+
use rand::{Rng, SeedableRng, rng};
10401040
use storage::{MemStore, MutableProposal, NodeStore, RootReader};
10411041
use test_case::test_case;
10421042

@@ -1338,9 +1338,11 @@ mod tests {
13381338

13391339
{
13401340
// Test that the proof is invalid when the hash is different
1341-
assert!(proof
1342-
.verify(key, Some(value), &TrieHash::default())
1343-
.is_err());
1341+
assert!(
1342+
proof
1343+
.verify(key, Some(value), &TrieHash::default())
1344+
.is_err()
1345+
);
13441346
}
13451347
}
13461348
}

fwdctl/src/create.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (C) 2023, Ava Labs, Inc. All rights reserved.
22
// See the file LICENSE.md for licensing terms.
33

4-
use clap::{value_parser, Args};
4+
use clap::{Args, value_parser};
55
use firewood::db::{Db, DbConfig};
66
use firewood::v2::api;
77

fwdctl/tests/cli.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (C) 2023, Ava Labs, Inc. All rights reserved.
22
// See the file LICENSE.md for licensing terms.
33

4-
use anyhow::{anyhow, Result};
4+
use anyhow::{Result, anyhow};
55
use assert_cmd::Command;
66
use predicates::prelude::*;
77
use serial_test::serial;

grpc-testtool/benches/insert.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (C) 2023, Ava Labs, Inc. All rights reserved.
22
// See the file LICENSE.md for licensing terms.
33

4-
use criterion::{criterion_group, criterion_main, BatchSize, BenchmarkId, Criterion};
4+
use criterion::{BatchSize, BenchmarkId, Criterion, criterion_group, criterion_main};
55
use rand::distributions::Alphanumeric;
66
use rand::{Rng, SeedableRng};
77
use std::borrow::BorrowMut as _;

grpc-testtool/src/bin/process-server.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
use chrono::Local;
55
use clap::Parser;
66
use env_logger::Builder;
7-
use log::{info, LevelFilter};
7+
use log::{LevelFilter, info};
8+
use rpc::DatabaseService;
89
use rpc::process_server::process_server_service_server::ProcessServerServiceServer;
910
use rpc::rpcdb::database_server::DatabaseServer as RpcServer;
1011
use rpc::sync::db_server::DbServer as SyncServer;
11-
use rpc::DatabaseService;
1212
use serde::Deserialize;
1313
use std::error::Error;
1414
use std::io::Write;

grpc-testtool/src/service.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ use firewood::v2::api::{Db as _, Error};
77
use std::collections::HashMap;
88
use std::ops::Deref;
99
use std::path::Path;
10-
use std::sync::atomic::{AtomicU64, Ordering};
1110
use std::sync::Arc;
11+
use std::sync::atomic::{AtomicU64, Ordering};
1212
use tokio::sync::Mutex;
1313
use tonic::Status;
1414

0 commit comments

Comments
 (0)