Skip to content

Commit bf51b85

Browse files
committed
Auto merge of #43388 - TimNN:rollup, r=TimNN
Rollup of 8 pull requests - Successful merges: #43046, #43256, #43280, #43297, #43313, #43319, #43322, #43343 - Failed merges:
2 parents d361efa + fb8034b commit bf51b85

19 files changed

+612
-237
lines changed

configure

+4-4
Original file line numberDiff line numberDiff line change
@@ -560,8 +560,8 @@ case "$CFG_RELEASE_CHANNEL" in
560560
*-pc-windows-gnu)
561561
;;
562562
*)
563-
CFG_ENABLE_DEBUGINFO_LINES=1
564-
CFG_ENABLE_DEBUGINFO_ONLY_STD=1
563+
enable_if_not_disabled debuginfo-lines
564+
enable_if_not_disabled debuginfo-only-std
565565
;;
566566
esac
567567

@@ -572,8 +572,8 @@ case "$CFG_RELEASE_CHANNEL" in
572572
*-pc-windows-gnu)
573573
;;
574574
*)
575-
CFG_ENABLE_DEBUGINFO_LINES=1
576-
CFG_ENABLE_DEBUGINFO_ONLY_STD=1
575+
enable_if_not_disabled debuginfo-lines
576+
enable_if_not_disabled debuginfo-only-std
577577
;;
578578
esac
579579
;;

src/Cargo.lock

+36
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)