1 files changed, 60 insertions, 71 deletions

diff --git a/crates/ra_assists/src/ast_builder.rs b/crates/ra_assists/src/ast_builder.rs
index e4ea1fca9..9a62b96b3 100644
--- a/crates/ra_assists/src/ast_builder.rs
+++ b/crates/ra_assists/src/ast_builder.rs
@@ -1,44 +1,35 @@
 use itertools::Itertools;
 
-use hir::Name;
 use ra_syntax::{ast, AstNode, SourceFile};
 
-pub struct AstBuilder<N: AstNode> {
+pub struct Make<N: AstNode> {
     _phantom: std::marker::PhantomData<N>,
 }
 
-impl AstBuilder<ast::RecordField> {
-    pub fn from_name(name: &Name) -> ast::RecordField {
-        ast_node_from_file_text(&format!("fn f() {{ S {{ {}: (), }} }}", name))
-    }
-
-    fn from_text(text: &str) -> ast::RecordField {
-        ast_node_from_file_text(&format!("fn f() {{ S {{ {}, }} }}", text))
-    }
-
-    pub fn from_pieces(name: &ast::NameRef, expr: Option<&ast::Expr>) -> ast::RecordField {
+impl Make<ast::RecordField> {
+    pub fn from(name: ast::NameRef, expr: Option<ast::Expr>) -> ast::RecordField {
         match expr {
             Some(expr) => Self::from_text(&format!("{}: {}", name.syntax(), expr.syntax())),
             None => Self::from_text(&name.syntax().to_string()),
         }
     }
-}
 
-impl AstBuilder<ast::Block> {
-    fn from_text(text: &str) -> ast::Block {
-        ast_node_from_file_text(&format!("fn f() {}", text))
+    fn from_text(text: &str) -> ast::RecordField {
+        ast_node_from_file_text(&format!("fn f() {{ S {{ {}, }} }}", text))
     }
+}
 
-    pub fn single_expr(e: &ast::Expr) -> ast::Block {
+impl Make<ast::Block> {
+    pub fn single_expr(e: ast::Expr) -> ast::Block {
         Self::from_text(&format!("{{ {} }}", e.syntax()))
     }
-}
 
-impl AstBuilder<ast::Expr> {
-    fn from_text(text: &str) -> ast::Expr {
-        ast_node_from_file_text(&format!("const C: () = {};", text))
+    fn from_text(text: &str) -> ast::Block {
+        ast_node_from_file_text(&format!("fn f() {}", text))
     }
+}
 
+impl Make<ast::Expr> {
     pub fn unit() -> ast::Expr {
         Self::from_text("()")
     }
@@ -46,130 +37,128 @@ impl AstBuilder<ast::Expr> {
     pub fn unimplemented() -> ast::Expr {
         Self::from_text("unimplemented!()")
     }
-}
 
-impl AstBuilder<ast::NameRef> {
-    pub fn new(text: &str) -> ast::NameRef {
-        ast_node_from_file_text(&format!("fn f() {{ {}; }}", text))
+    fn from_text(text: &str) -> ast::Expr {
+        ast_node_from_file_text(&format!("const C: () = {};", text))
     }
 }
 
-impl AstBuilder<ast::Path> {
-    fn from_text(text: &str) -> ast::Path {
-        ast_node_from_file_text(text)
+impl Make<ast::NameRef> {
+    pub fn from(text: &str) -> ast::NameRef {
+        ast_node_from_file_text(&format!("fn f() {{ {}; }}", text))
     }
+}
 
+impl Make<ast::Path> {
     pub fn from_name(name: ast::Name) -> ast::Path {
         let name = name.syntax().to_string();
         Self::from_text(name.as_str())
     }
 
-    pub fn from_pieces(enum_name: ast::Name, var_name: ast::Name) -> ast::Path {
+    pub fn from(enum_name: ast::Name, var_name: ast::Name) -> ast::Path {
         Self::from_text(&format!("{}::{}", enum_name.syntax(), var_name.syntax()))
     }
-}
 
-impl AstBuilder<ast::BindPat> {
-    fn from_text(text: &str) -> ast::BindPat {
-        ast_node_from_file_text(&format!("fn f({}: ())", text))
+    fn from_text(text: &str) -> ast::Path {
+        ast_node_from_file_text(text)
     }
+}
 
-    pub fn from_name(name: &ast::Name) -> ast::BindPat {
+impl Make<ast::BindPat> {
+    pub fn from_name(name: ast::Name) -> ast::BindPat {
         Self::from_text(name.text())
     }
-}
 
-impl AstBuilder<ast::PlaceholderPat> {
-    fn from_text(text: &str) -> ast::PlaceholderPat {
+    fn from_text(text: &str) -> ast::BindPat {
         ast_node_from_file_text(&format!("fn f({}: ())", text))
     }
+}
 
+impl Make<ast::PlaceholderPat> {
     pub fn placeholder() -> ast::PlaceholderPat {
         Self::from_text("_")
     }
-}
 
-impl AstBuilder<ast::TupleStructPat> {
-    fn from_text(text: &str) -> ast::TupleStructPat {
+    fn from_text(text: &str) -> ast::PlaceholderPat {
         ast_node_from_file_text(&format!("fn f({}: ())", text))
     }
+}
 
-    pub fn from_pieces(
-        path: &ast::Path,
-        pats: impl Iterator<Item = ast::Pat>,
-    ) -> ast::TupleStructPat {
+impl Make<ast::TupleStructPat> {
+    pub fn from(path: ast::Path, pats: impl Iterator<Item = ast::Pat>) -> ast::TupleStructPat {
         let pats_str = pats.map(|p| p.syntax().to_string()).collect::<Vec<_>>().join(", ");
         Self::from_text(&format!("{}({})", path.syntax(), pats_str))
     }
-}
 
-impl AstBuilder<ast::RecordPat> {
-    fn from_text(text: &str) -> ast::RecordPat {
+    fn from_text(text: &str) -> ast::TupleStructPat {
         ast_node_from_file_text(&format!("fn f({}: ())", text))
     }
+}
 
-    pub fn from_pieces(path: &ast::Path, pats: impl Iterator<Item = ast::Pat>) -> ast::RecordPat {
+impl Make<ast::RecordPat> {
+    pub fn from(path: ast::Path, pats: impl Iterator<Item = ast::Pat>) -> ast::RecordPat {
         let pats_str = pats.map(|p| p.syntax().to_string()).collect::<Vec<_>>().join(", ");
         Self::from_text(&format!("{}{{ {} }}", path.syntax(), pats_str))
     }
-}
 
-impl AstBuilder<ast::PathPat> {
-    fn from_text(text: &str) -> ast::PathPat {
+    fn from_text(text: &str) -> ast::RecordPat {
         ast_node_from_file_text(&format!("fn f({}: ())", text))
     }
+}
 
-    pub fn from_path(path: &ast::Path) -> ast::PathPat {
+impl Make<ast::PathPat> {
+    pub fn from_path(path: ast::Path) -> ast::PathPat {
         let path_str = path.syntax().text().to_string();
         Self::from_text(path_str.as_str())
     }
-}
 
-impl AstBuilder<ast::MatchArm> {
-    fn from_text(text: &str) -> ast::MatchArm {
-        ast_node_from_file_text(&format!("fn f() {{ match () {{{}}} }}", text))
+    fn from_text(text: &str) -> ast::PathPat {
+        ast_node_from_file_text(&format!("fn f({}: ())", text))
     }
+}
 
-    pub fn from_pieces(pats: impl Iterator<Item = ast::Pat>, expr: &ast::Expr) -> ast::MatchArm {
+impl Make<ast::MatchArm> {
+    pub fn from(pats: impl Iterator<Item = ast::Pat>, expr: ast::Expr) -> ast::MatchArm {
         let pats_str = pats.map(|p| p.syntax().to_string()).join(" | ");
         Self::from_text(&format!("{} => {}", pats_str, expr.syntax()))
     }
-}
 
-impl AstBuilder<ast::MatchArmList> {
-    fn from_text(text: &str) -> ast::MatchArmList {
+    fn from_text(text: &str) -> ast::MatchArm {
         ast_node_from_file_text(&format!("fn f() {{ match () {{{}}} }}", text))
     }
+}
 
+impl Make<ast::MatchArmList> {
     pub fn from_arms(arms: impl Iterator<Item = ast::MatchArm>) -> ast::MatchArmList {
         let arms_str = arms.map(|arm| format!("\n    {}", arm.syntax())).join(",");
         Self::from_text(&format!("{},\n", arms_str))
     }
-}
 
-impl AstBuilder<ast::WherePred> {
-    fn from_text(text: &str) -> ast::WherePred {
-        ast_node_from_file_text(&format!("fn f() where {} {{ }}", text))
+    fn from_text(text: &str) -> ast::MatchArmList {
+        ast_node_from_file_text(&format!("fn f() {{ match () {{{}}} }}", text))
     }
+}
 
-    pub fn from_pieces(
-        path: ast::Path,
-        bounds: impl Iterator<Item = ast::TypeBound>,
-    ) -> ast::WherePred {
+impl Make<ast::WherePred> {
+    pub fn from(path: ast::Path, bounds: impl Iterator<Item = ast::TypeBound>) -> ast::WherePred {
         let bounds = bounds.map(|b| b.syntax().to_string()).collect::<Vec<_>>().join(" + ");
         Self::from_text(&format!("{}: {}", path.syntax(), bounds))
     }
-}
 
-impl AstBuilder<ast::WhereClause> {
-    fn from_text(text: &str) -> ast::WhereClause {
+    fn from_text(text: &str) -> ast::WherePred {
         ast_node_from_file_text(&format!("fn f() where {} {{ }}", text))
     }
+}
 
+impl Make<ast::WhereClause> {
     pub fn from_predicates(preds: impl Iterator<Item = ast::WherePred>) -> ast::WhereClause {
         let preds = preds.map(|p| p.syntax().to_string()).collect::<Vec<_>>().join(", ");
         Self::from_text(preds.as_str())
     }
+
+    fn from_text(text: &str) -> ast::WhereClause {
+        ast_node_from_file_text(&format!("fn f() where {} {{ }}", text))
+    }
 }
 
 fn ast_node_from_file_text<N: AstNode>(text: &str) -> N {