diff options
| author | bors <bors@rust-lang.org> | 2024-06-08 10:56:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-06-08 10:56:55 +0000 |
| commit | 4f180b6fed4a2d1a6c79ebc10da6729093276e0e (patch) | |
| tree | c37be7789aa2aa189bab04f0f2accbd4c9cc25d9 | |
| parent | c50175323606c63ff37558c487e846d746b0ee6f (diff) | |
| parent | b4891c3f56be9e563d917be6306117b17b79e2d5 (diff) | |
| download | rust-4f180b6fed4a2d1a6c79ebc10da6729093276e0e.tar.gz rust-4f180b6fed4a2d1a6c79ebc10da6729093276e0e.zip | |
Auto merge of #17368 - Veykril:dist-fix, r=Veykril
fix: Fix generated markers not being patchable in package.json I think the newlines are tripping up CI, so I hope clearing the property to leave an empty object won't make VSCode made here.
| -rw-r--r-- | src/tools/rust-analyzer/.cargo/config.toml | 1 | ||||
| -rw-r--r-- | src/tools/rust-analyzer/xtask/src/dist.rs | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/tools/rust-analyzer/.cargo/config.toml b/src/tools/rust-analyzer/.cargo/config.toml index 070560dfbc3..0193a9566e2 100644 --- a/src/tools/rust-analyzer/.cargo/config.toml +++ b/src/tools/rust-analyzer/.cargo/config.toml @@ -4,6 +4,7 @@ tq = "test -- -q" qt = "tq" lint = "clippy --all-targets -- --cap-lints warn" codegen = "run --package xtask --bin xtask -- codegen" +dist = "run --package xtask --bin xtask -- dist" [target.x86_64-pc-windows-msvc] linker = "rust-lld" diff --git a/src/tools/rust-analyzer/xtask/src/dist.rs b/src/tools/rust-analyzer/xtask/src/dist.rs index d6a10532700..742cf7f609a 100644 --- a/src/tools/rust-analyzer/xtask/src/dist.rs +++ b/src/tools/rust-analyzer/xtask/src/dist.rs @@ -70,11 +70,8 @@ fn dist_client( &format!(r#""version": "{version}""#), ) .replace(r#""releaseTag": null"#, &format!(r#""releaseTag": "{release_tag}""#)) - .replace( - " {\n \"title\": \"$generated-start\"\n },\n", - "", - ) - .replace(" { \"title\": \"$generated-end\" }\n", "") + .replace(r#""title": "$generated-start""#, "") + .replace(r#""title": "$generated-end""#, "") .replace(r#""enabledApiProposals": [],"#, r#""#); patch.commit(sh)?; |