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.
18
18
19
19
### 1. Finding the relevant Clippy commits
20
20
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
22
22
be found in the ` tools ` directory of the Rust repository.
23
23
24
24
Depending 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.
59
59
``` bash
60
60
# Assuming the current directory corresponds to the Rust repository
61
61
$ 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" )
64
63
```
65
64
66
65
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.
83
82
# Assuming the current directory corresponds to the Rust repository
84
83
$ git fetch upstream # `upstream` is the `rust-lang/rust` remote
85
84
$ 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" )
88
86
```
89
87
90
88
You can’t perform that action at this time.
0 commit comments