3 files changed, 10 insertions, 8 deletions

diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs
index fef405b7f..250255813 100644
--- a/crates/ra_project_model/src/lib.rs
+++ b/crates/ra_project_model/src/lib.rs
@@ -418,8 +418,10 @@ pub fn get_rustc_cfg_options() -> CfgOptions {
     // Some nightly-only cfgs, which are required for stdlib
     {
         cfg_options.insert_atom("target_thread_local".into());
-        for &target_has_atomic in ["16", "32", "64", "8", "cas", "ptr"].iter() {
-            cfg_options.insert_key_value("target_has_atomic".into(), target_has_atomic.into())
+        for &target_has_atomic in ["8", "16", "32", "64", "cas", "ptr"].iter() {
+            cfg_options.insert_key_value("target_has_atomic".into(), target_has_atomic.into());
+            cfg_options
+                .insert_key_value("target_has_atomic_load_store".into(), target_has_atomic.into());
         }
     }
 
diff --git a/docs/user/readme.adoc b/docs/user/readme.adoc
index b9ecc7055..867aae975 100644
--- a/docs/user/readme.adoc
+++ b/docs/user/readme.adoc
@@ -11,6 +11,9 @@ This manual focuses on a specific usage of the library -- the implementation of
 https://microsoft.github.io/language-server-protocol/[Language Server Protocol].
 LSP allows various code editors, like VS Code, Emacs or Vim, to implement semantic feature like completion or goto definition by talking to an external language server process.
 
+To improve this document, send a pull request against
+https://github.com/rust-analyzer/rust-analyzer/blob/master/docs/user/readme.adoc[this file].
+
 == Installation
 
 In theory, one should be able to just install the server binary and have it automatically work with any editor.
@@ -44,7 +47,7 @@ Alternatively, both the server and the plugin can be installed from source:
 
 [source]
 ----
-$ git clone https://github.com/rust-analyzer/rust-analyzer.git && cs rust-analyzer
+$ git clone https://github.com/rust-analyzer/rust-analyzer.git && cd rust-analyzer
 $ cargo xtask install
 ----
 
diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs
index 25b64301c..2bcd76d60 100644
--- a/xtask/src/lib.rs
+++ b/xtask/src/lib.rs
@@ -109,11 +109,8 @@ fn install_clippy() -> Result<()> {
 
 pub fn run_fuzzer() -> Result<()> {
     let _d = pushd("./crates/ra_syntax");
-    match run!("cargo fuzz --help") {
-        Ok(_) => (),
-        _ => {
-            run!("cargo install cargo-fuzz")?;
-        }
+    if run!("cargo fuzz --help").is_err() {
+        run!("cargo install cargo-fuzz")?;
     };
 
     run!("rustup run nightly -- cargo fuzz run parser")?;