Skip to content

Commit 194a42a

Browse files
committed
Merge branch 'feature/use-one-use-block' into development
2 parents 20a16e4 + ecb8718 commit 194a42a

File tree

2 files changed

+41
-43
lines changed

2 files changed

+41
-43
lines changed

Cargo.lock

Lines changed: 22 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/cli/src/main.rs

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,23 @@
1-
use anyhow::{anyhow, Result};
2-
use clap::Parser;
3-
use console::style;
4-
use smbcloud_cli::account::login::process_login;
5-
use smbcloud_cli::account::logout::process_logout;
6-
use smbcloud_cli::account::me::process_me;
7-
use smbcloud_cli::cli::CommandResult;
8-
use smbcloud_cli::deploy::process_deploy::process_deploy;
9-
use smbcloud_cli::project::crud_create::process_project_init;
10-
use smbcloud_cli::project::process::process_project;
11-
use smbcloud_cli::{
12-
account::process_account,
13-
cli::{Cli, Commands},
1+
use {
2+
anyhow::{anyhow, Result},
3+
clap::Parser,
4+
console::style,
5+
smbcloud_cli::{
6+
account::{login::process_login, logout::process_logout, me::process_me, process_account},
7+
cli::{Cli, CommandResult, Commands},
8+
deploy::process_deploy::process_deploy,
9+
project::{crud_create::process_project_init, process::process_project},
10+
},
11+
smbcloud_network::{environment::Environment, network::check_internet_connection},
12+
std::{
13+
fs::{create_dir_all, OpenOptions},
14+
path::PathBuf,
15+
str::FromStr,
16+
},
17+
tracing::subscriber::set_global_default,
18+
tracing_bunyan_formatter::{BunyanFormattingLayer, JsonStorageLayer},
19+
tracing_subscriber::{filter::LevelFilter, prelude::*, EnvFilter},
1420
};
15-
use smbcloud_network::{environment::Environment, network::check_internet_connection};
16-
use std::{
17-
fs::{create_dir_all, OpenOptions},
18-
path::PathBuf,
19-
str::FromStr,
20-
};
21-
use tracing::subscriber::set_global_default;
22-
use tracing_bunyan_formatter::{BunyanFormattingLayer, JsonStorageLayer};
23-
use tracing_subscriber::{filter::LevelFilter, prelude::*, EnvFilter};
2421

2522
fn setup_logging(env: Environment, level: Option<EnvFilter>) -> Result<()> {
2623
// Log in the current directory

0 commit comments

Comments
 (0)