diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-03-04 20:36:07 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-03-04 20:36:07 +0000 |
| commit | 8c07ffcd76608657dbb6c1314ab516528ba419c4 (patch) | |
| tree | 1155693f7a453dc198828ce5c7447a42de6aa716 | |
| parent | af77ab4b9b27517c83b074925acae1a8001afee2 (diff) | |
| parent | 4a48256f0ea4846d947bcbab6e7663ff02fc8ec5 (diff) | |
Merge #3465
3465: Don't disable proposed features for nightly r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
| -rw-r--r-- | xtask/src/dist.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xtask/src/dist.rs b/xtask/src/dist.rs index cdd3db21c..737751ae8 100644 --- a/xtask/src/dist.rs +++ b/xtask/src/dist.rs | |||
| @@ -30,12 +30,12 @@ fn dist_client(nightly: bool) -> Result<()> { | |||
| 30 | let mut package_json = original_package_json.replace(r#""enableProposedApi": true,"#, r#""#); | 30 | let mut package_json = original_package_json.replace(r#""enableProposedApi": true,"#, r#""#); |
| 31 | 31 | ||
| 32 | if nightly { | 32 | if nightly { |
| 33 | package_json = package_json | 33 | package_json = package_json.replace( |
| 34 | .replace(r#""name": "rust-analyzer""#, r#""name": "rust-analyzer-nightly""#) | 34 | r#""displayName": "rust-analyzer""#, |
| 35 | .replace( | 35 | r#""displayName": "rust-analyzer nightly""#, |
| 36 | r#""displayName": "rust-analyzer""#, | 36 | ); |
| 37 | r#""displayName": "rust-analyzer nightly""#, | 37 | } else { |
| 38 | ); | 38 | package_json = original_package_json.replace(r#""enableProposedApi": true,"#, r#""#); |
| 39 | } | 39 | } |
| 40 | fs2::write(package_json_path, package_json)?; | 40 | fs2::write(package_json_path, package_json)?; |
| 41 | 41 | ||