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/u-ignore-endian-big-diff.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/u-ignore-endian-big-diff.patch')
-rw-r--r-- | debian/patches/u-ignore-endian-big-diff.patch | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/debian/patches/u-ignore-endian-big-diff.patch b/debian/patches/u-ignore-endian-big-diff.patch index 73bb776c3..faa270173 100644 --- a/debian/patches/u-ignore-endian-big-diff.patch +++ b/debian/patches/u-ignore-endian-big-diff.patch @@ -14,43 +14,55 @@ Bug: https://github.com/rust-lang/rust/issues/89577 src/test/ui/consts/const-eval/ub-wide-ptr.rs | 1 + 6 files changed, 6 insertions(+) ---- a/tests/ui/consts/const-eval/ub-enum.rs -+++ b/tests/ui/consts/const-eval/ub-enum.rs +Index: rust/tests/ui/consts/const-eval/ub-enum.rs +=================================================================== +--- rust.orig/tests/ui/consts/const-eval/ub-enum.rs ++++ rust/tests/ui/consts/const-eval/ub-enum.rs @@ -1,3 +1,4 @@ +// ignore-test // stderr-per-bitwidth // Strip out raw byte dumps to make comparison platform-independent: // normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)" ---- a/tests/ui/consts/const-eval/ub-int-array.rs -+++ b/tests/ui/consts/const-eval/ub-int-array.rs +Index: rust/tests/ui/consts/const-eval/ub-int-array.rs +=================================================================== +--- rust.orig/tests/ui/consts/const-eval/ub-int-array.rs ++++ rust/tests/ui/consts/const-eval/ub-int-array.rs @@ -1,3 +1,4 @@ +// ignore-test // stderr-per-bitwidth //! Test the "array of int" fast path in validity checking, and in particular whether it //! points at the right array element. ---- a/tests/ui/consts/const-eval/ub-nonnull.rs -+++ b/tests/ui/consts/const-eval/ub-nonnull.rs +Index: rust/tests/ui/consts/const-eval/ub-nonnull.rs +=================================================================== +--- rust.orig/tests/ui/consts/const-eval/ub-nonnull.rs ++++ rust/tests/ui/consts/const-eval/ub-nonnull.rs @@ -1,3 +1,4 @@ +// ignore-test // Strip out raw byte dumps to make comparison platform-independent: // normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)" // normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*a(lloc)?[0-9]+(\+[a-z0-9]+)?─*╼ )+ *│.*" -> "HEX_DUMP" ---- a/tests/ui/consts/const-eval/ub-ref-ptr.rs -+++ b/tests/ui/consts/const-eval/ub-ref-ptr.rs +Index: rust/tests/ui/consts/const-eval/ub-ref-ptr.rs +=================================================================== +--- rust.orig/tests/ui/consts/const-eval/ub-ref-ptr.rs ++++ rust/tests/ui/consts/const-eval/ub-ref-ptr.rs @@ -1,3 +1,4 @@ +// ignore-test // ignore-tidy-linelength // Strip out raw byte dumps to make comparison platform-independent: // normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)" ---- a/tests/ui/consts/const-eval/ub-uninhabit.rs -+++ b/tests/ui/consts/const-eval/ub-uninhabit.rs +Index: rust/tests/ui/consts/const-eval/ub-uninhabit.rs +=================================================================== +--- rust.orig/tests/ui/consts/const-eval/ub-uninhabit.rs ++++ rust/tests/ui/consts/const-eval/ub-uninhabit.rs @@ -1,3 +1,4 @@ +// ignore-test // Strip out raw byte dumps to make comparison platform-independent: // normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)" // normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*a(lloc)?[0-9]+(\+[a-z0-9]+)?─*╼ )+ *│.*" -> "HEX_DUMP" ---- a/tests/ui/consts/const-eval/ub-wide-ptr.rs -+++ b/tests/ui/consts/const-eval/ub-wide-ptr.rs +Index: rust/tests/ui/consts/const-eval/ub-wide-ptr.rs +=================================================================== +--- rust.orig/tests/ui/consts/const-eval/ub-wide-ptr.rs ++++ rust/tests/ui/consts/const-eval/ub-wide-ptr.rs @@ -1,3 +1,4 @@ +// ignore-test // ignore-tidy-linelength |