Rollup merge of #126413 - matthiaskrgr:crshmsg, r=oli-obk · rust-lang/rust@46e4398 (original) (raw)

File tree

2 files changed

lines changed

src/tools/compiletest/src

2 files changed

lines changed

Original file line number	Diff line number	Diff line change
@@ -374,11 +374,12 @@ impl<'test> TestCx<'test> {
374	374
375	375	// if a test does not crash, consider it an error
376	376	if proc_res.status.success() \|	matches!(proc_res.status.code(), Some(1
377		-self.fatal(
378		-"test no longer crashes/triggers ICE! Please give it a mearningful name, \
	377	+self.fatal(&format!(
	378	+"crashtest no longer crashes/triggers ICE, horray! Please give it a meaningful name, \
379	379	add a doc-comment to the start of the test explaining why it exists and \
380		- move it to tests/ui or wherever you see fit.",
381		-);
	380	+ move it to tests/ui or wherever you see fit. Adding 'Fixes #' to your PR description \
	381	+ ensures that the corresponding ticket is auto-closed upon merge."
	382	+));
382	383	}
383	384	}
384	385

Original file line number	Diff line number	Diff line change
@@ -811,6 +811,9 @@ If appropriate, please update `CONFIG_CHANGE_HISTORY` in `src/bootstrap/src/util
811	811	[mentions."src/bootstrap/src/core/build_steps/llvm.rs"]
812	812	message = "This PR changes how LLVM is built. Consider updating src/bootstrap/download-ci-llvm-stamp."
813	813
	814	+[mentions."test/crashes"]
	815	+message = "This PR changes a file inside `tests/crashes`. If a crash was fixed, please move into the correspondig `ui` subdir and add 'Fixes #' to the pr description to autoclose the issue upon merge."
	816	+
814	817	[mentions."tests/ui/deriving/deriving-all-codegen.stdout"]
815	818	message = "Changes to the code generated for builtin derived traits."
816	819	cc = ["@nnethercote"]