Commit 9a6f26c

committed

Auto merge of #142442 - matthiaskrgr:rollup-6yodjfx, r=matthiaskrgr

Rollup of 10 pull requests Successful merges: - rust-lang/rust#134847 (Implement asymmetrical precedence for closures and jumps) - rust-lang/rust#141491 (Delegate `<CStr as Debug>` to `ByteStr`) - rust-lang/rust#141770 (Merge `Cfg::render_long_html` and `Cfg::render_long_plain` methods common code) - rust-lang/rust#142069 (Introduce `-Zmacro-stats`) - rust-lang/rust#142158 (Tracking the old name of renamed unstable library features) - rust-lang/rust#142221 ([AIX] strip underlying xcoff object) - rust-lang/rust#142340 (miri: we can use apfloat's mul_add now) - rust-lang/rust#142379 (Add bootstrap option to compile a tool with features) - rust-lang/rust#142410 (intrinsics: rename min_align_of to align_of) - rust-lang/rust#142413 (rustc-dev-guide subtree update) r? `@ghost` `@rustbot` modify labels: rollup

2 parents 69b2425 + 8b05b4d commit 9a6f26cCopy full SHA for 9a6f26c

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

Lines changed: 2 additions & 1 deletion

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 `~`

Lines changed: 1 addition & 1 deletion

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`

Comments

(0)