diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 09:26:37 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 09:26:37 +0000 |
| commit | 1c69ecb2dd463a5cd922e872386381e1cc17147e (patch) | |
| tree | d49e9c5086b704151975474cb9ae68509ffa4787 /debian/patches/ubuntu-ignore-arm-doctest.patch | |
| parent | Merging upstream version 1.76.0+dfsg1. (diff) | |
| download | rustc-1c69ecb2dd463a5cd922e872386381e1cc17147e.tar.xz rustc-1c69ecb2dd463a5cd922e872386381e1cc17147e.zip | |
Merging debian version 1.76.0+dfsg1-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/ubuntu-ignore-arm-doctest.patch')
| -rw-r--r-- | debian/patches/ubuntu-ignore-arm-doctest.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/debian/patches/ubuntu-ignore-arm-doctest.patch b/debian/patches/ubuntu-ignore-arm-doctest.patch deleted file mode 100644 index a70e4741f..000000000 --- a/debian/patches/ubuntu-ignore-arm-doctest.patch +++ /dev/null @@ -1,42 +0,0 @@ -Description: Disable the doctests for the instruction_set errors - The fix is as described in the upstream issue. -Author: Simon Chopin <simon.chopin@canonical.com> -Bug: https://github.com/rust-lang/rust/issues/83453 -Last-Update: 2022-02-23 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: rust/compiler/rustc_error_codes/src/error_codes/E0778.md -=================================================================== ---- rust.orig/compiler/rustc_error_codes/src/error_codes/E0778.md -+++ rust/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() {} - ``` - -Index: rust/compiler/rustc_error_codes/src/error_codes/E0779.md -=================================================================== ---- rust.orig/compiler/rustc_error_codes/src/error_codes/E0779.md -+++ rust/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() {} - ``` |