Skip to content

Commit b155996

Browse files
committed
Enable a bunch more clippy lints
1 parent 4022b84 commit b155996

File tree

8 files changed

+96
-6
lines changed

8 files changed

+96
-6
lines changed

egui/src/context.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ impl std::ops::Deref for CtxRef {
5858
type Target = Context;
5959

6060
fn deref(&self) -> &Context {
61-
self.0.deref()
61+
&*self.0
6262
}
6363
}
6464

egui/src/lib.rs

+18
Original file line numberDiff line numberDiff line change
@@ -252,23 +252,31 @@
252252
#![warn(
253253
clippy::all,
254254
clippy::await_holding_lock,
255+
clippy::char_lit_as_u8,
256+
clippy::checked_conversions,
255257
clippy::dbg_macro,
256258
clippy::debug_assert_with_mut_call,
257259
clippy::doc_markdown,
258260
clippy::empty_enum,
259261
clippy::enum_glob_use,
260262
clippy::exit,
263+
clippy::expl_impl_clone_on_copy,
264+
clippy::explicit_deref_methods,
261265
clippy::explicit_into_iter_loop,
266+
clippy::fallible_impl_from,
262267
clippy::filter_map_next,
268+
clippy::float_cmp_const,
263269
clippy::fn_params_excessive_bools,
264270
clippy::if_let_mutex,
265271
clippy::imprecise_flops,
266272
clippy::inefficient_to_string,
273+
clippy::invalid_upcast_comparisons,
267274
clippy::large_types_passed_by_value,
268275
clippy::let_unit_value,
269276
clippy::linkedlist,
270277
clippy::lossy_float_literal,
271278
clippy::macro_use_imports,
279+
clippy::manual_ok_or,
272280
clippy::map_err_ignore,
273281
clippy::map_flatten,
274282
clippy::match_on_vec_items,
@@ -278,21 +286,31 @@
278286
clippy::mismatched_target_os,
279287
clippy::missing_errors_doc,
280288
clippy::missing_safety_doc,
289+
clippy::mut_mut,
290+
clippy::mutex_integer,
281291
clippy::needless_borrow,
282292
clippy::needless_continue,
283293
clippy::needless_pass_by_value,
284294
clippy::option_option,
295+
clippy::path_buf_push_overwrite,
296+
clippy::ptr_as_ptr,
285297
clippy::pub_enum_variant_names,
286298
clippy::ref_option_ref,
287299
clippy::rest_pat_in_fully_bound_structs,
300+
clippy::same_functions_in_if_condition,
288301
clippy::string_add_assign,
289302
clippy::string_add,
303+
clippy::string_lit_as_bytes,
290304
clippy::string_to_string,
291305
clippy::todo,
306+
clippy::trait_duplication_in_bounds,
292307
clippy::unimplemented,
293308
clippy::unnested_or_patterns,
294309
clippy::unused_self,
310+
clippy::useless_transmute,
295311
clippy::verbose_file_reads,
312+
clippy::wrong_pub_self_convention,
313+
clippy::zero_sized_map_values,
296314
future_incompatible,
297315
nonstandard_style,
298316
rust_2018_idioms

egui_demo_lib/src/lib.rs

+18
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,31 @@
1313
#![warn(
1414
clippy::all,
1515
clippy::await_holding_lock,
16+
clippy::char_lit_as_u8,
17+
clippy::checked_conversions,
1618
clippy::dbg_macro,
1719
clippy::debug_assert_with_mut_call,
1820
clippy::doc_markdown,
1921
clippy::empty_enum,
2022
clippy::enum_glob_use,
2123
clippy::exit,
24+
clippy::expl_impl_clone_on_copy,
25+
clippy::explicit_deref_methods,
2226
clippy::explicit_into_iter_loop,
27+
clippy::fallible_impl_from,
2328
clippy::filter_map_next,
29+
clippy::float_cmp_const,
2430
clippy::fn_params_excessive_bools,
2531
clippy::if_let_mutex,
2632
clippy::imprecise_flops,
2733
clippy::inefficient_to_string,
34+
clippy::invalid_upcast_comparisons,
2835
clippy::large_types_passed_by_value,
2936
clippy::let_unit_value,
3037
clippy::linkedlist,
3138
clippy::lossy_float_literal,
3239
clippy::macro_use_imports,
40+
clippy::manual_ok_or,
3341
clippy::map_err_ignore,
3442
clippy::map_flatten,
3543
clippy::match_on_vec_items,
@@ -39,21 +47,31 @@
3947
clippy::mismatched_target_os,
4048
clippy::missing_errors_doc,
4149
clippy::missing_safety_doc,
50+
clippy::mut_mut,
51+
clippy::mutex_integer,
4252
clippy::needless_borrow,
4353
clippy::needless_continue,
4454
clippy::needless_pass_by_value,
4555
clippy::option_option,
56+
clippy::path_buf_push_overwrite,
57+
clippy::ptr_as_ptr,
4658
clippy::pub_enum_variant_names,
4759
clippy::ref_option_ref,
4860
clippy::rest_pat_in_fully_bound_structs,
61+
clippy::same_functions_in_if_condition,
4962
clippy::string_add_assign,
5063
clippy::string_add,
64+
clippy::string_lit_as_bytes,
5165
clippy::string_to_string,
5266
clippy::todo,
67+
clippy::trait_duplication_in_bounds,
5368
clippy::unimplemented,
5469
clippy::unnested_or_patterns,
5570
clippy::unused_self,
71+
clippy::useless_transmute,
5672
clippy::verbose_file_reads,
73+
clippy::wrong_pub_self_convention,
74+
clippy::zero_sized_map_values,
5775
future_incompatible,
5876
nonstandard_style,
5977
rust_2018_idioms

emath/src/lib.rs

+18
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,31 @@
2020
#![warn(
2121
clippy::all,
2222
clippy::await_holding_lock,
23+
clippy::char_lit_as_u8,
24+
clippy::checked_conversions,
2325
clippy::dbg_macro,
2426
clippy::debug_assert_with_mut_call,
2527
clippy::doc_markdown,
2628
clippy::empty_enum,
2729
clippy::enum_glob_use,
2830
clippy::exit,
31+
clippy::expl_impl_clone_on_copy,
32+
clippy::explicit_deref_methods,
2933
clippy::explicit_into_iter_loop,
34+
clippy::fallible_impl_from,
3035
clippy::filter_map_next,
36+
clippy::float_cmp_const,
3137
clippy::fn_params_excessive_bools,
3238
clippy::if_let_mutex,
3339
clippy::imprecise_flops,
3440
clippy::inefficient_to_string,
41+
clippy::invalid_upcast_comparisons,
3542
clippy::large_types_passed_by_value,
3643
clippy::let_unit_value,
3744
clippy::linkedlist,
3845
clippy::lossy_float_literal,
3946
clippy::macro_use_imports,
47+
clippy::manual_ok_or,
4048
clippy::map_err_ignore,
4149
clippy::map_flatten,
4250
clippy::match_on_vec_items,
@@ -46,21 +54,31 @@
4654
clippy::mismatched_target_os,
4755
clippy::missing_errors_doc,
4856
clippy::missing_safety_doc,
57+
clippy::mut_mut,
58+
clippy::mutex_integer,
4959
clippy::needless_borrow,
5060
clippy::needless_continue,
5161
clippy::needless_pass_by_value,
5262
clippy::option_option,
63+
clippy::path_buf_push_overwrite,
64+
clippy::ptr_as_ptr,
5365
clippy::pub_enum_variant_names,
5466
clippy::ref_option_ref,
5567
clippy::rest_pat_in_fully_bound_structs,
68+
clippy::same_functions_in_if_condition,
5669
clippy::string_add_assign,
5770
clippy::string_add,
71+
clippy::string_lit_as_bytes,
5872
clippy::string_to_string,
5973
clippy::todo,
74+
clippy::trait_duplication_in_bounds,
6075
clippy::unimplemented,
6176
clippy::unnested_or_patterns,
6277
clippy::unused_self,
78+
clippy::useless_transmute,
6379
clippy::verbose_file_reads,
80+
clippy::wrong_pub_self_convention,
81+
clippy::zero_sized_map_values,
6482
future_incompatible,
6583
nonstandard_style,
6684
rust_2018_idioms

epaint/src/lib.rs

+18
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,31 @@
1111
#![warn(
1212
clippy::all,
1313
clippy::await_holding_lock,
14+
clippy::char_lit_as_u8,
15+
clippy::checked_conversions,
1416
clippy::dbg_macro,
1517
clippy::debug_assert_with_mut_call,
1618
clippy::doc_markdown,
1719
clippy::empty_enum,
1820
clippy::enum_glob_use,
1921
clippy::exit,
22+
clippy::expl_impl_clone_on_copy,
23+
clippy::explicit_deref_methods,
2024
clippy::explicit_into_iter_loop,
25+
clippy::fallible_impl_from,
2126
clippy::filter_map_next,
27+
clippy::float_cmp_const,
2228
clippy::fn_params_excessive_bools,
2329
clippy::if_let_mutex,
2430
clippy::imprecise_flops,
2531
clippy::inefficient_to_string,
32+
clippy::invalid_upcast_comparisons,
2633
clippy::large_types_passed_by_value,
2734
clippy::let_unit_value,
2835
clippy::linkedlist,
2936
clippy::lossy_float_literal,
3037
clippy::macro_use_imports,
38+
clippy::manual_ok_or,
3139
clippy::map_err_ignore,
3240
clippy::map_flatten,
3341
clippy::match_on_vec_items,
@@ -37,21 +45,31 @@
3745
clippy::mismatched_target_os,
3846
clippy::missing_errors_doc,
3947
clippy::missing_safety_doc,
48+
clippy::mut_mut,
49+
clippy::mutex_integer,
4050
clippy::needless_borrow,
4151
clippy::needless_continue,
4252
clippy::needless_pass_by_value,
4353
clippy::option_option,
54+
clippy::path_buf_push_overwrite,
55+
clippy::ptr_as_ptr,
4456
clippy::pub_enum_variant_names,
4557
clippy::ref_option_ref,
4658
clippy::rest_pat_in_fully_bound_structs,
59+
clippy::same_functions_in_if_condition,
4760
clippy::string_add_assign,
4861
clippy::string_add,
62+
clippy::string_lit_as_bytes,
4963
clippy::string_to_string,
5064
clippy::todo,
65+
clippy::trait_duplication_in_bounds,
5166
clippy::unimplemented,
5267
clippy::unnested_or_patterns,
5368
clippy::unused_self,
69+
clippy::useless_transmute,
5470
clippy::verbose_file_reads,
71+
clippy::wrong_pub_self_convention,
72+
clippy::zero_sized_map_values,
5573
future_incompatible,
5674
nonstandard_style,
5775
rust_2018_idioms

epaint/src/mesh.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ impl Mesh {
6060

6161
/// Are all indices within the bounds of the contained vertices?
6262
pub fn is_valid(&self) -> bool {
63-
if self.vertices.len() <= u32::MAX as usize {
64-
let n = self.vertices.len() as u32;
63+
use std::convert::TryFrom;
64+
if let Ok(n) = u32::try_from(self.vertices.len()) {
6565
self.indices.iter().all(|&i| i < n)
6666
} else {
6767
false
@@ -255,8 +255,8 @@ pub struct Mesh16 {
255255
impl Mesh16 {
256256
/// Are all indices within the bounds of the contained vertices?
257257
pub fn is_valid(&self) -> bool {
258-
if self.vertices.len() <= u16::MAX as usize {
259-
let n = self.vertices.len() as u16;
258+
use std::convert::TryFrom;
259+
if let Ok(n) = u16::try_from(self.vertices.len()) {
260260
self.indices.iter().all(|&i| i < n)
261261
} else {
262262
false

epi/src/lib.rs

+18
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,31 @@
1717
#![warn(
1818
clippy::all,
1919
clippy::await_holding_lock,
20+
clippy::char_lit_as_u8,
21+
clippy::checked_conversions,
2022
clippy::dbg_macro,
2123
clippy::debug_assert_with_mut_call,
2224
clippy::doc_markdown,
2325
clippy::empty_enum,
2426
clippy::enum_glob_use,
2527
clippy::exit,
28+
clippy::expl_impl_clone_on_copy,
29+
clippy::explicit_deref_methods,
2630
clippy::explicit_into_iter_loop,
31+
clippy::fallible_impl_from,
2732
clippy::filter_map_next,
33+
clippy::float_cmp_const,
2834
clippy::fn_params_excessive_bools,
2935
clippy::if_let_mutex,
3036
clippy::imprecise_flops,
3137
clippy::inefficient_to_string,
38+
clippy::invalid_upcast_comparisons,
3239
clippy::large_types_passed_by_value,
3340
clippy::let_unit_value,
3441
clippy::linkedlist,
3542
clippy::lossy_float_literal,
3643
clippy::macro_use_imports,
44+
clippy::manual_ok_or,
3745
clippy::map_err_ignore,
3846
clippy::map_flatten,
3947
clippy::match_on_vec_items,
@@ -43,21 +51,31 @@
4351
clippy::mismatched_target_os,
4452
clippy::missing_errors_doc,
4553
clippy::missing_safety_doc,
54+
clippy::mut_mut,
55+
clippy::mutex_integer,
4656
clippy::needless_borrow,
4757
clippy::needless_continue,
4858
clippy::needless_pass_by_value,
4959
clippy::option_option,
60+
clippy::path_buf_push_overwrite,
61+
clippy::ptr_as_ptr,
5062
clippy::pub_enum_variant_names,
5163
clippy::ref_option_ref,
5264
clippy::rest_pat_in_fully_bound_structs,
65+
clippy::same_functions_in_if_condition,
5366
clippy::string_add_assign,
5467
clippy::string_add,
68+
clippy::string_lit_as_bytes,
5569
clippy::string_to_string,
5670
clippy::todo,
71+
clippy::trait_duplication_in_bounds,
5772
clippy::unimplemented,
5873
clippy::unnested_or_patterns,
5974
clippy::unused_self,
75+
clippy::useless_transmute,
6076
clippy::verbose_file_reads,
77+
clippy::wrong_pub_self_convention,
78+
clippy::zero_sized_map_values,
6179
future_incompatible,
6280
nonstandard_style,
6381
rust_2018_idioms

sh/check.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ cargo test --workspace --doc
1111
cargo check --workspace --all-targets --all-features
1212
cargo check -p egui_demo_app --lib --target wasm32-unknown-unknown
1313
cargo check -p egui_demo_app --lib --target wasm32-unknown-unknown --all-features
14-
CARGO_INCREMENTAL=0 cargo clippy --workspace --all-targets --all-features -- -D warnings -W clippy::all
14+
cargo clippy --workspace --all-targets --all-features -- -D warnings -W clippy::all
1515
cargo test --workspace --all-targets --all-features
1616
cargo fmt --all -- --check
1717

0 commit comments

Comments
 (0)