Skip to content

Commit 096e770

Browse files
BrettMaysonBrettMayson
committed
beta clippy
1 parent 389952d commit 096e770

File tree

15 files changed

+96
-124
lines changed

15 files changed

+96
-124
lines changed

‎book-gen/src/lints.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ fn config(chapter: &mut Chapter) {
3535
for lint in CONFIG_LINTS.iter().filter(|l| l.display()) {
3636
lint_text.push((lint.sort(), get_text(&**lint, "L-C")));
3737
}
38-
lint_text.sort_by(|a, b| a.0.cmp(&b.0));
38+
lint_text.sort_by_key(|a| a.0);
3939
for (_, text) in lint_text {
4040
output.push_str(&text);
4141
}
@@ -61,7 +61,7 @@ fn sqf(chapter: &mut Chapter) {
6161
for lint in lints {
6262
lint_text.push((lint.sort(), get_text(&lint, "L-S")));
6363
}
64-
lint_text.sort_by(|a, b| a.0.cmp(&b.0));
64+
lint_text.sort_by_key(|a| a.0);
6565
for (_, text) in lint_text {
6666
output.push_str(&text);
6767
}
@@ -74,7 +74,7 @@ fn stringtables(chapter: &mut Chapter) {
7474
for lint in STRINGTABLE_LINTS.iter().filter(|l| l.display()) {
7575
lint_text.push((lint.sort(), get_text(&**lint, "L-L")));
7676
}
77-
lint_text.sort_by(|a, b| a.0.cmp(&b.0));
77+
lint_text.sort_by_key(|a| a.0);
7878
for (_, text) in lint_text {
7979
output.push_str(&text);
8080
}

‎hls/src/sqf/lints.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,7 @@ impl SqfAnalyzer {
242242
|| bundle.sources.iter().any(|source| {
243243
workspace
244244
.join_url(&url)
245-
.map(|joined| joined == *source)
246-
.unwrap_or(false)
245+
.is_ok_and(|joined| joined == *source)
247246
})
248247
{
249248
Some(path.clone())

‎libs/config/src/analyze/lints/c03_duplicate_classes.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ pub fn check(properties: &[Property], processed: &Processed) -> Codes {
113113
}
114114
}
115115
}
116-
codes.extend(defined.into_iter().filter_map(|(_, classes)| {
116+
codes.extend(defined.into_values().filter_map(|classes| {
117117
if classes.len() > 1 {
118118
Some(Arc::new(CodeC03DuplicateClasses::new(classes, processed)) as Arc<dyn Code>)
119119
} else {

‎libs/preprocessor/src/codes/pe19_pragma_unknown.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ impl Code for PragmaUnknown {
2626
}
2727

2828
fn message(&self) -> String {
29-
format!("unknown `{}` pragma command", self.token.symbol(),)
29+
format!("unknown `{}` pragma command", self.token.symbol())
3030
}
3131

3232
fn label_message(&self) -> String {

‎libs/preprocessor/src/codes/pe20_pragma_invalid_scope.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ impl Code for PragmaInvalidScope {
3838
}
3939

4040
fn message(&self) -> String {
41-
format!("unknown #pragma scope `{}`", self.token.symbol(),)
41+
format!("unknown #pragma scope `{}`", self.token.symbol())
4242
}
4343

4444
fn label_message(&self) -> String {

‎libs/preprocessor/src/codes/pe21_pragma_invalid_suppress.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ impl Code for PragmaInvalidSuppress {
2626
}
2727

2828
fn message(&self) -> String {
29-
format!("unknown #pragma suppress `{}`", self.token.symbol(),)
29+
format!("unknown #pragma suppress `{}`", self.token.symbol())
3030
}
3131

3232
fn label_message(&self) -> String {

‎libs/sqf/src/analyze/inspector/external_functions.rs‎

Lines changed: 58 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -16,56 +16,46 @@ impl Inspector<'_> {
1616
let ext_func_lower = ext_func.to_ascii_lowercase();
1717
for possible in lhs {
1818
match possible {
19-
GameValue::Code(Some(statements)) => {
19+
GameValue::Code(Some(statements))
20+
if ext_func_lower.as_str() == "cba_fnc_directcall" =>
21+
{
2022
// handle `{} call cba_fnc_directcall`
21-
if ext_func_lower.as_str() == "cba_fnc_directcall" {
22-
self.external_current_scope(
23-
&vec![(GameValue::Code(Some(statements.clone())), statements.span())],
24-
&vec![],
25-
);
26-
}
23+
self.external_current_scope(
24+
&vec![(GameValue::Code(Some(statements.clone())), statements.span())],
25+
&vec![],
26+
);
2727
}
2828
GameValue::Array(Some(gv_array), _) => match ext_func_lower.as_str() {
2929
// Functions that will run in existing scope
30-
"cba_fnc_hasheachpair" | "cba_fnc_hashfilter" => {
31-
if gv_array.len() > 1 {
32-
self.external_current_scope(
33-
&gv_array[1],
34-
&vec![
35-
("_key", GameValue::Anything),
36-
("_value", GameValue::Anything),
37-
],
38-
);
39-
}
30+
"cba_fnc_hasheachpair" | "cba_fnc_hashfilter" if gv_array.len() > 1 => {
31+
self.external_current_scope(
32+
&gv_array[1],
33+
&vec![
34+
("_key", GameValue::Anything),
35+
("_value", GameValue::Anything),
36+
],
37+
);
4038
}
41-
"cba_fnc_filter" => {
42-
if gv_array.len() > 1 {
43-
self.external_current_scope(
44-
&gv_array[1],
45-
&vec![("_x", GameValue::Anything)],
46-
);
47-
}
39+
"cba_fnc_filter" if gv_array.len() > 1 => {
40+
self.external_current_scope(
41+
&gv_array[1],
42+
&vec![("_x", GameValue::Anything)],
43+
);
4844
}
49-
"cba_fnc_inject" => {
50-
if gv_array.len() > 2 {
51-
self.external_current_scope(
52-
&gv_array[2],
53-
&vec![
54-
("_x", GameValue::Anything),
55-
("_accumulator", GameValue::Anything),
56-
],
57-
);
58-
}
45+
"cba_fnc_inject" if gv_array.len() > 2 => {
46+
self.external_current_scope(
47+
&gv_array[2],
48+
&vec![
49+
("_x", GameValue::Anything),
50+
("_accumulator", GameValue::Anything),
51+
],
52+
);
5953
}
60-
"cba_fnc_directcall" => {
61-
if !gv_array.is_empty() {
62-
self.external_current_scope(&gv_array[0], &vec![]);
63-
}
54+
"cba_fnc_directcall" if !gv_array.is_empty() => {
55+
self.external_current_scope(&gv_array[0], &vec![]);
6456
}
65-
"ace_common_fnc_cachedcall" => {
66-
if gv_array.len() > 1 {
67-
self.external_current_scope(&gv_array[1], &vec![]);
68-
}
57+
"ace_common_fnc_cachedcall" if gv_array.len() > 1 => {
58+
self.external_current_scope(&gv_array[1], &vec![]);
6959
}
7060
// Functions that will start in a new scope
7161
"ace_interact_menu_fnc_createaction" => {
@@ -84,41 +74,35 @@ impl Inspector<'_> {
8474
}
8575
"cba_fnc_addperframehandler"
8676
| "cba_fnc_waitandexecute"
87-
| "cba_fnc_execnextframe" => {
88-
if !gv_array.is_empty() {
89-
self.external_new_scope(&gv_array[0], &vec![]);
90-
}
77+
| "cba_fnc_execnextframe"
78+
if !gv_array.is_empty() =>
79+
{
80+
self.external_new_scope(&gv_array[0], &vec![]);
9181
}
92-
"cba_fnc_addclasseventhandler" => {
93-
if gv_array.len() > 2 {
94-
self.external_new_scope(&gv_array[2], &vec![]);
95-
}
82+
"cba_fnc_addclasseventhandler" if gv_array.len() > 2 => {
83+
self.external_new_scope(&gv_array[2], &vec![]);
9684
}
97-
"cba_fnc_addbiseventhandler" => {
98-
if gv_array.len() > 2 {
99-
self.external_new_scope(
100-
&gv_array[2],
101-
&vec![
102-
("_thisType", GameValue::String(None)),
103-
("_thisId", GameValue::Number(None)),
104-
("_thisFnc", GameValue::Code(None)),
105-
("_thisArgs", GameValue::Anything),
106-
],
107-
);
108-
}
85+
"cba_fnc_addbiseventhandler" if gv_array.len() > 2 => {
86+
self.external_new_scope(
87+
&gv_array[2],
88+
&vec![
89+
("_thisType", GameValue::String(None)),
90+
("_thisId", GameValue::Number(None)),
91+
("_thisFnc", GameValue::Code(None)),
92+
("_thisArgs", GameValue::Anything),
93+
],
94+
);
10995
}
110-
"cba_fnc_addeventhandlerargs" => {
111-
if gv_array.len() > 1 {
112-
self.external_new_scope(
113-
&gv_array[1],
114-
&vec![
115-
("_thisType", GameValue::String(None)),
116-
("_thisId", GameValue::Number(None)),
117-
("_thisFnc", GameValue::Code(None)),
118-
("_thisArgs", GameValue::Anything),
119-
],
120-
);
121-
}
96+
"cba_fnc_addeventhandlerargs" if gv_array.len() > 1 => {
97+
self.external_new_scope(
98+
&gv_array[1],
99+
&vec![
100+
("_thisType", GameValue::String(None)),
101+
("_thisId", GameValue::Number(None)),
102+
("_thisFnc", GameValue::Code(None)),
103+
("_thisArgs", GameValue::Anything),
104+
],
105+
);
122106
}
123107
_ => {}
124108
},

‎libs/sqf/src/analyze/lints/s03_static_typename.rs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,8 @@ impl LintRunner<LintData> for Runner {
105105
};
106106
(a, b, name.len())
107107
}
108-
Expression::UnaryCommand(UnaryCommand::Named(name), _, span) => {
109-
if name == "text" {
110-
("TEXT", span, name.len())
111-
} else {
112-
return Vec::new();
113-
}
108+
Expression::UnaryCommand(UnaryCommand::Named(name), _, span) if name == "text" => {
109+
("TEXT", span, name.len())
114110
}
115111
_ => return Vec::new(),
116112
};

‎libs/sqf/src/analyze/lints/s05_if_assign.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ impl Code for CodeS05IfAssign {
155155

156156
fn suggestion(&self) -> Option<String> {
157157
if self.lhs.0 .0 == "1" && self.rhs.0 .0 == "0" {
158-
Some(format!("parseNumber {}", self.condition.0.as_str(),))
158+
Some(format!("parseNumber {}", self.condition.0.as_str()))
159159
} else if self.lhs.0 == (String::from("true"), false) && self.rhs.0 == (String::from("false"), false) {
160160
Some(self.condition.0.as_str().to_string())
161161
} else if self.lhs.0 == (String::from("false"), false) && self.rhs.0 == (String::from("true"), false) {

‎libs/sqf/src/analyze/lints/s08_format_args.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ impl LintRunner<LintData> for Runner {
111111

112112
#[must_use]
113113
fn get_format_problem(input: &str, extra_args: usize) -> Option<String> {
114-
let format = format!("{input} ",); // add extra terminator
114+
let format = format!("{input} "); // add extra terminator
115115

116116
let mut tokens: Vec<usize> = Vec::new();
117117
let mut token_active = false;

0 commit comments

Comments
 (0)