fix rebuild of 1.61 with 1.61

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

diff --git a/debian/patches/d-fix-1.61-rebuild.patch b/debian/patches/d-fix-1.61-rebuild.patch
new file mode 100644 (file)
index 0000000..fe8e4d4
--- /dev/null
+++ b/debian/patches/d-fix-1.61-rebuild.patch
@@ -0,0 +1,17 @@
+Can be dropped with 1.62:
+
+https://github.com/rust-lang/rust/pull/95678
+
+Index: rust/src/tools/compiletest/src/header.rs
+===================================================================
+--- rust.orig/src/tools/compiletest/src/header.rs
++++ rust/src/tools/compiletest/src/header.rs
+@@ -807,7 +807,7 @@ pub fn make_test_description<R: Read>(
+ ) -> test::TestDesc {
+     let mut ignore = false;
+     #[cfg(not(bootstrap))]
+-    let ignore_message: Option<String> = None;
++    let ignore_message = None;
+     let mut should_fail = false;
+ 
+     let rustc_has_profiler_support = env::var_os("RUSTC_PROFILER_SUPPORT").is_some();

diff --git a/debian/patches/series b/debian/patches/series
index e05e41a08182788fabbf86c3716f241df539d678..bfb810e988f1b5fc14afe6161f19377f1c8b9514 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -57,3 +57,4 @@ d-rustc-i686-baseline.patch
 d-rustdoc-disable-embedded-fonts.patch
 ubuntu-disable-ppc64el-asm-tests.patch
 ubuntu-ignore-arm-doctest.patch
+d-fix-1.61-rebuild.patch