Skip to content

Commit 59e28f8

Browse files
committed
fixes
1 parent 1ad7af8 commit 59e28f8

File tree

109 files changed

+663
-629
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+663
-629
lines changed

crates/pglt_analyse/src/categories.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use enumflags2::{bitflags, BitFlags};
1+
use enumflags2::{BitFlags, bitflags};
22
use std::borrow::Cow;
33

44
#[derive(Copy, Clone, Debug, Eq, PartialEq)]

crates/pglt_analyse/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pub use pglt_diagnostics::category_concat;
1111

1212
pub use crate::categories::{
1313
ActionCategory, RefactorKind, RuleCategories, RuleCategoriesBuilder, RuleCategory,
14-
SourceActionKind, SUPPRESSION_ACTION_CATEGORY,
14+
SUPPRESSION_ACTION_CATEGORY, SourceActionKind,
1515
};
1616
pub use crate::filter::{AnalysisFilter, GroupKey, RuleFilter, RuleKey};
1717
pub use crate::options::{AnalyserOptions, AnalyserRules};

crates/pglt_analyse/src/registry.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
use std::{borrow, collections::BTreeSet};
22

33
use crate::{
4+
AnalyserOptions,
45
context::RuleContext,
56
filter::{AnalysisFilter, GroupKey, RuleKey},
67
rule::{GroupCategory, Rule, RuleDiagnostic, RuleGroup},
7-
AnalyserOptions,
88
};
99

1010
pub trait RegistryVisitor {

crates/pglt_analyse/src/rule.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use pglt_console::fmt::Display;
2-
use pglt_console::{markup, MarkupBuf};
2+
use pglt_console::{MarkupBuf, markup};
33
use pglt_diagnostics::advice::CodeSuggestionAdvice;
44
use pglt_diagnostics::{
55
Advices, Category, Diagnostic, DiagnosticTags, Location, LogCategory, MessageAndDescription,

crates/pglt_analyser/src/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,9 @@ mod tests {
7272

7373
use pglt_analyse::{AnalyserOptions, AnalysisFilter, RuleFilter};
7474
use pglt_console::{
75+
Markup,
7576
fmt::{Formatter, Termcolor},
76-
markup, Markup,
77+
markup,
7778
};
7879
use pglt_diagnostics::PrintDiagnostic;
7980
use termcolor::NoColor;

crates/pglt_analyser/src/lint/safety/adding_required_field.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use pglt_analyse::{context::RuleContext, declare_lint_rule, Rule, RuleDiagnostic, RuleSource};
1+
use pglt_analyse::{Rule, RuleDiagnostic, RuleSource, context::RuleContext, declare_lint_rule};
22
use pglt_console::markup;
33

44
declare_lint_rule! {

crates/pglt_analyser/src/lint/safety/ban_drop_column.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use pglt_analyse::{context::RuleContext, declare_lint_rule, Rule, RuleDiagnostic, RuleSource};
1+
use pglt_analyse::{Rule, RuleDiagnostic, RuleSource, context::RuleContext, declare_lint_rule};
22
use pglt_console::markup;
33

44
declare_lint_rule! {

crates/pglt_analyser/src/lint/safety/ban_drop_not_null.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use pglt_analyse::{context::RuleContext, declare_lint_rule, Rule, RuleDiagnostic, RuleSource};
1+
use pglt_analyse::{Rule, RuleDiagnostic, RuleSource, context::RuleContext, declare_lint_rule};
22
use pglt_console::markup;
33

44
declare_lint_rule! {

crates/pglt_analyser/src/lint/safety/ban_drop_table.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use pglt_analyse::{context::RuleContext, declare_lint_rule, Rule, RuleDiagnostic, RuleSource};
1+
use pglt_analyse::{Rule, RuleDiagnostic, RuleSource, context::RuleContext, declare_lint_rule};
22
use pglt_console::markup;
33

44
declare_lint_rule! {

crates/pglt_cli/src/changed.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ pub(crate) fn get_changed_files(
1818
(Some(since), Some(_)) => since,
1919
(Some(since), None) => since,
2020
(None, Some(branch)) => branch,
21-
(None, None) => return Err(CliDiagnostic::incompatible_end_configuration("The `--changed` flag was set, but couldn't determine the base to compare against. Either set configuration.vcs.default_branch or use the --since argument.")),
21+
(None, None) => {
22+
return Err(CliDiagnostic::incompatible_end_configuration(
23+
"The `--changed` flag was set, but couldn't determine the base to compare against. Either set configuration.vcs.default_branch or use the --since argument.",
24+
));
25+
}
2226
};
2327

2428
let changed_files = fs.get_changed_files(base)?;

0 commit comments

Comments
 (0)