From 12fd4906de1dd3507b11107c524d0c5dc7cbe777 Mon Sep 17 00:00:00 2001 From: sigaloid <69441971+sigaloid@users.noreply.github.com> Date: Fri, 20 Aug 2021 16:31:20 -0400 Subject: [PATCH] Update dependencies and pass all clippy's (#636) * Cargo update https://pastebin.com/raw/KWNuJD9u * Cargo clippy +nightly * Remove deprecated clippy * Fix unbalanced backtick (now passes cargo {+nightly,} clippy) --- Cargo.lock | 63 +++++++++++++++++++-------------------- egui/src/layers.rs | 4 +-- egui/src/lib.rs | 2 -- egui_demo_lib/src/lib.rs | 2 -- egui_glium/src/lib.rs | 2 +- emath/src/lib.rs | 2 -- emath/src/rect.rs | 2 +- epaint/src/lib.rs | 2 -- epaint/src/text/galley.rs | 44 +++++++++++++-------------- epi/src/lib.rs | 2 -- 10 files changed, 56 insertions(+), 69 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1dad1ef3c..ce1c75fc5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -178,9 +178,9 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitvec" @@ -1208,9 +1208,9 @@ checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" [[package]] name = "js-sys" -version = "0.3.52" +version = "0.3.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce791b7ca6638aae45be056e068fc756d871eb3b3b10b8efa62d1c9cec616752" +checksum = "e4bf49d50e2961077d9c99f4b7997d770a1114f087c3c2e0069b36c13fc2979d" dependencies = [ "wasm-bindgen", ] @@ -1241,9 +1241,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.98" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790" +checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765" [[package]] name = "libloading" @@ -1309,9 +1309,9 @@ dependencies = [ [[package]] name = "matches" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" +checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" [[package]] name = "maybe-uninit" @@ -1554,9 +1554,9 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2c8fd66061a707503d515639b8af10fd3807a5b5ee6959f7ff1bd303634bd5" +checksum = "3f9bd055fb730c4f8f4f57d45d35cd6b3f0980535b056dc7ff119cee6a66ed6f" dependencies = [ "derivative", "num_enum_derive", @@ -1564,9 +1564,9 @@ dependencies = [ [[package]] name = "num_enum_derive" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "474fd1d096da3ad17084694eebed40ba09c4a36c5255cd772bd8b98859cc562e" +checksum = "486ea01961c4a818096de679a8b740b26d9033146ac5291b1c98557658f8cdd9" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -2013,9 +2013,9 @@ dependencies = [ [[package]] name = "serde_cbor" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622" +checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" dependencies = [ "half", "serde", @@ -2311,12 +2311,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" -dependencies = [ - "matches", -] +checksum = "246f4c42e67e7a4e3c6106ff716a5d067d4132a642840b242e357e468a2a0085" [[package]] name = "unicode-normalization" @@ -2410,9 +2407,9 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" [[package]] name = "wasm-bindgen" -version = "0.2.75" +version = "0.2.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b608ecc8f4198fe8680e2ed18eccab5f0cd4caaf3d83516fa5fb2e927fda2586" +checksum = "8ce9b1b516211d33767048e5d47fa2a381ed8b76fc48d2ce4aa39877f9f183e0" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -2420,9 +2417,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.75" +version = "0.2.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "580aa3a91a63d23aac5b6b267e2d13cb4f363e31dce6c352fca4752ae12e479f" +checksum = "cfe8dc78e2326ba5f845f4b5bf548401604fa20b1dd1d365fb73b6c1d6364041" dependencies = [ "bumpalo", "lazy_static", @@ -2435,9 +2432,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.25" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16646b21c3add8e13fdb8f20172f8a28c3dbf62f45406bcff0233188226cfe0c" +checksum = "95fded345a6559c2cfee778d562300c581f7d4ff3edb9b0d230d69800d213972" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -2447,9 +2444,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.75" +version = "0.2.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "171ebf0ed9e1458810dfcb31f2e766ad6b3a89dbda42d8901f2b268277e5f09c" +checksum = "44468aa53335841d9d6b6c023eaab07c0cd4bddbcfdee3e2bb1e8d2cb8069fef" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2457,9 +2454,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.75" +version = "0.2.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c2657dd393f03aa2a659c25c6ae18a13a4048cebd220e147933ea837efc589f" +checksum = "0195807922713af1e67dc66132c7328206ed9766af3858164fb583eedc25fbad" dependencies = [ "proc-macro2", "quote", @@ -2470,9 +2467,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.75" +version = "0.2.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e0c4a743a309662d45f4ede961d7afa4ba4131a59a639f29b0069c3798bbcc2" +checksum = "acdb075a845574a1fa5f09fd77e43f7747599301ea3417a9fbffdeedfc1f4a29" [[package]] name = "wayland-client" @@ -2559,9 +2556,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.52" +version = "0.3.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c70a82d842c9979078c772d4a1344685045f1a5628f677c2b2eab4dd7d2696" +checksum = "224b2f6b67919060055ef1a67807367c2066ed520c3862cc013d26cf893a783c" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/egui/src/layers.rs b/egui/src/layers.rs index 2b033b746..f4b8bc879 100644 --- a/egui/src/layers.rs +++ b/egui/src/layers.rs @@ -157,14 +157,14 @@ impl GraphicLayers { for layer_id in area_order { if layer_id.order == order { if let Some(list) = order_map.get_mut(&layer_id.id) { - all_shapes.extend(list.lock().0.drain(..)); + all_shapes.append(&mut list.lock().0); } } } // Also draw areas that are missing in `area_order`: for shapes in order_map.values_mut() { - all_shapes.extend(shapes.lock().0.drain(..)); + all_shapes.append(&mut shapes.lock().0); } } diff --git a/egui/src/lib.rs b/egui/src/lib.rs index ff06cc7f1..2ba1d4dcd 100644 --- a/egui/src/lib.rs +++ b/egui/src/lib.rs @@ -295,7 +295,6 @@ clippy::option_option, clippy::path_buf_push_overwrite, clippy::ptr_as_ptr, - clippy::pub_enum_variant_names, clippy::ref_option_ref, clippy::rest_pat_in_fully_bound_structs, clippy::same_functions_in_if_condition, @@ -310,7 +309,6 @@ clippy::unused_self, clippy::useless_transmute, clippy::verbose_file_reads, - clippy::wrong_pub_self_convention, clippy::zero_sized_map_values, future_incompatible, nonstandard_style, diff --git a/egui_demo_lib/src/lib.rs b/egui_demo_lib/src/lib.rs index 086dc0d74..f9fc22b90 100644 --- a/egui_demo_lib/src/lib.rs +++ b/egui_demo_lib/src/lib.rs @@ -57,7 +57,6 @@ clippy::option_option, clippy::path_buf_push_overwrite, clippy::ptr_as_ptr, - clippy::pub_enum_variant_names, clippy::ref_option_ref, clippy::rest_pat_in_fully_bound_structs, clippy::same_functions_in_if_condition, @@ -72,7 +71,6 @@ clippy::unused_self, clippy::useless_transmute, clippy::verbose_file_reads, - clippy::wrong_pub_self_convention, clippy::zero_sized_map_values, future_incompatible, nonstandard_style, diff --git a/egui_glium/src/lib.rs b/egui_glium/src/lib.rs index 47dcaf9dc..aaeaee1dd 100644 --- a/egui_glium/src/lib.rs +++ b/egui_glium/src/lib.rs @@ -520,7 +520,7 @@ impl EguiGlium { pub fn on_event(&mut self, event: &glium::glutin::event::WindowEvent<'_>) { crate::input_to_egui( self.egui_ctx.pixels_per_point(), - &event, + event, self.clipboard.as_mut(), &mut self.input_state, ); diff --git a/emath/src/lib.rs b/emath/src/lib.rs index f27f95a1f..edcc2b2d4 100644 --- a/emath/src/lib.rs +++ b/emath/src/lib.rs @@ -64,7 +64,6 @@ clippy::option_option, clippy::path_buf_push_overwrite, clippy::ptr_as_ptr, - clippy::pub_enum_variant_names, clippy::ref_option_ref, clippy::rest_pat_in_fully_bound_structs, clippy::same_functions_in_if_condition, @@ -79,7 +78,6 @@ clippy::unused_self, clippy::useless_transmute, clippy::verbose_file_reads, - clippy::wrong_pub_self_convention, clippy::zero_sized_map_values, future_incompatible, nonstandard_style, diff --git a/emath/src/rect.rs b/emath/src/rect.rs index d61310109..0be7ae0b4 100644 --- a/emath/src/rect.rs +++ b/emath/src/rect.rs @@ -334,7 +334,7 @@ impl Rect { /// ## Convenience functions (assumes origin is towards left top): impl Rect { - /// `min.x + /// `min.x` #[inline(always)] pub fn left(&self) -> f32 { self.min.x diff --git a/epaint/src/lib.rs b/epaint/src/lib.rs index 695ea4276..dc377d66d 100644 --- a/epaint/src/lib.rs +++ b/epaint/src/lib.rs @@ -55,7 +55,6 @@ clippy::option_option, clippy::path_buf_push_overwrite, clippy::ptr_as_ptr, - clippy::pub_enum_variant_names, clippy::ref_option_ref, clippy::rest_pat_in_fully_bound_structs, clippy::same_functions_in_if_condition, @@ -70,7 +69,6 @@ clippy::unused_self, clippy::useless_transmute, clippy::verbose_file_reads, - clippy::wrong_pub_self_convention, clippy::zero_sized_map_values, future_incompatible, nonstandard_style, diff --git a/epaint/src/text/galley.rs b/epaint/src/text/galley.rs index 7a6b32beb..296978149 100644 --- a/epaint/src/text/galley.rs +++ b/epaint/src/text/galley.rs @@ -598,55 +598,55 @@ fn test_text_layout() { let galley = font.layout_multiline("".to_owned(), 1024.0); assert_eq!(galley.rows.len(), 1); - assert_eq!(galley.rows[0].ends_with_newline, false); + assert!(!galley.rows[0].ends_with_newline); assert_eq!(galley.rows[0].x_offsets, vec![0.0]); let galley = font.layout_multiline("\n".to_owned(), 1024.0); assert_eq!(galley.rows.len(), 2); - assert_eq!(galley.rows[0].ends_with_newline, true); - assert_eq!(galley.rows[1].ends_with_newline, false); + assert!(galley.rows[0].ends_with_newline); + assert!(!galley.rows[1].ends_with_newline); assert_eq!(galley.rows[1].x_offsets, vec![0.0]); let galley = font.layout_multiline("\n\n".to_owned(), 1024.0); assert_eq!(galley.rows.len(), 3); - assert_eq!(galley.rows[0].ends_with_newline, true); - assert_eq!(galley.rows[1].ends_with_newline, true); - assert_eq!(galley.rows[2].ends_with_newline, false); + assert!(galley.rows[0].ends_with_newline); + assert!(galley.rows[1].ends_with_newline); + assert!(!galley.rows[2].ends_with_newline); assert_eq!(galley.rows[2].x_offsets, vec![0.0]); let galley = font.layout_multiline(" ".to_owned(), 1024.0); assert_eq!(galley.rows.len(), 1); - assert_eq!(galley.rows[0].ends_with_newline, false); + assert!(!galley.rows[0].ends_with_newline); let galley = font.layout_multiline("One row!".to_owned(), 1024.0); assert_eq!(galley.rows.len(), 1); - assert_eq!(galley.rows[0].ends_with_newline, false); + assert!(!galley.rows[0].ends_with_newline); let galley = font.layout_multiline("First row!\n".to_owned(), 1024.0); assert_eq!(galley.rows.len(), 2); - assert_eq!(galley.rows[0].ends_with_newline, true); - assert_eq!(galley.rows[1].ends_with_newline, false); + assert!(galley.rows[0].ends_with_newline); + assert!(!galley.rows[1].ends_with_newline); assert_eq!(galley.rows[1].x_offsets, vec![0.0]); let galley = font.layout_multiline("line\nbreak".to_owned(), 40.0); assert_eq!(galley.rows.len(), 2); - assert_eq!(galley.rows[0].ends_with_newline, true); - assert_eq!(galley.rows[1].ends_with_newline, false); + assert!(galley.rows[0].ends_with_newline); + assert!(!galley.rows[1].ends_with_newline); // Test wrapping: let galley = font.layout_multiline("word wrap".to_owned(), 40.0); assert_eq!(galley.rows.len(), 2); - assert_eq!(galley.rows[0].ends_with_newline, false); - assert_eq!(galley.rows[1].ends_with_newline, false); + assert!(!galley.rows[0].ends_with_newline); + assert!(!galley.rows[1].ends_with_newline); { // Test wrapping: let galley = font.layout_multiline("word wrap.\nNew para.".to_owned(), 40.0); assert_eq!(galley.rows.len(), 4); - assert_eq!(galley.rows[0].ends_with_newline, false); + assert!(!galley.rows[0].ends_with_newline); assert_eq!(galley.rows[0].char_count_excluding_newline(), "word ".len()); assert_eq!(galley.rows[0].char_count_including_newline(), "word ".len()); - assert_eq!(galley.rows[1].ends_with_newline, true); + assert!(galley.rows[1].ends_with_newline); assert_eq!(galley.rows[1].char_count_excluding_newline(), "wrap.".len()); assert_eq!( galley.rows[1].char_count_including_newline(), @@ -654,8 +654,8 @@ fn test_text_layout() { ); assert_eq!(galley.rows[2].char_count_excluding_newline(), "New ".len()); assert_eq!(galley.rows[3].char_count_excluding_newline(), "para.".len()); - assert_eq!(galley.rows[2].ends_with_newline, false); - assert_eq!(galley.rows[3].ends_with_newline, false); + assert!(!galley.rows[2].ends_with_newline); + assert!(!galley.rows[3].ends_with_newline); let cursor = Cursor::default(); assert_eq!(cursor, galley.from_ccursor(cursor.ccursor)); @@ -749,10 +749,10 @@ fn test_text_layout() { // Test cursor movement: let galley = font.layout_multiline("word wrap.\nNew para.".to_owned(), 40.0); assert_eq!(galley.rows.len(), 4); - assert_eq!(galley.rows[0].ends_with_newline, false); - assert_eq!(galley.rows[1].ends_with_newline, true); - assert_eq!(galley.rows[2].ends_with_newline, false); - assert_eq!(galley.rows[3].ends_with_newline, false); + assert!(!galley.rows[0].ends_with_newline); + assert!(galley.rows[1].ends_with_newline); + assert!(!galley.rows[2].ends_with_newline); + assert!(!galley.rows[3].ends_with_newline); let cursor = Cursor::default(); diff --git a/epi/src/lib.rs b/epi/src/lib.rs index c32c9168c..22a0d79d3 100644 --- a/epi/src/lib.rs +++ b/epi/src/lib.rs @@ -61,7 +61,6 @@ clippy::option_option, clippy::path_buf_push_overwrite, clippy::ptr_as_ptr, - clippy::pub_enum_variant_names, clippy::ref_option_ref, clippy::rest_pat_in_fully_bound_structs, clippy::same_functions_in_if_condition, @@ -76,7 +75,6 @@ clippy::unused_self, clippy::useless_transmute, clippy::verbose_file_reads, - clippy::wrong_pub_self_convention, clippy::zero_sized_map_values, future_incompatible, nonstandard_style,