Merge remote-tracking branch 'upstream/master' into issue961_profiling

2 files changed, 17 insertions, 15 deletions

diff --git a/docs/dev/architecture.md b/docs/dev/architecture.md
index f990d5bf0..890b18fcd 100644
--- a/docs/dev/architecture.md
+++ b/docs/dev/architecture.md
@@ -130,19 +130,6 @@ APIs in this crate are IDE centric: they take text offsets as input and produce
 offsets and strings as output. This works on top of rich code model powered by
 `hir`.
 
-### `crates/ra_ide_api_light`
-
-All IDE features which can be implemented if you only have access to a single
-file. `ra_ide_api_light` could be used to enhance editing of Rust code without
-the need to fiddle with build-systems, file synchronization and such.
-
-In a sense, `ra_ide_api_light` is just a bunch of pure functions which take a
-syntax tree as input.
-
-The tests for `ra_ide_api_light` are `#[cfg(test)] mod tests` unit-tests spread
-throughout its modules.
-
-
 ### `crates/ra_lsp_server`
 
 An LSP implementation which wraps `ra_ide_api` into a langauge server protocol.
diff --git a/docs/user/features.md b/docs/user/features.md
index b9d2aa84f..7173d88e9 100644
--- a/docs/user/features.md
+++ b/docs/user/features.md
@@ -210,7 +210,7 @@ fn main() {
 }
 ```
 
--- Fill struct fields
+- Fill struct fields
 
 ```rust
 // before:
@@ -270,7 +270,22 @@ fn foo() {
 }
 ```
 
--- Remove `dbg!`
+- Inline local variable:
+
+```rust
+// before:
+fn foo() {
+    let a<|> = 1 + 1;
+    let b = a * 10;
+}
+
+// after:
+fn foo() {
+    let b = (1 + 1) * 10;
+}
+```
+
+- Remove `dbg!`
 
 ```rust
 // before: