From aa0516b8632677cb4f747f2995b6513a7d46dc7c Mon Sep 17 00:00:00 2001 From: lolbinarycat Date: Tue, 10 Jun 2025 12:48:05 -0500 Subject: [PATCH 1/3] =?UTF-8?q?Using=20git=20=C2=A7=20I=20changed=20a=20su?= =?UTF-8?q?bmodule=20by=20accident:=20be=20explicit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rewriting git history is something that is often difficult for new contributors, and we're already explaining the `` placeholder syntax, so I think it makes sense to be explicit about what exactly the paths mean. --- src/git.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/git.md b/src/git.md index 8118ddff..8726ddfc 100644 --- a/src/git.md +++ b/src/git.md @@ -142,7 +142,8 @@ The most common cause is that you rebased after a change and ran `git add .` wit `x` to update the submodules. Alternatively, you might have run `cargo fmt` instead of `x fmt` and modified files in a submodule, then committed the changes. -To fix it, do the following things: +To fix it, do the following things (if you changed a submodule other than cargo, +replace `src/tools/cargo` with the path to that submodule): 1. See which commit has the accidental changes: `git log --stat -n1 src/tools/cargo` 2. Revert the changes to that commit: `git checkout ~ src/tools/cargo`. Type `~` From 23604cd1a33a562c6ab9973404d36897eaebd1ab Mon Sep 17 00:00:00 2001 From: Tshepang Mbambo Date: Wed, 11 Jun 2025 07:14:12 +0200 Subject: [PATCH 2/3] that was phrased like a separate sentence --- src/tests/compiletest.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/compiletest.md b/src/tests/compiletest.md index 20dd16c8..ded30234 100644 --- a/src/tests/compiletest.md +++ b/src/tests/compiletest.md @@ -115,7 +115,7 @@ default behavior without any commands is to: 2. Run `rustc -Zunpretty=normal` on the output of the previous step. 3. The output of the previous two steps should be the same. 4. Run `rustc -Zno-codegen` on the output to make sure that it can type check - (this is similar to running `cargo check`). + (similar to `cargo check`). If any of the commands above fail, then the test fails. From bf475d08f295577c66e916034eec5254cae94051 Mon Sep 17 00:00:00 2001 From: The rustc-dev-guide Cronjob Bot Date: Thu, 12 Jun 2025 04:06:27 +0000 Subject: [PATCH 3/3] Preparing for merge from rustc --- rust-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-version b/rust-version index c8721bb3..86d35b31 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -c31cccb7b5cc098b1a8c1794ed38d7fdbec0ccb0 +14346303d760027e53214e705109a62c0f00b214