3 files changed, 17 insertions, 23 deletions

diff --git a/crates/ra_assists/src/assists/add_missing_impl_members.rs b/crates/ra_assists/src/assists/add_missing_impl_members.rs
index 11d69a04b..22d20909d 100644
--- a/crates/ra_assists/src/assists/add_missing_impl_members.rs
+++ b/crates/ra_assists/src/assists/add_missing_impl_members.rs
@@ -4,7 +4,7 @@ use ra_syntax::{
     SmolStr,
 };
 
-use crate::{ast_builder::AstBuilder, ast_editor::AstEditor, Assist, AssistCtx, AssistId};
+use crate::{ast_builder::Make, ast_editor::AstEditor, Assist, AssistCtx, AssistId};
 
 #[derive(PartialEq)]
 enum AddMissingImplMembersMode {
@@ -102,9 +102,7 @@ fn strip_docstring(item: ast::ImplItem) -> ast::ImplItem {
 fn add_body(fn_def: ast::FnDef) -> ast::FnDef {
     let mut ast_editor = AstEditor::new(fn_def.clone());
     if fn_def.body().is_none() {
-        ast_editor.set_body(&AstBuilder::<ast::Block>::single_expr(
-            AstBuilder::<ast::Expr>::unimplemented(),
-        ));
+        ast_editor.set_body(&Make::<ast::Block>::single_expr(Make::<ast::Expr>::unimplemented()));
     }
     ast_editor.ast().to_owned()
 }
diff --git a/crates/ra_assists/src/assists/fill_match_arms.rs b/crates/ra_assists/src/assists/fill_match_arms.rs
index f1c36b805..817433526 100644
--- a/crates/ra_assists/src/assists/fill_match_arms.rs
+++ b/crates/ra_assists/src/assists/fill_match_arms.rs
@@ -3,7 +3,7 @@ use std::iter;
 use hir::{db::HirDatabase, Adt, HasSource};
 use ra_syntax::ast::{self, AstNode, NameOwner};
 
-use crate::{ast_builder::AstBuilder, Assist, AssistCtx, AssistId};
+use crate::{ast_builder::Make, Assist, AssistCtx, AssistId};
 
 pub(crate) fn fill_match_arms(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
     let match_expr = ctx.node_at_offset::<ast::MatchExpr>()?;
@@ -29,13 +29,10 @@ pub(crate) fn fill_match_arms(mut ctx: AssistCtx<impl HirDatabase>) -> Option<As
 
     ctx.add_action(AssistId("fill_match_arms"), "fill match arms", |edit| {
         let variants = variant_list.variants();
-        let arms = variants.filter_map(build_pat).map(|pat| {
-            AstBuilder::<ast::MatchArm>::from_pieces(
-                iter::once(pat),
-                AstBuilder::<ast::Expr>::unit(),
-            )
-        });
-        let new_arm_list = AstBuilder::<ast::MatchArmList>::from_arms(arms);
+        let arms = variants
+            .filter_map(build_pat)
+            .map(|pat| Make::<ast::MatchArm>::from(iter::once(pat), Make::<ast::Expr>::unit()));
+        let new_arm_list = Make::<ast::MatchArmList>::from_arms(arms);
 
         edit.target(match_expr.syntax().text_range());
         edit.set_cursor(expr.syntax().text_range().start());
@@ -66,21 +63,21 @@ fn resolve_enum_def(
 }
 
 fn build_pat(var: ast::EnumVariant) -> Option<ast::Pat> {
-    let path = AstBuilder::<ast::Path>::from_pieces(var.parent_enum().name()?, var.name()?);
+    let path = Make::<ast::Path>::from(var.parent_enum().name()?, var.name()?);
 
     let pat: ast::Pat = match var.kind() {
         ast::StructKind::Tuple(field_list) => {
-            let pats = iter::repeat(AstBuilder::<ast::PlaceholderPat>::placeholder().into())
+            let pats = iter::repeat(Make::<ast::PlaceholderPat>::placeholder().into())
                 .take(field_list.fields().count());
-            AstBuilder::<ast::TupleStructPat>::from_pieces(path, pats).into()
+            Make::<ast::TupleStructPat>::from(path, pats).into()
         }
         ast::StructKind::Named(field_list) => {
             let pats = field_list
                 .fields()
-                .map(|f| AstBuilder::<ast::BindPat>::from_name(f.name().unwrap()).into());
-            AstBuilder::<ast::RecordPat>::from_pieces(path, pats).into()
+                .map(|f| Make::<ast::BindPat>::from_name(f.name().unwrap()).into());
+            Make::<ast::RecordPat>::from(path, pats).into()
         }
-        ast::StructKind::Unit => AstBuilder::<ast::PathPat>::from_path(path).into(),
+        ast::StructKind::Unit => Make::<ast::PathPat>::from_path(path).into(),
     };
 
     Some(pat)
diff --git a/crates/ra_assists/src/assists/move_bounds.rs b/crates/ra_assists/src/assists/move_bounds.rs
index aa9036fed..6fd2fb72b 100644
--- a/crates/ra_assists/src/assists/move_bounds.rs
+++ b/crates/ra_assists/src/assists/move_bounds.rs
@@ -6,7 +6,7 @@ use ra_syntax::{
     TextRange,
 };
 
-use crate::{ast_builder::AstBuilder, Assist, AssistCtx, AssistId};
+use crate::{ast_builder::Make, Assist, AssistCtx, AssistId};
 
 pub(crate) fn move_bounds_to_where_clause(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
     let type_param_list = ctx.node_at_offset::<ast::TypeParamList>()?;
@@ -52,7 +52,7 @@ pub(crate) fn move_bounds_to_where_clause(mut ctx: AssistCtx<impl HirDatabase>)
             }
 
             let predicates = type_params.iter().filter_map(build_predicate);
-            let where_clause = AstBuilder::<ast::WhereClause>::from_predicates(predicates);
+            let where_clause = Make::<ast::WhereClause>::from_predicates(predicates);
 
             let to_insert = match anchor.prev_sibling_or_token() {
                 Some(ref elem) if elem.kind() == WHITESPACE => {
@@ -69,9 +69,8 @@ pub(crate) fn move_bounds_to_where_clause(mut ctx: AssistCtx<impl HirDatabase>)
 }
 
 fn build_predicate(param: &ast::TypeParam) -> Option<ast::WherePred> {
-    let path = AstBuilder::<ast::Path>::from_name(param.name()?);
-    let predicate =
-        AstBuilder::<ast::WherePred>::from_pieces(path, param.type_bound_list()?.bounds());
+    let path = Make::<ast::Path>::from_name(param.name()?);
+    let predicate = Make::<ast::WherePred>::from(path, param.type_bound_list()?.bounds());
     Some(predicate)
 }