about summary refs log tree commit diff
path: root/src/tools
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-08-14 14:13:48 +0000
committerbors <bors@rust-lang.org>2024-08-14 14:13:48 +0000
commit355a307a874077eff12bd99c6fd3eb6bfda79993 (patch)
tree459cf7ef097c14f40256cb7e0bcbceafd74b9f8d /src/tools
parent0f442e265c165c0a78633bef98de18517815150c (diff)
parent4d8c0b3b5dc6c4476946ab713e1d01a1d40a8bef (diff)
downloadrust-355a307a874077eff12bd99c6fd3eb6bfda79993.tar.gz
rust-355a307a874077eff12bd99c6fd3eb6bfda79993.zip
Auto merge of #129092 - jieyouxu:rollup-z2522nm, r=jieyouxu
Rollup of 6 pull requests

Successful merges:

 - #128570 (Stabilize `asm_const`)
 - #128828 (`-Znext-solver` caching)
 - #128954 (Explicitly specify type parameter on FromResidual for Option and ControlFlow.)
 - #129059 (Record the correct target type when coercing fn items/closures to pointers)
 - #129071 (Port `run-make/sysroot-crates-are-unstable` to rmake)
 - #129088 (Make the rendered html doc for rustc better)

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/tidy/src/allowed_run_make_makefiles.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/tools/tidy/src/allowed_run_make_makefiles.txt b/src/tools/tidy/src/allowed_run_make_makefiles.txt
index 2d25de46f6e..25fa8c5e1af 100644
--- a/src/tools/tidy/src/allowed_run_make_makefiles.txt
+++ b/src/tools/tidy/src/allowed_run_make_makefiles.txt
@@ -20,6 +20,5 @@ run-make/reproducible-build/Makefile
 run-make/rlib-format-packed-bundled-libs/Makefile
 run-make/split-debuginfo/Makefile
 run-make/symbol-mangling-hashed/Makefile
-run-make/sysroot-crates-are-unstable/Makefile
 run-make/translation/Makefile
 run-make/x86_64-fortanix-unknown-sgx-lvi/Makefile