File tree Expand file tree Collapse file tree 2 files changed +3
-5
lines changed Expand file tree Collapse file tree 2 files changed +3
-5
lines changed Original file line number Diff line number Diff 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
2222be found in the ` tools ` directory of the Rust repository.
2323
2424Depending on the current time and what exactly you want to update, the following
Original file line number Diff line number Diff 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
6665After 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
You can’t perform that action at this time.
0 commit comments