diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-05-07 22:27:20 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2021-05-07 22:27:20 +0100 |
commit | 9c8763714c018c5b93a49dfec5f51c137c58c95d (patch) | |
tree | bcca0329f661bdc36f1bb96e364ba201f57dce4b | |
parent | 6860b647a5c296dfd6c10cf7536853fbd9e6fef1 (diff) | |
parent | 0fce38b138a36ce0e87ed166e2f5c2b558ba4d4d (diff) |
Merge #8755
8755: fix: direct people to the right repository r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
-rw-r--r-- | docs/user/manual.adoc | 2 | ||||
-rw-r--r-- | xtask/src/release.rs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/user/manual.adoc b/docs/user/manual.adoc index 58722aaa3..ce62d928d 100644 --- a/docs/user/manual.adoc +++ b/docs/user/manual.adoc | |||
@@ -6,8 +6,6 @@ | |||
6 | :source-highlighter: rouge | 6 | :source-highlighter: rouge |
7 | :experimental: | 7 | :experimental: |
8 | 8 | ||
9 | // Master copy of this document lives in the https://github.com/rust-analyzer/rust-analyzer repository | ||
10 | |||
11 | At its core, rust-analyzer is a *library* for semantic analysis of Rust code as it changes over time. | 9 | At its core, rust-analyzer is a *library* for semantic analysis of Rust code as it changes over time. |
12 | This manual focuses on a specific usage of the library -- running it as part of a server that implements the | 10 | This manual focuses on a specific usage of the library -- running it as part of a server that implements the |
13 | https://microsoft.github.io/language-server-protocol/[Language Server Protocol] (LSP). | 11 | https://microsoft.github.io/language-server-protocol/[Language Server Protocol] (LSP). |
diff --git a/xtask/src/release.rs b/xtask/src/release.rs index 452f351d0..2c0476778 100644 --- a/xtask/src/release.rs +++ b/xtask/src/release.rs | |||
@@ -1,6 +1,6 @@ | |||
1 | mod changelog; | 1 | mod changelog; |
2 | 2 | ||
3 | use xshell::{cmd, cp, pushd, read_dir, write_file}; | 3 | use xshell::{cmd, pushd, read_dir, read_file, write_file}; |
4 | 4 | ||
5 | use crate::{codegen, date_iso, flags, is_release_tag, project_root, Result}; | 5 | use crate::{codegen, date_iso, flags, is_release_tag, project_root, Result}; |
6 | 6 | ||
@@ -41,7 +41,9 @@ impl flags::Release { | |||
41 | { | 41 | { |
42 | let src = project_root().join("./docs/user/").join(adoc); | 42 | let src = project_root().join("./docs/user/").join(adoc); |
43 | let dst = website_root.join(adoc); | 43 | let dst = website_root.join(adoc); |
44 | cp(src, dst)?; | 44 | |
45 | let contents = read_file(src)?.replace("\n\n===", "\n\n// IMPORTANT: master copy of this document lives in the https://github.com/rust-analyzer/rust-analyzer repository\n\n=="); | ||
46 | write_file(dst, contents)?; | ||
45 | } | 47 | } |
46 | 48 | ||
47 | let tags = cmd!("git tag --list").read()?; | 49 | let tags = cmd!("git tag --list").read()?; |