3 files changed, 15 insertions, 29 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 91edb460c..80e778bcf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -884,9 +884,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
+checksum = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f"
 dependencies = [
  "proc-macro2",
 ]
diff --git a/README.md b/README.md
index 13d81d4ae..1c334d55e 100644
--- a/README.md
+++ b/README.md
@@ -14,33 +14,9 @@ Work on rust-analyzer is sponsored by
 - [Mozilla](https://www.mozilla.org/en-US/)
 - [freiheit.com](https://www.freiheit.com)
 
-## Language Server Quick Start
+## Quick Start
 
-rust-analyzer is a work-in-progress, so you might encounter critical bugs. That
-said, it is complete enough to provide a useful IDE experience and some people
-use it as a daily driver.
-
-To build rust-analyzer, you need:
-
-* latest stable Rust for the language server itself
-* latest stable npm and VS Code for VS Code extension
-
-To quickly install the rust-analyzer language server and VS Code extension with
-standard setup (`code` and `cargo` in `$PATH`, etc), use this:
-
-```
-# clone the repo
-$ git clone https://github.com/rust-analyzer/rust-analyzer && cd rust-analyzer
-
-# install both the language server and VS Code extension
-$ cargo xtask install
-
-# alternatively, install only the server. Binary name is `rust-analyzer`.
-$ cargo xtask install --server
-```
-
-For non-standard setup of VS Code and other editors, or if the language server
-cannot start, see [./docs/user](./docs/user).
+https://rust-analyzer.github.io/manual.html#installation
 
 ## Documentation
 
@@ -48,7 +24,7 @@ If you want to **contribute** to rust-analyzer or are just curious about how
 things work under the hood, check the [./docs/dev](./docs/dev) folder.
 
 If you want to **use** rust-analyzer's language server with your editor of
-choice, check [./docs/user](./docs/user) folder. It also contains some tips & tricks to help
+choice, check [the manual](https://rust-analyzer.github.io/manual.html) folder. It also contains some tips & tricks to help
 you be more productive when using rust-analyzer.
 
 ## Getting in touch
diff --git a/crates/ra_syntax/src/ast/edit.rs b/crates/ra_syntax/src/ast/edit.rs
index d2630e9e9..1858e2b6c 100644
--- a/crates/ra_syntax/src/ast/edit.rs
+++ b/crates/ra_syntax/src/ast/edit.rs
@@ -249,6 +249,16 @@ impl ast::PathSegment {
     }
 }
 
+impl ast::UseItem {
+    #[must_use]
+    pub fn with_use_tree(&self, use_tree: ast::UseTree) -> ast::UseItem {
+        if let Some(old) = self.use_tree() {
+            return replace_descendants(self, iter::once((old, use_tree)));
+        }
+        self.clone()
+    }
+}
+
 #[must_use]
 pub fn strip_attrs_and_docs<N: ast::AttrsOwner>(node: &N) -> N {
     N::cast(strip_attrs_and_docs_inner(node.syntax().clone())).unwrap()