summaryrefslogtreecommitdiffstats
path: root/debian/patches/d-test-host-duplicates.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 12:03:05 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 12:03:05 +0000
commit217d9223a5aa75daf9f286fd1fc06dae379b5dbc (patch)
treeb43bedae234ad56894a82934ee57e3619f3374d5 /debian/patches/d-test-host-duplicates.patch
parentAdding upstream version 1.64.0+dfsg1. (diff)
downloadrustc-217d9223a5aa75daf9f286fd1fc06dae379b5dbc.tar.xz
rustc-217d9223a5aa75daf9f286fd1fc06dae379b5dbc.zip
Adding debian version 1.64.0+dfsg1-1.debian/1.64.0+dfsg1-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/d-test-host-duplicates.patch')
-rw-r--r--debian/patches/d-test-host-duplicates.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/debian/patches/d-test-host-duplicates.patch b/debian/patches/d-test-host-duplicates.patch
new file mode 100644
index 000000000..50c39adf9
--- /dev/null
+++ b/debian/patches/d-test-host-duplicates.patch
@@ -0,0 +1,20 @@
+Description: Work around #842634 on some machines, e.g. Debian porterboxes
+ This should remain commented-out in debian/patches/series, it's not needed everywhere
+Author: Ximin Luo <infinity0@debian.org>
+Forwarded: not-needed
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/library/std/src/sys_common/net/tests.rs
++++ b/library/std/src/sys_common/net/tests.rs
+@@ -11,8 +11,10 @@
+ for sa in lh {
+ *addrs.entry(sa).or_insert(0) += 1;
+ }
++ let mut v = addrs.iter().filter(|&(_, &v)| v > 1).collect::<Vec<_>>();
++ v.clear();
+ assert_eq!(
+- addrs.iter().filter(|&(_, &v)| v > 1).collect::<Vec<_>>(),
++ v,
+ vec![],
+ "There should be no duplicate localhost entries"
+ );