Skip to content

Commit c4c6435

Browse files
cargo fmt changes
1 parent 9e601ab commit c4c6435

File tree

5 files changed

+7
-19
lines changed

5 files changed

+7
-19
lines changed

server/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ async fn main() -> anyhow::Result<()> {
5858
CONFIG.validate_staging()?;
5959
migration::run_metadata_migration(&CONFIG).await?;
6060
let metadata = storage::resolve_parseable_metadata().await?;
61-
61+
6262
banner::print(&CONFIG, &metadata).await;
6363
rbac::map::init(&metadata);
6464
metadata.set_global();

server/src/migration.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ pub async fn run_metadata_migration(config: &Config) -> anyhow::Result<()> {
3636
let object_store = config.storage().get_object_store();
3737
let storage_metadata = get_storage_metadata(&*object_store).await?;
3838
let staging_metadata = get_staging_metadata(config)?;
39-
39+
4040
fn get_version(metadata: &serde_json::Value) -> Option<&str> {
4141
metadata
4242
.as_object()

server/src/option.rs

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,11 @@ impl Config {
4646
match cli.subcommand() {
4747
Some(("local-store", m)) => {
4848
let server = match Server::from_arg_matches(m) {
49-
50-
Ok(server) => {
51-
server
52-
},
49+
Ok(server) => server,
5350
Err(err) => err.exit(),
5451
};
5552
let storage = match FSConfig::from_arg_matches(m) {
56-
57-
Ok(storage) => {
58-
storage
59-
},
53+
Ok(storage) => storage,
6054
Err(err) => err.exit(),
6155
};
6256

@@ -86,15 +80,11 @@ impl Config {
8680
}
8781
Some(("s3-store", m)) => {
8882
let server = match Server::from_arg_matches(m) {
89-
Ok(server) => {
90-
server
91-
},
83+
Ok(server) => server,
9284
Err(err) => err.exit(),
9385
};
9486
let storage = match S3Config::from_arg_matches(m) {
95-
Ok(storage) => {
96-
storage
97-
},
87+
Ok(storage) => storage,
9888
Err(err) => err.exit(),
9989
};
10090

server/src/storage/localfs.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,7 @@ impl ObjectStorage for LocalFS {
186186
};
187187
let to_path = self.root.join(key);
188188
if let Some(path) = to_path.parent() {
189-
190189
fs::create_dir_all(path).await?;
191-
192190
}
193191
let _ = fs_extra::file::copy(path, to_path, &op)?;
194192
Ok(())

server/src/storage/store_metadata.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ pub async fn resolve_parseable_metadata() -> Result<StorageMetadata, ObjectStora
9898
let staging_metadata = get_staging_metadata()?;
9999
let storage = CONFIG.storage().get_object_store();
100100
let remote_metadata = storage.get_metadata().await?;
101-
101+
102102
let check = match (staging_metadata, remote_metadata) {
103103
(Some(_staging), Some(remote)) => EnvChange::None(remote),
104104
(None, Some(remote)) => EnvChange::NewStaging(remote),

0 commit comments

Comments
 (0)