Skip to content

Commit ed88733

Browse files
committed
MSRV 1.74.0
1 parent 53a0b8d commit ed88733

File tree

3 files changed

+32
-1
lines changed

3 files changed

+32
-1
lines changed

debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Build-Depends: bison,
1313
libreadline6-dev,
1414
libssl-dev,
1515
libyaml-dev,
16-
rustc (>= 1.58.0),
16+
rustc (>= 1.74.0) | rustc-web (>= 1.74.0),
1717
cargo,
1818
netbase <!nocheck>,
1919
openssl <!nocheck>,
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
From: Sorah Fukumori <her@sorah.jp>
2+
Date: Thu, 26 Dec 2024 03:12:28 +0900
3+
Subject: gc/mmtk: keep using std::panic::PanicInfo for MSRV 1.74
4+
5+
https://github.com/rust-lang/rust/pull/115974
6+
---
7+
gc/mmtk/src/lib.rs | 3 +--
8+
1 file changed, 1 insertion(+), 2 deletions(-)
9+
10+
diff --git a/gc/mmtk/src/lib.rs b/gc/mmtk/src/lib.rs
11+
index 01497e9..6442392 100644
12+
--- a/gc/mmtk/src/lib.rs
13+
+++ b/gc/mmtk/src/lib.rs
14+
@@ -5,7 +5,6 @@ extern crate log;
15+
extern crate probe;
16+
17+
use std::collections::HashSet;
18+
-use std::panic::PanicHookInfo;
19+
use std::sync::Mutex;
20+
use std::thread::ThreadId;
21+
22+
@@ -92,7 +91,7 @@ pub(crate) fn is_gc_thread(thread_id: ThreadId) -> bool {
23+
gc_threads.contains(&thread_id)
24+
}
25+
26+
-fn handle_gc_thread_panic(panic_info: &PanicHookInfo) {
27+
+fn handle_gc_thread_panic(panic_info: &std::panic::PanicInfo) {
28+
eprintln!("ERROR: An MMTk GC thread panicked. This is a bug.");
29+
eprintln!("{panic_info}");
30+

debian/patches/series

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ extract-gems-sequential-Keep-using-RUNRUBY.patch
99
sync_default_gems-git-2.32-ignores-no-edit-in-cherry-pick.patch
1010
YJIT-Let-RubyVM-YJIT.enable-respect-yjit-stats.patch
1111
Ensure-Integer-GMP_VERSION-exists.patch
12+
gc-mmtk-keep-using-std-panic-PanicInfo-for-MSRV-1.74.patch

0 commit comments

Comments
 (0)