about summary refs log tree commit diff
path: root/src/tools
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-06-11 22:20:35 +0000
committerbors <bors@rust-lang.org>2024-06-11 22:20:35 +0000
commitebcb862bbb9031c4969c06ec73d44780ea37d0ff (patch)
treef71fabd3f6c637b9eeb5afb72180a50f8ba285b3 /src/tools
parentd0227c6a19c2d6e8dceb87c7a2776dc2b10d2a04 (diff)
parente37c423f106a16302718c5e413166b74ea3d4583 (diff)
downloadrust-ebcb862bbb9031c4969c06ec73d44780ea37d0ff.tar.gz
rust-ebcb862bbb9031c4969c06ec73d44780ea37d0ff.zip
Auto merge of #126284 - jieyouxu:rollup-nq7bf9k, r=jieyouxu
Rollup of 6 pull requests

Successful merges:

 - #115974 (Split core's PanicInfo and std's PanicInfo)
 - #125659 (Remove usage of `isize` in example)
 - #125669 (CI: Update riscv64gc-linux job to Ubuntu 22.04, rename to riscv64gc-gnu)
 - #125684 (Account for existing bindings when suggesting `pin!()`)
 - #126055 (Expand list of trait implementers in E0277 when calling rustc with --verbose)
 - #126174 (Migrate `tests/run-make/prefer-dylib` to `rmake.rs`)

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 b07e012a1b8..448d4887d32 100644
--- a/src/tools/tidy/src/allowed_run_make_makefiles.txt
+++ b/src/tools/tidy/src/allowed_run_make_makefiles.txt
@@ -175,7 +175,6 @@ run-make/pgo-gen/Makefile
 run-make/pgo-indirect-call-promotion/Makefile
 run-make/pgo-use/Makefile
 run-make/pointer-auth-link-with-c/Makefile
-run-make/prefer-dylib/Makefile
 run-make/prefer-rlib/Makefile
 run-make/pretty-print-to-file/Makefile
 run-make/pretty-print-with-dep-file/Makefile