File tree Expand file tree Collapse file tree 3 files changed +4
-3
lines changed Expand file tree Collapse file tree 3 files changed +4
-3
lines changed Original file line number Diff line number Diff line change 1
- c31cccb7b5cc098b1a8c1794ed38d7fdbec0ccb0
1
+ 14346303d760027e53214e705109a62c0f00b214
Original file line number Diff line number Diff line change @@ -142,7 +142,8 @@ The most common cause is that you rebased after a change and ran `git add .` wit
142
142
` x ` to update the submodules. Alternatively, you might have run ` cargo fmt ` instead of ` x fmt `
143
143
and modified files in a submodule, then committed the changes.
144
144
145
- To fix it, do the following things:
145
+ To fix it, do the following things (if you changed a submodule other than cargo,
146
+ replace ` src/tools/cargo ` with the path to that submodule):
146
147
147
148
1 . See which commit has the accidental changes: ` git log --stat -n1 src/tools/cargo `
148
149
2 . Revert the changes to that commit: ` git checkout <my-commit>~ src/tools/cargo ` . Type ` ~ `
Original file line number Diff line number Diff line change @@ -115,7 +115,7 @@ default behavior without any commands is to:
115
115
2 . Run ` rustc -Zunpretty=normal ` on the output of the previous step.
116
116
3 . The output of the previous two steps should be the same.
117
117
4 . Run ` rustc -Zno-codegen ` on the output to make sure that it can type check
118
- (this is similar to running ` cargo check ` ).
118
+ (similar to ` cargo check ` ).
119
119
120
120
If any of the commands above fail, then the test fails.
121
121
You can’t perform that action at this time.
0 commit comments