diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 12:41:42 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 12:41:42 +0000 |
commit | 56f5bfd26c333c7f9439bb439861e59e255d3d37 (patch) | |
tree | 1873cff2936f7b3b4abf2ea3c46f78404009af50 /debian/patches/ubuntu-ignore-arm-doctest.patch | |
parent | Merging upstream version 1.70.0+dfsg2. (diff) | |
download | rustc-56f5bfd26c333c7f9439bb439861e59e255d3d37.tar.xz rustc-56f5bfd26c333c7f9439bb439861e59e255d3d37.zip |
Merging debian version 1.70.0+dfsg2-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 | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/debian/patches/ubuntu-ignore-arm-doctest.patch b/debian/patches/ubuntu-ignore-arm-doctest.patch index b67b7d2ef..a70e4741f 100644 --- a/debian/patches/ubuntu-ignore-arm-doctest.patch +++ b/debian/patches/ubuntu-ignore-arm-doctest.patch @@ -5,9 +5,11 @@ 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/ ---- a/compiler/rustc_error_codes/src/error_codes/E0778.md -+++ b/compiler/rustc_error_codes/src/error_codes/E0778.md -@@ -16,7 +16,7 @@ +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)] @@ -16,7 +18,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ fn something() {} ``` -@@ -25,7 +25,7 @@ +@@ -25,7 +25,7 @@ or: ``` #![feature(isa_attribute)] @@ -25,9 +27,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ fn something() {} ``` ---- a/compiler/rustc_error_codes/src/error_codes/E0779.md -+++ b/compiler/rustc_error_codes/src/error_codes/E0779.md -@@ -21,7 +21,7 @@ +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)] |