summaryrefslogtreecommitdiffstats
path: root/debian/patches/ubuntu/ubuntu-ignore-arm-doctest.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-19 09:26:01 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-19 09:26:01 +0000
commitc29d7c1ba10d6debd11f9d8aad5d069a6491e60e (patch)
treea2ad46eb513b315f0efd8170af5eb08870165757 /debian/patches/ubuntu/ubuntu-ignore-arm-doctest.patch
parentMerging upstream version 1.76.0+dfsg1. (diff)
downloadrustc-debian.tar.xz
rustc-debian.zip
Adding debian version 1.76.0+dfsg1-1.debian/1.76.0+dfsg1-1debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/ubuntu/ubuntu-ignore-arm-doctest.patch')
-rw-r--r--debian/patches/ubuntu/ubuntu-ignore-arm-doctest.patch48
1 files changed, 48 insertions, 0 deletions
diff --git a/debian/patches/ubuntu/ubuntu-ignore-arm-doctest.patch b/debian/patches/ubuntu/ubuntu-ignore-arm-doctest.patch
new file mode 100644
index 000000000..4249b18e6
--- /dev/null
+++ b/debian/patches/ubuntu/ubuntu-ignore-arm-doctest.patch
@@ -0,0 +1,48 @@
+From: Simon Chopin <simon.chopin@canonical.com>
+Date: Thu, 13 Jun 2024 11:16:41 +0200
+Subject: Disable the doctests for the instruction_set errors
+
+Bug: https://github.com/rust-lang/rust/issues/83453
+Last-Update: 2022-02-23
+
+The fix is as described in the upstream issue.
+---
+ compiler/rustc_error_codes/src/error_codes/E0778.md | 4 ++--
+ compiler/rustc_error_codes/src/error_codes/E0779.md | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/compiler/rustc_error_codes/src/error_codes/E0778.md b/compiler/rustc_error_codes/src/error_codes/E0778.md
+index 467362d..d5688c2 100644
+--- a/compiler/rustc_error_codes/src/error_codes/E0778.md
++++ b/compiler/rustc_error_codes/src/error_codes/E0778.md
+@@ -16,7 +16,7 @@ specified:
+ ```
+ #![feature(isa_attribute)]
+
+-#[cfg_attr(target_arch="arm", instruction_set(arm::a32))]
++#[cfg_attr(all(target_arch="arm", target_os="none"), instruction_set(arm::a32))]
+ fn something() {}
+ ```
+
+@@ -25,7 +25,7 @@ or:
+ ```
+ #![feature(isa_attribute)]
+
+-#[cfg_attr(target_arch="arm", instruction_set(arm::t32))]
++#[cfg_attr(all(target_arch="arm", target_os="none"), instruction_set(arm::t32))]
+ fn something() {}
+ ```
+
+diff --git a/compiler/rustc_error_codes/src/error_codes/E0779.md b/compiler/rustc_error_codes/src/error_codes/E0779.md
+index 146e20c..9d23322 100644
+--- a/compiler/rustc_error_codes/src/error_codes/E0779.md
++++ b/compiler/rustc_error_codes/src/error_codes/E0779.md
+@@ -21,7 +21,7 @@ error. Example:
+ ```
+ #![feature(isa_attribute)]
+
+-#[cfg_attr(target_arch="arm", instruction_set(arm::a32))] // ok!
++#[cfg_attr(all(target_arch="arm", target_os="none"), instruction_set(arm::a32))] // ok!
+ pub fn something() {}
+ fn main() {}
+ ```