rust-analyzer

diff --git a/crates/ide-assists/src/handlers/add_missing_match_arms.rs b/crates/ide-assists/src/handlers/add_missing_match_arms.rs
index eec1e648c0..37f5f44dfa 100644
--- a/crates/ide-assists/src/handlers/add_missing_match_arms.rs
+++ b/crates/ide-assists/src/handlers/add_missing_match_arms.rs

@@ -1,6 +1,4 @@

use std::iter::{self, Peekable};

-use std::ops::Deref;

-use std::rc::Rc;

use either::Either;

use hir::{sym, Adt, Crate, HasAttrs, ImportPathConfig, ModuleDef, Semantics};

@@ -78,10 +76,7 @@ pub(crate) fn add_missing_match_arms(acc: &mut Assists, ctx: &AssistContext<'_>)

let cfg = ctx.config.import_path_config();

- // As `make` is borrowed by the closure that builds `missing_pats`, this is needed

- // to satisfy the borrow checker.

- let make = Rc::new(SyntaxFactory::new());

- let make_weak = Rc::downgrade(&make);

+ let make = SyntaxFactory::new();

let module = ctx.sema.scope(expr.syntax())?.module();

let (mut missing_pats, is_non_exhaustive, has_hidden_variants): (

@@ -99,9 +94,8 @@ pub(crate) fn add_missing_match_arms(acc: &mut Assists, ctx: &AssistContext<'_>)

let missing_pats = variants

.into_iter()

.filter_map(|variant| {

- let make = make_weak.upgrade()?;

Some((

- build_pat(ctx, make, module, variant, cfg)?,

+ build_pat(ctx, &make, module, variant, cfg)?,

variant.should_be_hidden(ctx.db(), module.krate()),

))

})

@@ -148,17 +142,15 @@ pub(crate) fn add_missing_match_arms(acc: &mut Assists, ctx: &AssistContext<'_>)

.into_iter()

.multi_cartesian_product()

.inspect(|_| cov_mark::hit!(add_missing_match_arms_lazy_computation))

- .filter_map(|variants| {

+ .map(|variants| {

let is_hidden = variants

.iter()

.any(|variant| variant.should_be_hidden(ctx.db(), module.krate()));

- let patterns = variants.into_iter().filter_map(|variant| {

- make_weak.upgrade().and_then(|make| build_pat(ctx, make, module, variant, cfg))

- });

+ let patterns = variants

+ .into_iter()

+ .filter_map(|variant| build_pat(ctx, &make, module, variant, cfg));

- make_weak

- .upgrade()

- .map(|make| (ast::Pat::from(make.tuple_pat(patterns)), is_hidden))

+ (ast::Pat::from(make.tuple_pat(patterns)), is_hidden)

})

.filter(|(variant_pat, _)| is_variant_missing(&top_lvl_pats, variant_pat));

(

@@ -183,17 +175,15 @@ pub(crate) fn add_missing_match_arms(acc: &mut Assists, ctx: &AssistContext<'_>)

.into_iter()

.multi_cartesian_product()

.inspect(|_| cov_mark::hit!(add_missing_match_arms_lazy_computation))

- .filter_map(|variants| {

+ .map(|variants| {

let is_hidden = variants

.iter()

.any(|variant| variant.should_be_hidden(ctx.db(), module.krate()));

- let patterns = variants.into_iter().filter_map(|variant| {

- make_weak.upgrade().and_then(|make| build_pat(ctx, make, module, variant, cfg))

- });

+ let patterns = variants

+ .into_iter()

+ .filter_map(|variant| build_pat(ctx, &make, module, variant, cfg));

- make_weak

- .upgrade()

- .map(|make| (ast::Pat::from(make.slice_pat(patterns)), is_hidden))

+ (ast::Pat::from(make.slice_pat(patterns)), is_hidden)

})

.filter(|(variant_pat, _)| is_variant_missing(&top_lvl_pats, variant_pat));

(

@@ -303,7 +293,7 @@ pub(crate) fn add_missing_match_arms(acc: &mut Assists, ctx: &AssistContext<'_>)

}

- editor.add_mappings(Rc::into_inner(make).unwrap().finish_with_mappings());

+ editor.add_mappings(make.take());

builder.add_file_edits(ctx.file_id(), editor);

)

@@ -458,7 +448,7 @@ fn resolve_array_of_enum_def(

fn build_pat(

ctx: &AssistContext<'_>,

- make: impl Deref<Target = SyntaxFactory>,

+ make: &SyntaxFactory,

module: hir::Module,

var: ExtendedVariant,

cfg: ImportPathConfig,

diff --git a/crates/syntax/src/ast/syntax_factory.rs b/crates/syntax/src/ast/syntax_factory.rs
index 73bbe49105..1c517ac2c7 100644
--- a/crates/syntax/src/ast/syntax_factory.rs
+++ b/crates/syntax/src/ast/syntax_factory.rs

@@ -33,6 +33,11 @@ impl SyntaxFactory {

self.mappings.unwrap_or_default().into_inner()

}

+ /// Take all of the tracked syntax mappings, leaving `SyntaxMapping::default()` in its place, if any.

+ pub fn take(&self) -> SyntaxMapping {

+ self.mappings.as_ref().map(|mappings| mappings.take()).unwrap_or_default()

+ }

fn mappings(&self) -> Option<RefMut<'_, SyntaxMapping>> {

self.mappings.as_ref().map(|it| it.borrow_mut())

}

diff --git a/crates/syntax/src/ast/syntax_factory/constructors.rs b/crates/syntax/src/ast/syntax_factory/constructors.rs
index 044d68b528..19c5c64e21 100644
--- a/crates/syntax/src/ast/syntax_factory/constructors.rs
+++ b/crates/syntax/src/ast/syntax_factory/constructors.rs

@@ -331,7 +331,7 @@ impl SyntaxFactory {

}

pub fn expr_paren(&self, expr: ast::Expr) -> ast::ParenExpr {

- // FIXME: `make::expr_paren` should return a `MethodCallExpr`, not just an `Expr`

+ // FIXME: `make::expr_paren` should return a `ParenExpr`, not just an `Expr`

let ast::Expr::ParenExpr(ast) = make::expr_paren(expr.clone()).clone_for_update() else {

unreachable!()

};