21 files changed, 529 insertions, 387 deletions

diff --git a/.github/actions/github-release/Dockerfile b/.github/actions/github-release/Dockerfile
new file mode 100644
index 000000000..5849eac7d
--- /dev/null
+++ b/.github/actions/github-release/Dockerfile
@@ -0,0 +1,8 @@
+FROM node:slim
+
+COPY . /action
+WORKDIR /action
+
+RUN npm install --production
+
+ENTRYPOINT ["node", "/action/main.js"]
diff --git a/.github/actions/github-release/README.md b/.github/actions/github-release/README.md
new file mode 100644
index 000000000..7b50d0020
--- /dev/null
+++ b/.github/actions/github-release/README.md
@@ -0,0 +1,21 @@
+# github-release
+
+Copy-pasted from
+https://github.com/bytecodealliance/wasmtime/tree/8acfdbdd8aa550d1b84e0ce1e6222a6605d14e38/.github/actions/github-release
+
+An action used to publish GitHub releases for `wasmtime`.
+
+As of the time of this writing there's a few actions floating around which
+perform github releases but they all tend to have their set of drawbacks.
+Additionally nothing handles deleting releases which we need for our rolling
+`dev` release.
+
+To handle all this this action rolls-its-own implementation using the
+actions/toolkit repository and packages published there. These run in a Docker
+container and take various inputs to orchestrate the release from the build.
+
+More comments can be found in `main.js`.
+
+Testing this is really hard. If you want to try though run `npm install` and
+then `node main.js`. You'll have to configure a bunch of env vars though to get
+anything reasonably working.
diff --git a/.github/actions/github-release/action.yml b/.github/actions/github-release/action.yml
new file mode 100644
index 000000000..51a074adf
--- /dev/null
+++ b/.github/actions/github-release/action.yml
@@ -0,0 +1,15 @@
+name: 'wasmtime github releases'
+description: 'wasmtime github releases'
+inputs:
+  token:
+    description: ''
+    required: true
+  name:
+    description: ''
+    required: true
+  files:
+    description: ''
+    required: true
+runs:
+  using: 'docker'
+  image: 'Dockerfile'
diff --git a/.github/actions/github-release/main.js b/.github/actions/github-release/main.js
new file mode 100644
index 000000000..295c02626
--- /dev/null
+++ b/.github/actions/github-release/main.js
@@ -0,0 +1,117 @@
+const core = require('@actions/core');
+const path = require("path");
+const fs = require("fs");
+const github = require('@actions/github');
+const glob = require('glob');
+
+function sleep(milliseconds) {
+  return new Promise(resolve => setTimeout(resolve, milliseconds))
+}
+
+async function runOnce() {
+  // Load all our inputs and env vars. Note that `getInput` reads from `INPUT_*`
+  const files = core.getInput('files');
+  const name = core.getInput('name');
+  const token = core.getInput('token');
+  const slug = process.env.GITHUB_REPOSITORY;
+  const owner = slug.split('/')[0];
+  const repo = slug.split('/')[1];
+  const sha = process.env.GITHUB_SHA;
+
+  core.info(`files: ${files}`);
+  core.info(`name: ${name}`);
+  core.info(`token: ${token}`);
+
+  const octokit = new github.GitHub(token);
+
+  // Delete the previous release since we can't overwrite one. This may happen
+  // due to retrying an upload or it may happen because we're doing the dev
+  // release.
+  const releases = await octokit.paginate("GET /repos/:owner/:repo/releases", { owner, repo });
+  for (const release of releases) {
+    if (release.tag_name !== name) {
+      continue;
+    }
+    const release_id = release.id;
+    core.info(`deleting release ${release_id}`);
+    await octokit.repos.deleteRelease({ owner, repo, release_id });
+  }
+
+  // We also need to update the `dev` tag while we're at it on the `dev` branch.
+  if (name == 'nightly') {
+    try {
+      core.info(`updating nightly tag`);
+      await octokit.git.updateRef({
+          owner,
+          repo,
+          ref: 'tags/nightly',
+          sha,
+          force: true,
+      });
+    } catch (e) {
+      console.log("ERROR: ", JSON.stringify(e, null, 2));
+      core.info(`creating nightly tag`);
+      await octokit.git.createTag({
+        owner,
+        repo,
+        tag: 'nightly',
+        message: 'nightly release',
+        object: sha,
+        type: 'commit',
+      });
+    }
+  }
+
+  // Creates an official GitHub release for this `tag`, and if this is `dev`
+  // then we know that from the previous block this should be a fresh release.
+  core.info(`creating a release`);
+  const release = await octokit.repos.createRelease({
+    owner,
+    repo,
+    tag_name: name,
+    prerelease: name === 'nightly',
+  });
+
+  // Upload all the relevant assets for this release as just general blobs.
+  for (const file of glob.sync(files)) {
+    const size = fs.statSync(file).size;
+    core.info(`upload ${file}`);
+    await octokit.repos.uploadReleaseAsset({
+      data: fs.createReadStream(file),
+      headers: { 'content-length': size, 'content-type': 'application/octet-stream' },
+      name: path.basename(file),
+      url: release.data.upload_url,
+    });
+  }
+}
+
+async function run() {
+  const retries = 10;
+  for (let i = 0; i < retries; i++) {
+    try {
+      await runOnce();
+      break;
+    } catch (e) {
+      if (i === retries - 1)
+        throw e;
+      logError(e);
+      console.log("RETRYING after 10s");
+      await sleep(10000)
+    }
+  }
+}
+
+function logError(e) {
+  console.log("ERROR: ", e.message);
+  try {
+    console.log(JSON.stringify(e, null, 2));
+  } catch (e) {
+    // ignore json errors for now
+  }
+  console.log(e.stack);
+}
+
+run().catch(err => {
+  logError(err);
+  core.setFailed(err.message);
+});
diff --git a/.github/actions/github-release/package.json b/.github/actions/github-release/package.json
new file mode 100644
index 000000000..abfc55f6f
--- /dev/null
+++ b/.github/actions/github-release/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "wasmtime-github-release",
+  "version": "0.0.0",
+  "main": "main.js",
+  "dependencies": {
+    "@actions/core": "^1.0.0",
+    "@actions/github": "^1.0.0",
+    "glob": "^7.1.5"
+  }
+}
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 50c4265cf..633015956 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -3,28 +3,30 @@ on:
   pull_request:
   push:
     branches:
-      - master
-      - staging
-      - trying
+    - master
+    - staging
+    - trying
 
 jobs:
   rust-audit:
     name: Audit Rust vulnerabilities
     runs-on: ubuntu-latest
     steps:
-        - name: Checkout repository
-          uses: actions/checkout@v1
+    - name: Checkout repository
+      uses: actions/checkout@v1
 
-        - run: cargo install cargo-audit
-        - run: cargo audit
+    - run: cargo install cargo-audit
+    - run: cargo audit
 
   rust:
     name: Rust
     runs-on: ${{ matrix.os }}
+
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
+
     env:
       RUSTFLAGS: -D warnings
       CC: deny_c
@@ -32,62 +34,57 @@ jobs:
       RUN_SLOW_TESTS: 1
       RUSTUP_MAX_RETRIES: 10
       CARGO_NET_RETRY: 10
-    steps:
 
-      - name: Checkout repository
-        uses: actions/checkout@v1
-
-      # We need to disable the existing toolchain to avoid updating rust-docs
-      # which takes a long time. The fastest way to do this is to rename the
-      # existing folder, as deleting it takes about as much time as not doing
-      # anything and just updating rust-docs.
-      - name: Rename existing rust toolchain (Windows)
-        if: matrix.os == 'windows-latest'
-        run: Rename-Item C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc.old
-
-      - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          override: true
-          components: rustfmt, rust-src
-
-      - name: Cache cargo registry
-        uses: actions/cache@v1
-        with:
-          path: ~/.cargo/registry
-          key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
-
-      - name: Cache cargo index
-        uses: actions/cache@v1
-        with:
-          path: ~/.cargo/git
-          key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
-
-      - name: Cache cargo target dir
-        uses: actions/cache@v1
-        with:
-          path: target
-          key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
-
-      - name: Compile
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --no-run
-
-      - name: Test
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-
-      - name: Prepare cache
-        run: cargo xtask pre-cache
-
-      - name: Prepare cache 2
-        if: matrix.os == 'windows-latest'
-        run: Remove-Item ./target/debug/xtask.exe, ./target/debug/deps/xtask.exe
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v1
+
+    # We need to disable the existing toolchain to avoid updating rust-docs
+    # which takes a long time. The fastest way to do this is to rename the
+    # existing folder, as deleting it takes about as much time as not doing
+    # anything and just updating rust-docs.
+    - name: Rename existing rust toolchain (Windows)
+      if: matrix.os == 'windows-latest'
+      run: Rename-Item C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc.old
+
+    - name: Install Rust toolchain
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+        profile: minimal
+        override: true
+        components: rustfmt, rust-src
+
+    - name: Cache cargo registry
+      uses: actions/cache@v1
+      with:
+        path: ~/.cargo/registry
+        key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
+
+    - name: Cache cargo index
+      uses: actions/cache@v1
+      with:
+        path: ~/.cargo/git
+        key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
+
+    - name: Cache cargo target dir
+      uses: actions/cache@v1
+      with:
+        path: target
+        key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
+
+    - name: Compile
+      run: cargo test --no-run
+
+    - name: Test
+      run: cargo test
+
+    - name: Prepare cache
+      run: cargo xtask pre-cache
+
+    - name: Prepare cache 2
+      if: matrix.os == 'windows-latest'
+      run: Remove-Item ./target/debug/xtask.exe, ./target/debug/deps/xtask.exe
 
   typescript:
     name: TypeScript
@@ -96,22 +93,22 @@ jobs:
       CXX: g++-4.9
       CC: gcc-4.9
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v1
+    - name: Checkout repository
+      uses: actions/checkout@v1
 
-      - name: Install Nodejs
-        uses: actions/setup-node@v1
-        with:
-          node-version: 12.x
+    - name: Install Nodejs
+      uses: actions/setup-node@v1
+      with:
+        node-version: 12.x
 
-      - run: npm ci
-        working-directory: ./editors/code
+    - run: npm ci
+      working-directory: ./editors/code
 
-      - run: npm audit
-        working-directory: ./editors/code
+    - run: npm audit
+      working-directory: ./editors/code
 
-      - run: npm run lint
-        working-directory: ./editors/code
+    - run: npm run lint
+      working-directory: ./editors/code
 
-      - run: npm run package --scripts-prepend-node-path
-        working-directory: ./editors/code
+    - run: npm run package --scripts-prepend-node-path
+      working-directory: ./editors/code
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index a697c0071..8100c04ef 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -1,193 +1,110 @@
 name: release
 on:
+  schedule:
+  - cron: '*/15 * * * *' # midnight UTC
+
   push:
     branches:
-      - release
+    - release
 
 jobs:
-  build-server:
-    name: build-server
+  dist:
+    name: dist
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
+
     env:
       RUSTFLAGS: -D warnings
       CARGO_INCREMENTAL: 0
       RUSTUP_MAX_RETRIES: 10
       CARGO_NET_RETRY: 10
-    steps:
 
-      - name: Checkout repository
-        uses: actions/checkout@v1
-
-      # We need to disable the existing toolchain to avoid updating rust-docs
-      # which takes a long time. The fastest way to do this is to rename the
-      # existing folder, as deleting it takes about as much time as not doing
-      # anything and just updating rust-docs.
-      - name: Rename existing rust toolchain (Windows)
-        if: matrix.os == 'windows-latest'
-        run: Rename-Item C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc.old
-
-      - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          target: x86_64-unknown-linux-musl
-          override: true
-
-      - name: Build
-        if: matrix.os == 'ubuntu-latest'
-        uses: actions-rs/cargo@v1
-        env:
-          CC: clang
-        with:
-          command: build
-          args: --package rust-analyzer --bin rust-analyzer --release --target x86_64-unknown-linux-musl
-
-      - name: Build
-        if: matrix.os != 'ubuntu-latest'
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --package rust-analyzer --bin rust-analyzer --release
-
-      - name: Create distribution dir
-        run: mkdir ./dist
-
-      - name: Copy binary
-        if: matrix.os == 'ubuntu-latest'
-        run: cp ./target/x86_64-unknown-linux-musl/release/rust-analyzer ./dist/rust-analyzer-linux && strip ./dist/rust-analyzer-linux
-
-      - name: Copy binary
-        if: matrix.os == 'macos-latest'
-        run: cp ./target/release/rust-analyzer ./dist/rust-analyzer-mac
-
-      - name: Copy binary
-        if: matrix.os == 'windows-latest'
-        run: copy ./target/release/rust-analyzer.exe ./dist/rust-analyzer-windows.exe
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v1
-        with:
-          name: server-${{ matrix.os }}
-          path: ./dist
-
-  build-clients:
-    name: build-clients
-    runs-on: ubuntu-latest
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v1
-
-      - name: Install Nodejs
-        uses: actions/setup-node@v1
-        with:
-          node-version: 12.x
-
-      - run: npm ci
-        working-directory: ./editors/code
-
-      - run: npm run package --scripts-prepend-node-path
-        working-directory: ./editors/code
-
-      - name: Copy vscode extension
-        run: mkdir -p ./dist/code && cp ./editors/code/rust-analyzer.vsix ./dist/
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v1
-        with:
-          name: editor-plugins
-          path: ./dist
-
-  make-release:
-    name: make-release
+    - name: Checkout repository
+      uses: actions/checkout@v1
+
+    # We need to disable the existing toolchain to avoid updating rust-docs
+    # which takes a long time. The fastest way to do this is to rename the
+    # existing folder, as deleting it takes about as much time as not doing
+    # anything and just updating rust-docs.
+    - name: Rename existing rust toolchain (Windows)
+      if: matrix.os == 'windows-latest'
+      run: Rename-Item C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc.old
+
+    - name: Install Rust toolchain
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+        profile: minimal
+        target: x86_64-unknown-linux-musl
+        override: true
+
+    - name: Install Nodejs
+      uses: actions/setup-node@v1
+      with:
+        node-version: 12.x
+
+    - name: Dist
+      if: github.event_name == 'push'
+      run: cargo xtask dist
+
+    - name: Dist
+      if: github.event_name != 'push'
+      run: cargo xtask dist --nightly
+
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v1
+      with:
+        name: dist-${{ matrix.os }}
+        path: ./dist
+
+  publish:
+    name: publish
     runs-on: ubuntu-latest
-    needs: ['build-server', 'build-clients']
+    needs: ['dist']
     steps:
-      - name: Install Nodejs
-        uses: actions/setup-node@v1
-        with:
-          node-version: 12.x
-
-      - run: echo "::set-env name=TAG::$(date --iso)"
-      - run: 'echo "TAG: $TAG"'
-
-      - name: Checkout repository
-        uses: actions/checkout@v1
-
-      - uses: actions/download-artifact@v1
-        with:
-          name: editor-plugins
-          path: dist
-      - uses: actions/download-artifact@v1
-        with:
-          name: server-macos-latest
-          path: dist
-      - uses: actions/download-artifact@v1
-        with:
-          name: server-ubuntu-latest
-          path: dist
-      - uses: actions/download-artifact@v1
-        with:
-          name: server-windows-latest
-          path: dist
-      - run: ls -all ./dist
-
-      - name: Create Release
-        id: create_release
-        # uses: actions/create-release@v1
-        # https://github.com/actions/create-release/pull/32
-        uses: fleskesvor/create-release@1a72e235c178bf2ae6c51a8ae36febc24568c5fe
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ env.TAG }}
-          release_name: ${{ env.TAG }}
-          draft: false
-          prerelease: false
-
-      - uses: actions/[email protected]
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./dist/rust-analyzer-linux
-          asset_name: rust-analyzer-linux
-          asset_content_type: application/octet-stream
-
-      - uses: actions/[email protected]
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./dist/rust-analyzer-mac
-          asset_name: rust-analyzer-mac
-          asset_content_type: application/octet-stream
-
-      - uses: actions/[email protected]
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./dist/rust-analyzer-windows.exe
-          asset_name: rust-analyzer-windows.exe
-          asset_content_type: application/octet-stream
-
-      - uses: actions/[email protected]
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./dist/rust-analyzer.vsix
-          asset_name: rust-analyzer.vsix
-          asset_content_type: application/octet-stream
-
-      - run: npm ci
-        working-directory: ./editors/code
-
-      - name: Publish Extension
-        working-directory: ./editors/code
-        # token from https://dev.azure.com/rust-analyzer/
-        run: npx vsce publish 0.1.$(date +%Y%m%d) --pat ${{ secrets.MARKETPLACE_TOKEN }}
+    - name: Install Nodejs
+      uses: actions/setup-node@v1
+      with:
+        node-version: 12.x
+
+    - run: echo "::set-env name=TAG::$(date --iso)"
+      if: github.event_name == 'push'
+    - run: echo "::set-env name=TAG::nightly"
+      if: github.event_name == 'schedule'
+    - run: 'echo "TAG: $TAG"'
+
+    - name: Checkout repository
+      uses: actions/checkout@v1
+
+    - uses: actions/download-artifact@v1
+      with:
+        name: dist-macos-latest
+        path: dist
+    - uses: actions/download-artifact@v1
+      with:
+        name: dist-ubuntu-latest
+        path: dist
+    - uses: actions/download-artifact@v1
+      with:
+        name: dist-windows-latest
+        path: dist
+    - run: ls -all ./dist
+
+    - name: Publish Release
+      uses: ./.github/actions/github-release
+      with:
+        files: "dist/*"
+        name: ${{ env.TAG }}
+        token: ${{ secrets.GITHUB_TOKEN }}
+
+    - run: npm ci
+      working-directory: ./editors/code
+
+    - name: Publish Extension
+      if: github.event_name == 'push'
+      working-directory: ./editors/code
+      # token from https://dev.azure.com/rust-analyzer/
+      run: npx vsce publish 0.1.$(date +%Y%m%d) --pat ${{ secrets.MARKETPLACE_TOKEN }} --packagePath ../../dist/rust-analyzer.vsix
diff --git a/.github/workflows/rustdoc.yaml b/.github/workflows/rustdoc.yaml
index caa1dcc30..e75e92695 100644
--- a/.github/workflows/rustdoc.yaml
+++ b/.github/workflows/rustdoc.yaml
@@ -2,7 +2,7 @@ name: rustdoc
 on:
   push:
    branches:
-     - master
+   - master
 
 jobs:
   rustdoc:
@@ -12,28 +12,24 @@ jobs:
       CARGO_INCREMENTAL: 0
 
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v1
+    - name: Checkout repository
+      uses: actions/checkout@v1
 
-      - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          override: true
-          components: rustfmt, rust-src
+    - name: Install Rust toolchain
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+        profile: minimal
+        override: true
+        components: rustfmt, rust-src
 
-      - name: Build Documentation
-        uses: actions-rs/cargo@v1
-        with:
-          command: doc
-          args: --all --no-deps
+    - name: Build Documentation
+      run: cargo doc --all --no-deps
 
-      - name: Deploy Docs
-        uses: peaceiris/[email protected]
-        env:
-          ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
-          PUBLISH_BRANCH: gh-pages
-          PUBLISH_DIR: ./target/doc
-        with:
-          forceOrphan: true
+    - name: Deploy Docs
+      uses: peaceiris/actions-gh-pages@364c31d33bb99327c77b3a5438a83a357a6729ad # v3.4.0
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        publish_branch: gh-pages
+        publish_dir: ./target/doc
+        force_orphan: true
diff --git a/.gitignore b/.gitignore
index dc5ceca7f..f835edef0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /target/
+/dist/
 crates/*/target
 **/*.rs.bk
 **/*.rs.pending-snap
diff --git a/Cargo.lock b/Cargo.lock
index 316dae053..91edb460c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -46,9 +46,9 @@ checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
 
 [[package]]
 name = "backtrace"
-version = "0.3.44"
+version = "0.3.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4036b9bf40f3cf16aba72a3d65e8a520fc4bafcdc7079aea8f848c58c5b5536"
+checksum = "ad235dabf00f36301792cfe82499880ba54c6486be094d1047b02bacb67c14e8"
 dependencies = [
  "backtrace-sys",
  "cfg-if",
@@ -58,9 +58,9 @@ dependencies = [
 
 [[package]]
 name = "backtrace-sys"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491"
+checksum = "e17b52e737c40a7d75abca20b29a19a0eb7ba9fc72c5a72dd282a0a3c2c0dc35"
 dependencies = [
  "cc",
  "libc",
@@ -1259,9 +1259,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.15"
+version = "0.6.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7246cd0a0a6ec2239a5405b2b16e3f404fa0dcc6d28f5f5b877bf80e33e0f294"
+checksum = "1132f845907680735a84409c3bebc64d1364a5683ffbce899550cd09d5eaefc1"
 
 [[package]]
 name = "relative-path"
diff --git a/crates/ra_assists/src/handlers/inline_local_variable.rs b/crates/ra_assists/src/handlers/inline_local_variable.rs
index eb5112343..3bfcba8ff 100644
--- a/crates/ra_assists/src/handlers/inline_local_variable.rs
+++ b/crates/ra_assists/src/handlers/inline_local_variable.rs
@@ -1,3 +1,4 @@
+use ra_ide_db::defs::Definition;
 use ra_syntax::{
     ast::{self, AstNode, AstToken},
     TextRange,
@@ -37,6 +38,15 @@ pub(crate) fn inline_local_variable(ctx: AssistCtx) -> Option<Assist> {
         return None;
     }
     let initializer_expr = let_stmt.initializer()?;
+
+    let def = ctx.sema.to_def(&bind_pat)?;
+    let def = Definition::Local(def);
+    let refs = def.find_usages(ctx.db, None);
+    if refs.is_empty() {
+        tested_by!(test_not_applicable_if_variable_unused);
+        return None;
+    };
+
     let delete_range = if let Some(whitespace) = let_stmt
         .syntax()
         .next_sibling_or_token()
@@ -49,16 +59,14 @@ pub(crate) fn inline_local_variable(ctx: AssistCtx) -> Option<Assist> {
     } else {
         let_stmt.syntax().text_range()
     };
-    let refs = ctx.sema.find_all_refs(&bind_pat);
-    if refs.is_empty() {
-        return None;
-    };
 
     let mut wrap_in_parens = vec![true; refs.len()];
 
     for (i, desc) in refs.iter().enumerate() {
-        let usage_node =
-            ctx.covering_node_for_range(desc.range).ancestors().find_map(ast::PathExpr::cast)?;
+        let usage_node = ctx
+            .covering_node_for_range(desc.file_range.range)
+            .ancestors()
+            .find_map(ast::PathExpr::cast)?;
         let usage_parent_option = usage_node.syntax().parent().and_then(ast::Expr::cast);
         let usage_parent = match usage_parent_option {
             Some(u) => u,
@@ -103,11 +111,9 @@ pub(crate) fn inline_local_variable(ctx: AssistCtx) -> Option<Assist> {
         move |edit: &mut ActionBuilder| {
             edit.delete(delete_range);
             for (desc, should_wrap) in refs.iter().zip(wrap_in_parens) {
-                if should_wrap {
-                    edit.replace(desc.range, init_in_paren.clone())
-                } else {
-                    edit.replace(desc.range, init_str.clone())
-                }
+                let replacement =
+                    if should_wrap { init_in_paren.clone() } else { init_str.clone() };
+                edit.replace(desc.file_range.range, replacement)
             }
             edit.set_cursor(delete_range.start())
         },
@@ -657,6 +663,7 @@ fn foo() {
 
     #[test]
     fn test_not_applicable_if_variable_unused() {
+        covers!(test_not_applicable_if_variable_unused);
         check_assist_not_applicable(
             inline_local_variable,
             r"
diff --git a/crates/ra_assists/src/marks.rs b/crates/ra_assists/src/marks.rs
index cef3df4e5..22404ee80 100644
--- a/crates/ra_assists/src/marks.rs
+++ b/crates/ra_assists/src/marks.rs
@@ -1,9 +1,10 @@
 //! See test_utils/src/marks.rs
 
-test_utils::marks!(
+test_utils::marks![
     introduce_var_in_comment_is_not_applicable
     test_introduce_var_expr_stmt
     test_introduce_var_last_expr
     not_applicable_outside_of_bind_pat
     test_not_inline_mut_variable
-);
+    test_not_applicable_if_variable_unused
+];
diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs
index e1cb12cca..9f59d590c 100644
--- a/crates/ra_hir/src/lib.rs
+++ b/crates/ra_hir/src/lib.rs
@@ -45,8 +45,7 @@ pub use crate::{
         StructField, Trait, Type, TypeAlias, TypeParam, Union, VariantDef,
     },
     has_source::HasSource,
-    semantics::{original_range, Semantics, SemanticsScope},
-    source_analyzer::PathResolution,
+    semantics::{original_range, PathResolution, Semantics, SemanticsScope},
 };
 
 pub use hir_def::{
diff --git a/crates/ra_hir/src/semantics.rs b/crates/ra_hir/src/semantics.rs
index afc7f7ee7..965d185a4 100644
--- a/crates/ra_hir/src/semantics.rs
+++ b/crates/ra_hir/src/semantics.rs
@@ -19,11 +19,24 @@ use rustc_hash::{FxHashMap, FxHashSet};
 use crate::{
     db::HirDatabase,
     semantics::source_to_def::{ChildContainer, SourceToDefCache, SourceToDefCtx},
-    source_analyzer::{resolve_hir_path, ReferenceDescriptor, SourceAnalyzer},
-    Function, HirFileId, InFile, Local, MacroDef, Module, ModuleDef, Name, Origin, Path,
-    PathResolution, ScopeDef, StructField, Trait, Type, TypeParam, VariantDef,
+    source_analyzer::{resolve_hir_path, SourceAnalyzer},
+    AssocItem, Function, HirFileId, ImplDef, InFile, Local, MacroDef, Module, ModuleDef, Name,
+    Origin, Path, ScopeDef, StructField, Trait, Type, TypeParam, VariantDef,
 };
 
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum PathResolution {
+    /// An item
+    Def(ModuleDef),
+    /// A local binding (only value namespace)
+    Local(Local),
+    /// A generic parameter
+    TypeParam(TypeParam),
+    SelfType(ImplDef),
+    Macro(MacroDef),
+    AssocItem(AssocItem),
+}
+
 /// Primary API to get semantic information, like types, from syntax trees.
 pub struct Semantics<'db, DB> {
     pub db: &'db DB,
@@ -171,12 +184,6 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
         SemanticsScope { db: self.db, resolver }
     }
 
-    // FIXME: we only use this in `inline_local_variable` assist, ideally, we
-    // should switch to general reference search infra there.
-    pub fn find_all_refs(&self, pat: &ast::BindPat) -> Vec<ReferenceDescriptor> {
-        self.analyze(pat.syntax()).find_all_refs(pat)
-    }
-
     fn analyze(&self, node: &SyntaxNode) -> SourceAnalyzer {
         let src = self.find_file(node.clone());
         self.analyze2(src.as_ref(), None)
diff --git a/crates/ra_hir/src/source_analyzer.rs b/crates/ra_hir/src/source_analyzer.rs
index 015389fb0..f3f1ed05a 100644
--- a/crates/ra_hir/src/source_analyzer.rs
+++ b/crates/ra_hir/src/source_analyzer.rs
@@ -7,7 +7,6 @@
 //! purely for "IDE needs".
 use std::{iter::once, sync::Arc};
 
-use either::Either;
 use hir_def::{
     body::{
         scope::{ExprScopes, ScopeId},
@@ -21,12 +20,12 @@ use hir_expand::{hygiene::Hygiene, name::AsName, HirFileId, InFile};
 use hir_ty::{InEnvironment, InferenceResult, TraitEnvironment};
 use ra_syntax::{
     ast::{self, AstNode},
-    AstPtr, SyntaxNode, SyntaxNodePtr, TextRange, TextUnit,
+    SyntaxNode, SyntaxNodePtr, TextUnit,
 };
 
 use crate::{
-    db::HirDatabase, Adt, Const, EnumVariant, Function, Local, MacroDef, ModPath, ModuleDef, Path,
-    PathKind, Static, Struct, Trait, Type, TypeAlias, TypeParam,
+    db::HirDatabase, semantics::PathResolution, Adt, Const, EnumVariant, Function, Local, MacroDef,
+    ModPath, ModuleDef, Path, PathKind, Static, Struct, Trait, Type, TypeAlias, TypeParam,
 };
 
 /// `SourceAnalyzer` is a convenience wrapper which exposes HIR API in terms of
@@ -41,25 +40,6 @@ pub(crate) struct SourceAnalyzer {
     scopes: Option<Arc<ExprScopes>>,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum PathResolution {
-    /// An item
-    Def(crate::ModuleDef),
-    /// A local binding (only value namespace)
-    Local(Local),
-    /// A generic parameter
-    TypeParam(TypeParam),
-    SelfType(crate::ImplDef),
-    Macro(MacroDef),
-    AssocItem(crate::AssocItem),
-}
-
-#[derive(Debug)]
-pub struct ReferenceDescriptor {
-    pub range: TextRange,
-    pub name: String,
-}
-
 impl SourceAnalyzer {
     pub(crate) fn new_for_body(
         db: &impl HirDatabase,
@@ -111,20 +91,16 @@ impl SourceAnalyzer {
     fn expand_expr(
         &self,
         db: &impl HirDatabase,
-        expr: InFile<&ast::Expr>,
+        expr: InFile<ast::MacroCall>,
     ) -> Option<InFile<ast::Expr>> {
-        let macro_call = ast::MacroCall::cast(expr.value.syntax().clone())?;
-        let macro_file =
-            self.body_source_map.as_ref()?.node_macro_file(expr.with_value(&macro_call))?;
+        let macro_file = self.body_source_map.as_ref()?.node_macro_file(expr.as_ref())?;
         let expanded = db.parse_or_expand(macro_file)?;
-        let kind = expanded.kind();
-        let expr = InFile::new(macro_file, ast::Expr::cast(expanded)?);
 
-        if ast::MacroCall::can_cast(kind) {
-            self.expand_expr(db, expr.as_ref())
-        } else {
-            Some(expr)
-        }
+        let res = match ast::MacroCall::cast(expanded.clone()) {
+            Some(call) => self.expand_expr(db, InFile::new(macro_file, call))?,
+            _ => InFile::new(macro_file, ast::Expr::cast(expanded)?),
+        };
+        Some(res)
     }
 
     fn trait_env(&self, db: &impl HirDatabase) -> Arc<TraitEnvironment> {
@@ -132,11 +108,13 @@ impl SourceAnalyzer {
     }
 
     pub(crate) fn type_of(&self, db: &impl HirDatabase, expr: &ast::Expr) -> Option<Type> {
-        let expr_id = if let Some(expr) = self.expand_expr(db, InFile::new(self.file_id, expr)) {
-            self.body_source_map.as_ref()?.node_expr(expr.as_ref())?
-        } else {
-            self.expr_id(expr)?
-        };
+        let expr_id = match expr {
+            ast::Expr::MacroCall(call) => {
+                let expr = self.expand_expr(db, InFile::new(self.file_id, call.clone()))?;
+                self.body_source_map.as_ref()?.node_expr(expr.as_ref())
+            }
+            _ => self.expr_id(expr),
+        }?;
 
         let ty = self.infer.as_ref()?[expr_id].clone();
         let environment = self.trait_env(db);
@@ -251,38 +229,6 @@ impl SourceAnalyzer {
         resolve_hir_path(db, &self.resolver, &hir_path)
     }
 
-    fn resolve_local_name(
-        &self,
-        name_ref: &ast::NameRef,
-    ) -> Option<Either<AstPtr<ast::Pat>, AstPtr<ast::SelfParam>>> {
-        let name = name_ref.as_name();
-        let source_map = self.body_source_map.as_ref()?;
-        let scopes = self.scopes.as_ref()?;
-        let scope = scope_for(scopes, source_map, InFile::new(self.file_id, name_ref.syntax()))?;
-        let entry = scopes.resolve_name_in_scope(scope, &name)?;
-        Some(source_map.pat_syntax(entry.pat())?.value)
-    }
-
-    // FIXME: we only use this in `inline_local_variable` assist, ideally, we
-    // should switch to general reference search infra there.
-    pub(crate) fn find_all_refs(&self, pat: &ast::BindPat) -> Vec<ReferenceDescriptor> {
-        let fn_def = pat.syntax().ancestors().find_map(ast::FnDef::cast).unwrap();
-        let ptr = Either::Left(AstPtr::new(&ast::Pat::from(pat.clone())));
-        fn_def
-            .syntax()
-            .descendants()
-            .filter_map(ast::NameRef::cast)
-            .filter(|name_ref| match self.resolve_local_name(&name_ref) {
-                None => false,
-                Some(d_ptr) => d_ptr == ptr,
-            })
-            .map(|name_ref| ReferenceDescriptor {
-                name: name_ref.text().to_string(),
-                range: name_ref.syntax().text_range(),
-            })
-            .collect()
-    }
-
     pub(crate) fn expand(
         &self,
         db: &impl HirDatabase,
diff --git a/docs/user/features.md b/docs/user/features.md
index 48c63ba7b..ba4d50fa8 100644
--- a/docs/user/features.md
+++ b/docs/user/features.md
@@ -105,9 +105,9 @@ Start `cargo watch` for live error highlighting. Will prompt to install if it's
 
 Stop `cargo watch`.
 
-#### Structural Seach and Replace 
+#### Structural Seach and Replace
 
-Search and replace with named wildcards that will match any expression. 
+Search and replace with named wildcards that will match any expression.
 The syntax for a structural search replace command is `<search_pattern> ==>> <replace_pattern>`. A `$<name>:expr` placeholder in the search pattern will match any expression and `$<name>` will reference it in the replacement. Available via the command `rust-analyzer.ssr`.
 
 ```rust
@@ -195,4 +195,5 @@ In VS Code, the following settings can be used to configure the inlay hints:
 * `rust-analyzer.maxInlayHintLength` — shortens the hints if their length exceeds the value specified. If no value is specified (`null`), no shortening is applied.
 
 **Note:** VS Code does not have native support for inlay hints [yet](https://github.com/microsoft/vscode/issues/16221) and the hints are implemented using decorations.
-This approach has limitations: the caret movement near the end of the hint may look [weird](https://github.com/rust-analyzer/rust-analyzer/issues/1623).
+This approach has limitations, the caret movement and bracket highlighting near the edges of the hint may be weird:
+[1](https://github.com/rust-analyzer/rust-analyzer/issues/1623), [2](https://github.com/rust-analyzer/rust-analyzer/issues/3453).
diff --git a/xtask/src/dist.rs b/xtask/src/dist.rs
new file mode 100644
index 000000000..737751ae8
--- /dev/null
+++ b/xtask/src/dist.rs
@@ -0,0 +1,79 @@
+use std::path::PathBuf;
+
+use anyhow::Result;
+
+use crate::{
+    not_bash::{fs2, pushd, pwd, rm_rf, run},
+    project_root,
+};
+
+pub fn run_dist(nightly: bool) -> Result<()> {
+    let dist = project_root().join("dist");
+    rm_rf(&dist)?;
+    fs2::create_dir_all(&dist)?;
+
+    if cfg!(target_os = "linux") {
+        dist_client(nightly)?;
+    }
+    dist_server()?;
+    Ok(())
+}
+
+fn dist_client(nightly: bool) -> Result<()> {
+    let _d = pushd("./editors/code");
+
+    let package_json_path = pwd().join("package.json");
+    let original_package_json = fs2::read_to_string(&package_json_path)?;
+    let _restore =
+        Restore { path: package_json_path.clone(), contents: original_package_json.clone() };
+
+    let mut package_json = original_package_json.replace(r#""enableProposedApi": true,"#, r#""#);
+
+    if nightly {
+        package_json = package_json.replace(
+            r#""displayName": "rust-analyzer""#,
+            r#""displayName": "rust-analyzer nightly""#,
+        );
+    } else {
+        package_json = original_package_json.replace(r#""enableProposedApi": true,"#, r#""#);
+    }
+    fs2::write(package_json_path, package_json)?;
+
+    run!("npx vsce package -o ../../dist/rust-analyzer.vsix")?;
+    Ok(())
+}
+
+fn dist_server() -> Result<()> {
+    if cfg!(target_os = "linux") {
+        std::env::set_var("CC", "clang");
+        run!("cargo build --package rust-analyzer --bin rust-analyzer --release --target x86_64-unknown-linux-musl")?;
+        run!("strip ./target/x86_64-unknown-linux-musl/release/rust-analyzer")?;
+    } else {
+        run!("cargo build --package rust-analyzer --bin rust-analyzer --release")?;
+    }
+
+    let (src, dst) = if cfg!(target_os = "linux") {
+        ("./target/x86_64-unknown-linux-musl/release/rust-analyzer", "./dist/rust-analyzer-linux")
+    } else if cfg!(target_os = "windows") {
+        ("/target/release/rust-analyzer.exe", "./dist/rust-analyzer-windows.exe")
+    } else if cfg!(target_os = "macos") {
+        ("/target/release/rust-analyzer", "./dist/rust-analyzer-mac")
+    } else {
+        panic!("Unsupported OS")
+    };
+
+    fs2::copy(src, dst)?;
+
+    Ok(())
+}
+
+struct Restore {
+    path: PathBuf,
+    contents: String,
+}
+
+impl Drop for Restore {
+    fn drop(&mut self) {
+        fs2::write(&self.path, &self.contents).unwrap();
+    }
+}
diff --git a/xtask/src/install.rs b/xtask/src/install.rs
index f76467cac..d0d745b05 100644
--- a/xtask/src/install.rs
+++ b/xtask/src/install.rs
@@ -4,10 +4,7 @@ use std::{env, path::PathBuf, str};
 
 use anyhow::{bail, format_err, Context, Result};
 
-use crate::{
-    not_bash::{pushd, run},
-    project_root,
-};
+use crate::not_bash::{pushd, run};
 
 // Latest stable, feel free to send a PR if this lags behind.
 const REQUIRED_RUST_VERSION: u32 = 41;
@@ -27,7 +24,6 @@ pub struct ServerOpt {
 
 impl InstallCmd {
     pub fn run(self) -> Result<()> {
-        let _dir = pushd(project_root());
         let both = self.server.is_some() && self.client.is_some();
         if cfg!(target_os = "macos") {
             fix_path_for_mac().context("Fix path for mac")?
diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs
index f48045d17..014b61b37 100644
--- a/xtask/src/lib.rs
+++ b/xtask/src/lib.rs
@@ -4,6 +4,7 @@
 
 pub mod not_bash;
 pub mod install;
+pub mod dist;
 pub mod pre_commit;
 
 pub mod codegen;
@@ -90,7 +91,6 @@ pub fn run_clippy() -> Result<()> {
 
     let allowed_lints = [
         "clippy::collapsible_if",
-        "clippy::map_clone", // FIXME: remove when Iterator::copied stabilizes (1.36.0)
         "clippy::needless_pass_by_value",
         "clippy::nonminimal_bool",
         "clippy::redundant_pattern_matching",
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index a7dffe2cc..7c8ea9001 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -13,8 +13,11 @@ use std::env;
 use pico_args::Arguments;
 use xtask::{
     codegen::{self, Mode},
+    dist::run_dist,
     install::{ClientOpt, InstallCmd, ServerOpt},
-    pre_commit, run_clippy, run_fuzzer, run_pre_cache, run_release, run_rustfmt, Result,
+    not_bash::pushd,
+    pre_commit, project_root, run_clippy, run_fuzzer, run_pre_cache, run_release, run_rustfmt,
+    Result,
 };
 
 fn main() -> Result<()> {
@@ -22,6 +25,8 @@ fn main() -> Result<()> {
         return pre_commit::run_hook();
     }
 
+    let _d = pushd(project_root());
+
     let mut args = Arguments::from_env();
     let subcommand = args.subcommand()?.unwrap_or_default();
 
@@ -97,6 +102,11 @@ FLAGS:
             args.finish()?;
             run_release(dry_run)
         }
+        "dist" => {
+            let nightly = args.contains("--nightly");
+            args.finish()?;
+            run_dist(nightly)
+        }
         _ => {
             eprintln!(
                 "\
@@ -112,7 +122,8 @@ SUBCOMMANDS:
     fuzz-tests
     codegen
     install
-    lint"
+    lint
+    dist"
             );
             Ok(())
         }
diff --git a/xtask/src/not_bash.rs b/xtask/src/not_bash.rs
index 40f706d9f..1697b7fcd 100644
--- a/xtask/src/not_bash.rs
+++ b/xtask/src/not_bash.rs
@@ -19,6 +19,11 @@ pub mod fs2 {
         fs::read_dir(path).with_context(|| format!("Failed to read {}", path.display()))
     }
 
+    pub fn read_to_string<P: AsRef<Path>>(path: P) -> Result<String> {
+        let path = path.as_ref();
+        fs::read_to_string(path).with_context(|| format!("Failed to read {}", path.display()))
+    }
+
     pub fn write<P: AsRef<Path>, C: AsRef<[u8]>>(path: P, contents: C) -> Result<()> {
         let path = path.as_ref();
         fs::write(path, contents).with_context(|| format!("Failed to write {}", path.display()))
@@ -40,6 +45,11 @@ pub mod fs2 {
         let path = path.as_ref();
         fs::remove_dir_all(path).with_context(|| format!("Failed to remove dir {}", path.display()))
     }
+
+    pub fn create_dir_all<P: AsRef<Path>>(path: P) -> Result<()> {
+        let path = path.as_ref();
+        fs::create_dir_all(path).with_context(|| format!("Failed to create dir {}", path.display()))
+    }
 }
 
 macro_rules! _run {
@@ -61,6 +71,10 @@ pub fn pushd(path: impl Into<PathBuf>) -> Pushd {
     Pushd { _p: () }
 }
 
+pub fn pwd() -> PathBuf {
+    Env::with(|env| env.cwd())
+}
+
 impl Drop for Pushd {
     fn drop(&mut self) {
         Env::with(|env| env.popd())
@@ -85,7 +99,6 @@ pub fn run_process(cmd: String, echo: bool) -> Result<String> {
 }
 
 fn run_process_inner(cmd: &str, echo: bool) -> Result<String> {
-    let cwd = Env::with(|env| env.cwd());
     let mut args = shelx(cmd);
     let binary = args.remove(0);
 
@@ -95,7 +108,7 @@ fn run_process_inner(cmd: &str, echo: bool) -> Result<String> {
 
     let output = Command::new(binary)
         .args(args)
-        .current_dir(cwd)
+        .current_dir(pwd())
         .stdin(Stdio::null())
         .stderr(Stdio::inherit())
         .output()?;