Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: derive Copy on LoggingKind and LoggingLevel #2207

Merged
merged 2 commits into from
Mar 25, 2024
Merged

chore: derive Copy on LoggingKind and LoggingLevel #2207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f05d461
Derive Copy on LoggingKind and LogginLevel
arendjr Mar 25, 2024
889821e
Merge branch 'main' into derive-copy-on-logging-types
arendjr Mar 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/biome_cli/src/commands/check.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ pub(crate) fn check(
since,
changed,
} = payload;
setup_cli_subscriber(cli_options.log_level.clone(), cli_options.log_kind.clone());
setup_cli_subscriber(cli_options.log_level, cli_options.log_kind);

let fix_file_mode = if apply && apply_unsafe {
return Err(CliDiagnostic::incompatible_arguments(
Expand Down
2 changes: 1 addition & 1 deletion crates/biome_cli/src/commands/ci.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ pub(crate) fn ci(session: CliSession, payload: CiCommandPayload) -> Result<(), C
since,
changed,
} = payload;
setup_cli_subscriber(cli_options.log_level.clone(), cli_options.log_kind.clone());
setup_cli_subscriber(cli_options.log_level, cli_options.log_kind);

let loaded_configuration =
load_configuration(&session.app.fs, cli_options.as_configuration_base_path())?;
Expand Down
2 changes: 1 addition & 1 deletion crates/biome_cli/src/commands/format.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ pub(crate) fn format(
since,
changed,
} = payload;
setup_cli_subscriber(cli_options.log_level.clone(), cli_options.log_kind.clone());
setup_cli_subscriber(cli_options.log_level, cli_options.log_kind);

let loaded_configuration =
load_configuration(&session.app.fs, cli_options.as_configuration_base_path())?;
Expand Down
2 changes: 1 addition & 1 deletion crates/biome_cli/src/commands/lint.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ pub(crate) fn lint(session: CliSession, payload: LintCommandPayload) -> Result<(
changed,
since,
} = payload;
setup_cli_subscriber(cli_options.log_level.clone(), cli_options.log_kind.clone());
setup_cli_subscriber(cli_options.log_level, cli_options.log_kind);

let fix_file_mode = if apply && apply_unsafe {
return Err(CliDiagnostic::incompatible_arguments(
Expand Down
2 changes: 1 addition & 1 deletion crates/biome_cli/src/commands/migrate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ pub(crate) fn migrate(
directory_path,
file_path,
} = load_configuration(&session.app.fs, base_path)?;
setup_cli_subscriber(cli_options.log_level.clone(), cli_options.log_kind.clone());
setup_cli_subscriber(cli_options.log_level, cli_options.log_kind);

if let (Some(path), Some(directory_path)) = (file_path, directory_path) {
execute_mode(
Expand Down
8 changes: 2 additions & 6 deletions crates/biome_cli/src/commands/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,16 +401,12 @@ impl BiomeCommand {

pub fn log_level(&self) -> LoggingLevel {
self.cli_options()
.map_or(LoggingLevel::default(), |cli_options| {
cli_options.log_level.clone()
})
.map_or(LoggingLevel::default(), |cli_options| cli_options.log_level)
}

pub fn log_kind(&self) -> LoggingKind {
self.cli_options()
.map_or(LoggingKind::default(), |cli_options| {
cli_options.log_kind.clone()
})
.map_or(LoggingKind::default(), |cli_options| cli_options.log_kind)
}
}

Expand Down
2 changes: 1 addition & 1 deletion crates/biome_cli/src/commands/search.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ pub(crate) fn search(
stdin_file_path,
vcs_configuration,
} = payload;
setup_cli_subscriber(cli_options.log_level.clone(), cli_options.log_kind.clone());
setup_cli_subscriber(cli_options.log_level, cli_options.log_kind);

let loaded_configuration =
load_configuration(&session.app.fs, cli_options.as_configuration_base_path())?;
Expand Down
6 changes: 3 additions & 3 deletions crates/biome_cli/src/logging.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ pub fn setup_cli_subscriber(level: LoggingLevel, kind: LoggingKind) {
};
}

#[derive(Debug, Default, Clone, Ord, PartialOrd, Eq, PartialEq)]
#[derive(Copy, Debug, Default, Clone, Ord, PartialOrd, Eq, PartialEq)]
pub enum LoggingLevel {
/// No logs should be shown
#[default]
Expand All @@ -52,7 +52,7 @@ pub enum LoggingLevel {
}

impl LoggingLevel {
fn to_filter_level(&self) -> Option<LevelFilter> {
fn to_filter_level(self) -> Option<LevelFilter> {
match self {
LoggingLevel::None => None,
LoggingLevel::Info => Some(LevelFilter::INFO),
Expand Down Expand Up @@ -138,7 +138,7 @@ impl<S> Filter<S> for LoggingFilter {
}

/// The kind of logging
#[derive(Debug, Default, Clone, Eq, PartialEq)]
#[derive(Copy, Debug, Default, Clone, Eq, PartialEq)]
pub enum LoggingKind {
/// A pretty log on multiple lines with nice colours
#[default]
Expand Down