From 048dad8c2e86006e53b3a134279729efb28b9e32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Wed, 17 Mar 2021 01:56:31 +0100 Subject: don't clone types that are copy (clippy::clone_on_copy) --- crates/hir_expand/src/hygiene.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'crates/hir_expand') diff --git a/crates/hir_expand/src/hygiene.rs b/crates/hir_expand/src/hygiene.rs index c8ea81210..87cad326d 100644 --- a/crates/hir_expand/src/hygiene.rs +++ b/crates/hir_expand/src/hygiene.rs @@ -23,7 +23,7 @@ pub struct Hygiene { impl Hygiene { pub fn new(db: &dyn AstDatabase, file_id: HirFileId) -> Hygiene { - Hygiene { frames: Some(HygieneFrames::new(db, file_id.clone())) } + Hygiene { frames: Some(HygieneFrames::new(db, file_id)) } } pub fn new_unhygienic() -> Hygiene { @@ -129,10 +129,7 @@ impl HygieneInfo { mbe::Origin::Call => (&self.macro_arg.1, self.arg_start), mbe::Origin::Def => ( &self.macro_def.1, - self.def_start - .as_ref() - .expect("`Origin::Def` used with non-`macro_rules!` macro") - .clone(), + *self.def_start.as_ref().expect("`Origin::Def` used with non-`macro_rules!` macro"), ), }; -- cgit v1.2.3 From 64b91393b85eb2b5d41ccbd3048dcc61eb8061c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Wed, 17 Mar 2021 02:19:40 +0100 Subject: remove uselessly wrapped ?s. (clippy::meedless_question_mark let x = Some(3); let y = Some(x?); can just be: let y = x --- crates/hir_expand/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'crates/hir_expand') diff --git a/crates/hir_expand/src/lib.rs b/crates/hir_expand/src/lib.rs index eee430af1..7532d00b8 100644 --- a/crates/hir_expand/src/lib.rs +++ b/crates/hir_expand/src/lib.rs @@ -475,7 +475,7 @@ fn original_range_opt( let single = skip_trivia_token(node.value.first_token()?, Direction::Next)? == skip_trivia_token(node.value.last_token()?, Direction::Prev)?; - Some(node.value.descendants().find_map(|it| { + node.value.descendants().find_map(|it| { let first = skip_trivia_token(it.first_token()?, Direction::Next)?; let first = ascend_call_token(db, &expansion, node.with_value(first))?; @@ -487,7 +487,7 @@ fn original_range_opt( } Some(first.with_value(first.value.text_range().cover(last.value.text_range()))) - })?) + }) } fn ascend_call_token( -- cgit v1.2.3