From 3396574d212dc8c7c74027449536d9cb44dafabb Mon Sep 17 00:00:00 2001 From: Christian Schwarz Date: Sat, 21 Dec 2024 20:32:53 +0100 Subject: [PATCH] cargo fmt --- pageserver/src/tenant/disk_btree.rs | 8 ++++++-- pageserver/src/tenant/storage_layer/layer/tests.rs | 5 ++++- pageserver/src/tenant/timeline.rs | 1 - pageserver/src/virtual_file/io_engine.rs | 3 ++- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/pageserver/src/tenant/disk_btree.rs b/pageserver/src/tenant/disk_btree.rs index ac86216a41..bef200e16d 100644 --- a/pageserver/src/tenant/disk_btree.rs +++ b/pageserver/src/tenant/disk_btree.rs @@ -29,13 +29,17 @@ use std::{ io, iter::Rev, ops::{Range, RangeInclusive}, - result, time::Duration, + result, + time::Duration, }; use thiserror::Error; use tracing::error; use crate::{ - context::{DownloadBehavior, RequestContext}, log_if_slow, task_mgr::TaskKind, tenant::block_io::{BlockReader, BlockWriter} + context::{DownloadBehavior, RequestContext}, + log_if_slow, + task_mgr::TaskKind, + tenant::block_io::{BlockReader, BlockWriter}, }; // The maximum size of a value stored in the B-tree. 5 bytes is enough currently. diff --git a/pageserver/src/tenant/storage_layer/layer/tests.rs b/pageserver/src/tenant/storage_layer/layer/tests.rs index 160a41d610..c2382a4cf9 100644 --- a/pageserver/src/tenant/storage_layer/layer/tests.rs +++ b/pageserver/src/tenant/storage_layer/layer/tests.rs @@ -9,7 +9,10 @@ use utils::{ use super::failpoints::{Failpoint, FailpointKind}; use super::*; -use crate::{context::DownloadBehavior, tenant::storage_layer::{IoConcurrency, LayerVisibilityHint}}; +use crate::{ + context::DownloadBehavior, + tenant::storage_layer::{IoConcurrency, LayerVisibilityHint}, +}; use crate::{task_mgr::TaskKind, tenant::harness::TenantHarness}; /// Used in tests to advance a future to wanted await point, and not futher. diff --git a/pageserver/src/tenant/timeline.rs b/pageserver/src/tenant/timeline.rs index c6ed7acad9..60a77fec14 100644 --- a/pageserver/src/tenant/timeline.rs +++ b/pageserver/src/tenant/timeline.rs @@ -3454,7 +3454,6 @@ impl Timeline { ))); } } - } } trace!("futures completed"); diff --git a/pageserver/src/virtual_file/io_engine.rs b/pageserver/src/virtual_file/io_engine.rs index 41abff382c..50c400d20f 100644 --- a/pageserver/src/virtual_file/io_engine.rs +++ b/pageserver/src/virtual_file/io_engine.rs @@ -111,7 +111,8 @@ pub(crate) fn get() -> IoEngine { use std::{ os::unix::prelude::FileExt, - sync::atomic::{AtomicU8, Ordering}, time::Duration, + sync::atomic::{AtomicU8, Ordering}, + time::Duration, }; use super::{