Skip to content

Commit b16d101

Browse files
committed
Auto merge of rust-lang#5687 - flip1995:release_doc, r=phansch
Replace all remaining occurrences of submodule with subtree r? @phansch I should have included this in rust-lang#5686, but forgot about it, so here we go again. changelog: none
2 parents 6fc9939 + 6b9e2e9 commit b16d101

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

doc/changelog_update.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ been very rare that Clippy changes were included in a patch release.
1818

1919
### 1. Finding the relevant Clippy commits
2020

21-
Each Rust release ships with its own version of Clippy. The Clippy submodule can
21+
Each Rust release ships with its own version of Clippy. The Clippy subtree can
2222
be found in the `tools` directory of the Rust repository.
2323

2424
Depending on the current time and what exactly you want to update, the following

doc/release.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@ determined.
5959
```bash
6060
# Assuming the current directory corresponds to the Rust repository
6161
$ git checkout beta
62-
$ git submodule update
63-
$ BETA_SHA=$(git submodule status src/tools/clippy | awk '{print $1}')
62+
$ BETA_SHA=$(git log --oneline -- src/tools/clippy/ | grep -o "Merge commit '[a-f0-9]*' into .*" | head -1 | sed -e "s/Merge commit '\([a-f0-9]*\)' into .*/\1/g")
6463
```
6564

6665
After finding the Clippy commit, the `beta` branch in the Clippy repository can
@@ -83,8 +82,7 @@ release. This commit can be found in the Rust repository.
8382
# Assuming the current directory corresponds to the Rust repository
8483
$ git fetch upstream # `upstream` is the `rust-lang/rust` remote
8584
$ git checkout 1.XX.0 # XX should be exchanged with the corresponding version
86-
$ git submodule update
87-
$ SHA=$(git submodule status src/tools/clippy | awk '{print $1}')
85+
$ SHA=$(git log --oneline -- src/tools/clippy/ | grep -o "Merge commit '[a-f0-9]*' into .*" | head -1 | sed -e "s/Merge commit '\([a-f0-9]*\)' into .*/\1/g")
8886
```
8987

9088

0 commit comments

Comments
 (0)