run clippy/fmt

This commit is contained in:
Dmitry Rodionov
2022-11-16 17:25:04 +02:00
parent 16fdd104ac
commit b8488e70a9
4 changed files with 7 additions and 4 deletions

View File

@@ -391,7 +391,7 @@ impl PageServerConf {
}
pub fn tenant_attaching_mark_file_path(&self, tenant_id: &TenantId) -> PathBuf {
self.tenant_path(&tenant_id)
self.tenant_path(tenant_id)
.join(TENANT_ATTACHING_MARKER_FILENAME)
}

View File

@@ -128,8 +128,8 @@ pub mod index;
mod upload;
// re-export this
pub use download::list_remote_timelines;
pub use download::is_temp_download_file;
pub use download::list_remote_timelines;
use std::collections::{HashMap, VecDeque};
use std::fmt::Debug;

View File

@@ -931,7 +931,10 @@ impl Timeline {
} else if fname == METADATA_FILE_NAME || fname.ends_with(".old") {
// ignore these
} else if crate::storage_sync::is_temp_download_file(&direntry_path) {
info!("skipping temp download file, reconcile_with_remote will resume / clean up: {}", fname);
info!(
"skipping temp download file, reconcile_with_remote will resume / clean up: {}",
fname
);
} else if is_ephemeral_file(&fname) {
// Delete any old ephemeral files
trace!("deleting old ephemeral file in timeline dir: {}", fname);

View File

@@ -170,7 +170,7 @@ fn load_local_tenant(
Tenant::spawn_load(conf, tenant_id, remote_storage)?
};
tenants_state::write_tenants().insert(tenant_id, tenant);
return Ok(Some(()));
Ok(Some(()))
}
///