aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJMcNab <[email protected]>2018-12-09 09:08:10 +0000
committerDJMcNab <[email protected]>2018-12-09 09:08:10 +0000
commitbb0c2eb8d9da46ca1c71e42dcc363c13028b3eae (patch)
tree214643720bdc3837869eccf568ed1290113625b9
parent12addc6233a9297033e6e943233ebbeb08e39f36 (diff)
Fix cargo format component name and run rustfmt
-rw-r--r--crates/tools/src/lib.rs5
-rw-r--r--crates/tools/src/main.rs5
2 files changed, 2 insertions, 8 deletions
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<()> {
112fn install_rustfmt() -> Result<()> { 112fn install_rustfmt() -> Result<()> {
113 run(&format!("rustup install {}", TOOLCHAIN), ".")?; 113 run(&format!("rustup install {}", TOOLCHAIN), ".")?;
114 run( 114 run(
115 &format!( 115 &format!("rustup component add rustfmt --toolchain {}", TOOLCHAIN),
116 "rustup component add rustfmt-preview --toolchain {}",
117 TOOLCHAIN
118 ),
119 ".", 116 ".",
120 ) 117 )
121} 118}
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<()> {
121 } else { 121 } else {
122 run(r"npm install", "./editors/code")?; 122 run(r"npm install", "./editors/code")?;
123 } 123 }
124 run( 124 run(r"npm run package", "./editors/code")?;
125 r"npm run package",
126 "./editors/code",
127 )?;
128 if cfg!(windows) { 125 if cfg!(windows) {
129 run( 126 run(
130 r"cmd.exe /c code.cmd --install-extension ./ra-lsp-0.0.1.vsix", 127 r"cmd.exe /c code.cmd --install-extension ./ra-lsp-0.0.1.vsix",