From 12addc6233a9297033e6e943233ebbeb08e39f36 Mon Sep 17 00:00:00 2001
From: DJMcNab <36049421+DJMcNab@users.noreply.github.com>
Date: Sat, 8 Dec 2018 21:09:32 +0000
Subject: Add package command and upgrade event-stream

---
 crates/tools/src/main.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'crates')

diff --git a/crates/tools/src/main.rs b/crates/tools/src/main.rs
index 7bd4a2d09..0679b7d34 100644
--- a/crates/tools/src/main.rs
+++ b/crates/tools/src/main.rs
@@ -122,7 +122,7 @@ fn install_code_extension() -> Result<()> {
         run(r"npm install", "./editors/code")?;
     }
     run(
-        r"node ./node_modules/vsce/out/vsce package",
+        r"npm run package",
         "./editors/code",
     )?;
     if cfg!(windows) {
-- 
cgit v1.2.3


From bb0c2eb8d9da46ca1c71e42dcc363c13028b3eae Mon Sep 17 00:00:00 2001
From: DJMcNab <36049421+DJMcNab@users.noreply.github.com>
Date: Sun, 9 Dec 2018 09:08:10 +0000
Subject: Fix cargo format component name and run rustfmt

---
 crates/tools/src/lib.rs  | 5 +----
 crates/tools/src/main.rs | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

(limited to 'crates')

diff --git a/crates/tools/src/lib.rs b/crates/tools/src/lib.rs
index c2123db99..674b9d11f 100644
--- a/crates/tools/src/lib.rs
+++ b/crates/tools/src/lib.rs
@@ -112,10 +112,7 @@ pub fn run_rustfmt(mode: Mode) -> Result<()> {
 fn install_rustfmt() -> Result<()> {
     run(&format!("rustup install {}", TOOLCHAIN), ".")?;
     run(
-        &format!(
-            "rustup component add rustfmt-preview --toolchain {}",
-            TOOLCHAIN
-        ),
+        &format!("rustup component add rustfmt --toolchain {}", TOOLCHAIN),
         ".",
     )
 }
diff --git a/crates/tools/src/main.rs b/crates/tools/src/main.rs
index 0679b7d34..e312df537 100644
--- a/crates/tools/src/main.rs
+++ b/crates/tools/src/main.rs
@@ -121,10 +121,7 @@ fn install_code_extension() -> Result<()> {
     } else {
         run(r"npm install", "./editors/code")?;
     }
-    run(
-        r"npm run package",
-        "./editors/code",
-    )?;
+    run(r"npm run package", "./editors/code")?;
     if cfg!(windows) {
         run(
             r"cmd.exe /c code.cmd --install-extension ./ra-lsp-0.0.1.vsix",
-- 
cgit v1.2.3