Skip to content

Commit 71bf168

Browse files
kennykerrkennykerr
authored
Improve clippy workflow (#2320)
1 parent 86bfc0d commit 71bf168

8 files changed

Lines changed: 114 additions & 110 deletions

File tree

‎.github/workflows/clippy.yml‎

Lines changed: 105 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -32,108 +32,108 @@ jobs:
3232
>> $env:GITHUB_ENV
3333
- name: Run cargo clippy
3434
run: |
35-
cargo clippy -p riddle -- -A clippy::uninlined_format_args &&
36-
cargo clippy -p sample_bits -- -A clippy::uninlined_format_args &&
37-
cargo clippy -p sample_com_uri -- -A clippy::uninlined_format_args &&
38-
cargo clippy -p sample_consent -- -A clippy::uninlined_format_args &&
39-
cargo clippy -p sample_core_app -- -A clippy::uninlined_format_args &&
40-
cargo clippy -p sample_counter -- -A clippy::uninlined_format_args &&
41-
cargo clippy -p sample_counter_sys -- -A clippy::uninlined_format_args &&
42-
cargo clippy -p sample_create_window -- -A clippy::uninlined_format_args &&
43-
cargo clippy -p sample_create_window_sys -- -A clippy::uninlined_format_args &&
44-
cargo clippy -p sample_data_protection -- -A clippy::uninlined_format_args &&
45-
cargo clippy -p sample_dcomp -- -A clippy::uninlined_format_args &&
46-
cargo clippy -p sample_device_watcher -- -A clippy::uninlined_format_args &&
47-
cargo clippy -p sample_direct2d -- -A clippy::uninlined_format_args &&
48-
cargo clippy -p sample_direct3d12 -- -A clippy::uninlined_format_args &&
49-
cargo clippy -p sample_enum_windows -- -A clippy::uninlined_format_args &&
50-
cargo clippy -p sample_enum_windows_sys -- -A clippy::uninlined_format_args &&
51-
cargo clippy -p sample_kernel_event -- -A clippy::uninlined_format_args &&
52-
cargo clippy -p sample_memory_buffer -- -A clippy::uninlined_format_args &&
53-
cargo clippy -p sample_message_box -- -A clippy::uninlined_format_args &&
54-
cargo clippy -p sample_message_box_sys -- -A clippy::uninlined_format_args &&
55-
cargo clippy -p sample_ocr -- -A clippy::uninlined_format_args &&
56-
cargo clippy -p sample_overlapped -- -A clippy::uninlined_format_args &&
57-
cargo clippy -p sample_rss -- -A clippy::uninlined_format_args &&
58-
cargo clippy -p sample_simple -- -A clippy::uninlined_format_args &&
59-
cargo clippy -p sample_spellchecker -- -A clippy::uninlined_format_args &&
60-
cargo clippy -p sample_thread_pool_work -- -A clippy::uninlined_format_args &&
61-
cargo clippy -p sample_thread_pool_work_sys -- -A clippy::uninlined_format_args &&
62-
cargo clippy -p sample_uiautomation -- -A clippy::uninlined_format_args &&
63-
cargo clippy -p sample_wmi -- -A clippy::uninlined_format_args &&
64-
cargo clippy -p sample_xml -- -A clippy::uninlined_format_args &&
65-
cargo clippy -p test_agile -- -A clippy::uninlined_format_args &&
66-
cargo clippy -p test_agile_reference -- -A clippy::uninlined_format_args &&
67-
cargo clippy -p test_alternate_success_code -- -A clippy::uninlined_format_args &&
68-
cargo clippy -p test_arch -- -A clippy::uninlined_format_args &&
69-
cargo clippy -p test_arch_feature -- -A clippy::uninlined_format_args &&
70-
cargo clippy -p test_bcrypt -- -A clippy::uninlined_format_args &&
71-
cargo clippy -p test_bstr -- -A clippy::uninlined_format_args &&
72-
cargo clippy -p test_calling_convention -- -A clippy::uninlined_format_args &&
73-
cargo clippy -p test_cfg_generic -- -A clippy::uninlined_format_args &&
74-
cargo clippy -p test_component -- -A clippy::uninlined_format_args &&
75-
cargo clippy -p test_component_client -- -A clippy::uninlined_format_args &&
76-
cargo clippy -p test_const_fields -- -A clippy::uninlined_format_args &&
77-
cargo clippy -p test_const_ptrs -- -A clippy::uninlined_format_args &&
78-
cargo clippy -p test_core -- -A clippy::uninlined_format_args &&
79-
cargo clippy -p test_debug -- -A clippy::uninlined_format_args &&
80-
cargo clippy -p test_debugger_visualizer_x -- -A clippy::uninlined_format_args &&
81-
cargo clippy -p test_deprecated -- -A clippy::uninlined_format_args &&
82-
cargo clippy -p test_dispatch -- -A clippy::uninlined_format_args &&
83-
cargo clippy -p test_does_not_return -- -A clippy::uninlined_format_args &&
84-
cargo clippy -p test_enums -- -A clippy::uninlined_format_args &&
85-
cargo clippy -p test_error -- -A clippy::uninlined_format_args &&
86-
cargo clippy -p test_event -- -A clippy::uninlined_format_args &&
87-
cargo clippy -p test_extensions -- -A clippy::uninlined_format_args &&
88-
cargo clippy -p test_handles -- -A clippy::uninlined_format_args &&
89-
cargo clippy -p test_helpers -- -A clippy::uninlined_format_args &&
90-
cargo clippy -p test_implement -- -A clippy::uninlined_format_args &&
91-
cargo clippy -p test_interface -- -A clippy::uninlined_format_args &&
92-
cargo clippy -p test_interop -- -A clippy::uninlined_format_args &&
93-
cargo clippy -p test_lib -- -A clippy::uninlined_format_args &&
94-
cargo clippy -p test_literals -- -A clippy::uninlined_format_args &&
95-
cargo clippy -p test_match -- -A clippy::uninlined_format_args &&
96-
cargo clippy -p test_matrix3x2 -- -A clippy::uninlined_format_args &&
97-
cargo clippy -p test_metadata -- -A clippy::uninlined_format_args &&
98-
cargo clippy -p test_msrv -- -A clippy::uninlined_format_args &&
99-
cargo clippy -p test_no_use -- -A clippy::uninlined_format_args &&
100-
cargo clippy -p test_not_dll -- -A clippy::uninlined_format_args &&
101-
cargo clippy -p test_query_signature -- -A clippy::uninlined_format_args &&
102-
cargo clippy -p test_readme -- -A clippy::uninlined_format_args &&
103-
cargo clippy -p test_reserved -- -A clippy::uninlined_format_args &&
104-
cargo clippy -p test_resources -- -A clippy::uninlined_format_args &&
105-
cargo clippy -p test_return_struct -- -A clippy::uninlined_format_args &&
106-
cargo clippy -p test_riddle -- -A clippy::uninlined_format_args &&
107-
cargo clippy -p test_simple_component -- -A clippy::uninlined_format_args &&
108-
cargo clippy -p test_string_param -- -A clippy::uninlined_format_args &&
109-
cargo clippy -p test_structs -- -A clippy::uninlined_format_args &&
110-
cargo clippy -p test_sys -- -A clippy::uninlined_format_args &&
111-
cargo clippy -p test_unions -- -A clippy::uninlined_format_args &&
112-
cargo clippy -p test_weak -- -A clippy::uninlined_format_args &&
113-
cargo clippy -p test_weak_ref -- -A clippy::uninlined_format_args &&
114-
cargo clippy -p test_win32 -- -A clippy::uninlined_format_args &&
115-
cargo clippy -p test_win32_arrays -- -A clippy::uninlined_format_args &&
116-
cargo clippy -p test_window_long -- -A clippy::uninlined_format_args &&
117-
cargo clippy -p test_winrt -- -A clippy::uninlined_format_args &&
118-
cargo clippy -p tool_gnu -- -A clippy::uninlined_format_args &&
119-
cargo clippy -p tool_lib -- -A clippy::uninlined_format_args &&
120-
cargo clippy -p tool_license -- -A clippy::uninlined_format_args &&
121-
cargo clippy -p tool_msvc -- -A clippy::uninlined_format_args &&
122-
cargo clippy -p tool_sys -- -A clippy::uninlined_format_args &&
123-
cargo clippy -p tool_windows -- -A clippy::uninlined_format_args &&
124-
cargo clippy -p tool_yml -- -A clippy::uninlined_format_args &&
125-
cargo clippy -p windows -- -A clippy::uninlined_format_args &&
126-
cargo clippy -p windows-bindgen -- -A clippy::uninlined_format_args &&
127-
cargo clippy -p windows-implement -- -A clippy::uninlined_format_args &&
128-
cargo clippy -p windows-interface -- -A clippy::uninlined_format_args &&
129-
cargo clippy -p windows-metadata -- -A clippy::uninlined_format_args &&
130-
cargo clippy -p windows-sys -- -A clippy::uninlined_format_args &&
131-
cargo clippy -p windows-targets -- -A clippy::uninlined_format_args &&
132-
cargo clippy -p windows-tokens -- -A clippy::uninlined_format_args &&
133-
cargo clippy -p windows_aarch64_gnullvm -- -A clippy::uninlined_format_args &&
134-
cargo clippy -p windows_aarch64_msvc -- -A clippy::uninlined_format_args &&
135-
cargo clippy -p windows_i686_gnu -- -A clippy::uninlined_format_args &&
136-
cargo clippy -p windows_i686_msvc -- -A clippy::uninlined_format_args &&
137-
cargo clippy -p windows_x86_64_gnu -- -A clippy::uninlined_format_args &&
138-
cargo clippy -p windows_x86_64_gnullvm -- -A clippy::uninlined_format_args &&
139-
cargo clippy -p windows_x86_64_msvc -- -A clippy::uninlined_format_args
35+
cargo clippy -p riddle &&
36+
cargo clippy -p sample_bits &&
37+
cargo clippy -p sample_com_uri &&
38+
cargo clippy -p sample_consent &&
39+
cargo clippy -p sample_core_app &&
40+
cargo clippy -p sample_counter &&
41+
cargo clippy -p sample_counter_sys &&
42+
cargo clippy -p sample_create_window &&
43+
cargo clippy -p sample_create_window_sys &&
44+
cargo clippy -p sample_data_protection &&
45+
cargo clippy -p sample_dcomp &&
46+
cargo clippy -p sample_device_watcher &&
47+
cargo clippy -p sample_direct2d &&
48+
cargo clippy -p sample_direct3d12 &&
49+
cargo clippy -p sample_enum_windows &&
50+
cargo clippy -p sample_enum_windows_sys &&
51+
cargo clippy -p sample_kernel_event &&
52+
cargo clippy -p sample_memory_buffer &&
53+
cargo clippy -p sample_message_box &&
54+
cargo clippy -p sample_message_box_sys &&
55+
cargo clippy -p sample_ocr &&
56+
cargo clippy -p sample_overlapped &&
57+
cargo clippy -p sample_rss &&
58+
cargo clippy -p sample_simple &&
59+
cargo clippy -p sample_spellchecker &&
60+
cargo clippy -p sample_thread_pool_work &&
61+
cargo clippy -p sample_thread_pool_work_sys &&
62+
cargo clippy -p sample_uiautomation &&
63+
cargo clippy -p sample_wmi &&
64+
cargo clippy -p sample_xml &&
65+
cargo clippy -p test_agile &&
66+
cargo clippy -p test_agile_reference &&
67+
cargo clippy -p test_alternate_success_code &&
68+
cargo clippy -p test_arch &&
69+
cargo clippy -p test_arch_feature &&
70+
cargo clippy -p test_bcrypt &&
71+
cargo clippy -p test_bstr &&
72+
cargo clippy -p test_calling_convention &&
73+
cargo clippy -p test_cfg_generic &&
74+
cargo clippy -p test_component &&
75+
cargo clippy -p test_component_client &&
76+
cargo clippy -p test_const_fields &&
77+
cargo clippy -p test_const_ptrs &&
78+
cargo clippy -p test_core &&
79+
cargo clippy -p test_debug &&
80+
cargo clippy -p test_debugger_visualizer_x &&
81+
cargo clippy -p test_deprecated &&
82+
cargo clippy -p test_dispatch &&
83+
cargo clippy -p test_does_not_return &&
84+
cargo clippy -p test_enums &&
85+
cargo clippy -p test_error &&
86+
cargo clippy -p test_event &&
87+
cargo clippy -p test_extensions &&
88+
cargo clippy -p test_handles &&
89+
cargo clippy -p test_helpers &&
90+
cargo clippy -p test_implement &&
91+
cargo clippy -p test_interface &&
92+
cargo clippy -p test_interop &&
93+
cargo clippy -p test_lib &&
94+
cargo clippy -p test_literals &&
95+
cargo clippy -p test_match &&
96+
cargo clippy -p test_matrix3x2 &&
97+
cargo clippy -p test_metadata &&
98+
cargo clippy -p test_msrv &&
99+
cargo clippy -p test_no_use &&
100+
cargo clippy -p test_not_dll &&
101+
cargo clippy -p test_query_signature &&
102+
cargo clippy -p test_readme &&
103+
cargo clippy -p test_reserved &&
104+
cargo clippy -p test_resources &&
105+
cargo clippy -p test_return_struct &&
106+
cargo clippy -p test_riddle &&
107+
cargo clippy -p test_simple_component &&
108+
cargo clippy -p test_string_param &&
109+
cargo clippy -p test_structs &&
110+
cargo clippy -p test_sys &&
111+
cargo clippy -p test_unions &&
112+
cargo clippy -p test_weak &&
113+
cargo clippy -p test_weak_ref &&
114+
cargo clippy -p test_win32 &&
115+
cargo clippy -p test_win32_arrays &&
116+
cargo clippy -p test_window_long &&
117+
cargo clippy -p test_winrt &&
118+
cargo clippy -p tool_gnu &&
119+
cargo clippy -p tool_lib &&
120+
cargo clippy -p tool_license &&
121+
cargo clippy -p tool_msvc &&
122+
cargo clippy -p tool_sys &&
123+
cargo clippy -p tool_windows &&
124+
cargo clippy -p tool_yml &&
125+
cargo clippy -p windows &&
126+
cargo clippy -p windows-bindgen &&
127+
cargo clippy -p windows-implement &&
128+
cargo clippy -p windows-interface &&
129+
cargo clippy -p windows-metadata &&
130+
cargo clippy -p windows-sys &&
131+
cargo clippy -p windows-targets &&
132+
cargo clippy -p windows-tokens &&
133+
cargo clippy -p windows_aarch64_gnullvm &&
134+
cargo clippy -p windows_aarch64_msvc &&
135+
cargo clippy -p windows_i686_gnu &&
136+
cargo clippy -p windows_i686_msvc &&
137+
cargo clippy -p windows_x86_64_gnu &&
138+
cargo clippy -p windows_x86_64_gnullvm &&
139+
cargo clippy -p windows_x86_64_msvc

‎crates/libs/implement/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ impl UseTree2 {
287287
let mut type_name = input.ident.to_string();
288288

289289
if !namespace.is_empty() {
290-
type_name = format!("{}::{}", namespace, type_name);
290+
type_name = format!("{namespace}::{type_name}");
291291
}
292292

293293
let mut generics = vec![];

‎crates/libs/interface/src/lib.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ impl Interface {
280280
/// Generates various conversions such as from and to `IUnknown`
281281
fn gen_conversions(&self) -> proc_macro2::TokenStream {
282282
let name = &self.name;
283-
let name_string = format!("{}", name);
283+
let name_string = format!("{name}");
284284
quote! {
285285
impl ::core::convert::From<#name> for ::windows::core::IUnknown {
286286
fn from(value: #name) -> Self {
@@ -401,13 +401,13 @@ struct Guid(Option<syn::LitStr>);
401401
impl Guid {
402402
fn to_tokens(&self) -> syn::Result<proc_macro2::TokenStream> {
403403
fn hex_lit(num: &str) -> syn::LitInt {
404-
syn::LitInt::new(&format!("0x{}", num), proc_macro2::Span::call_site())
404+
syn::LitInt::new(&format!("0x{num}"), proc_macro2::Span::call_site())
405405
}
406406

407407
fn ensure_length(part: Option<&str>, index: usize, length: usize, span: proc_macro2::Span) -> syn::Result<String> {
408408
let part = match part {
409409
Some(p) => p,
410-
None => return Err(syn::Error::new(span, format!("The IID missing part at index {}", index))),
410+
None => return Err(syn::Error::new(span, format!("The IID missing part at index {index}"))),
411411
};
412412

413413
if part.len() != length {

‎crates/libs/sys/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ license = "MIT OR Apache-2.0"
88
description = "Rust for Windows"
99
repository = "https://github.com/microsoft/windows-rs"
1010
readme = "../../../docs/readme.md"
11+
rust-version = "1.48"
1112

1213
[package.metadata.docs.rs]
1314
default-target = "x86_64-pc-windows-msvc"

‎crates/libs/windows/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ description = "Rust for Windows"
99
repository = "https://github.com/microsoft/windows-rs"
1010
documentation = "https://microsoft.github.io/windows-docs-rs/"
1111
readme = "../../../docs/readme.md"
12+
rust-version = "1.48"
1213

1314
[package.metadata.docs.rs]
1415
default-target = "x86_64-pc-windows-msvc"

‎crates/tools/sys/src/main.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ license = "MIT OR Apache-2.0"
8080
description = "Rust for Windows"
8181
repository = "https://github.com/microsoft/windows-rs"
8282
readme = "../../../docs/readme.md"
83+
rust-version = "1.48"
8384
8485
[package.metadata.docs.rs]
8586
default-target = "x86_64-pc-windows-msvc"

‎crates/tools/windows/src/main.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ description = "Rust for Windows"
5050
repository = "https://github.com/microsoft/windows-rs"
5151
documentation = "https://microsoft.github.io/windows-docs-rs/"
5252
readme = "../../../docs/readme.md"
53+
rust-version = "1.48"
5354
5455
[package.metadata.docs.rs]
5556
default-target = "x86_64-pc-windows-msvc"

‎crates/tools/yml/src/main.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ jobs:
149149
.to_string();
150150

151151
for name in crates(false) {
152-
write!(&mut yml, "\n cargo clippy -p {name} -- -A clippy::uninlined_format_args &&").unwrap();
152+
write!(&mut yml, "\n cargo clippy -p {name} &&").unwrap();
153153
}
154154

155155
yml.truncate(yml.len() - 3);

0 commit comments

Comments
 (0)
⚡