From bd00aed7db8a5e9fef4c2420a4ef31b1ce609fd9 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Sat, 2 Mar 2024 21:14:42 -0500 Subject: [PATCH] Enable `clippy::drain_collect` (#8745) This PR enables the [`clippy::drain_collect`](https://rust-lang.github.io/rust-clippy/master/index.html#/drain_collect) rule and fixes the outstanding violations. Release Notes: - N/A --- crates/editor/src/element.rs | 2 +- tooling/xtask/src/main.rs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs index b0cc0822a4..05ec9c2324 100644 --- a/crates/editor/src/element.rs +++ b/crates/editor/src/element.rs @@ -2883,7 +2883,7 @@ impl LineWithInvisibles { .unwrap(); layouts.push(Self { line: shaped_line, - invisibles: invisibles.drain(..).collect(), + invisibles: std::mem::take(&mut invisibles), }); line.clear(); diff --git a/tooling/xtask/src/main.rs b/tooling/xtask/src/main.rs index 2d3edee3e0..174a6cbf13 100644 --- a/tooling/xtask/src/main.rs +++ b/tooling/xtask/src/main.rs @@ -89,7 +89,6 @@ fn run_clippy(args: ClippyArgs) -> Result<()> { "clippy::default_constructed_unit_structs", "clippy::derivable_impls", "clippy::derive_ord_xor_partial_ord", - "clippy::drain_collect", "clippy::eq_op", "clippy::expect_fun_call", "clippy::explicit_auto_deref",