about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-05-06 11:24:13 +0000
committerbors <bors@rust-lang.org>2020-05-06 11:24:13 +0000
commit339f574809bf8e4166b8de3cdbe7df181d37af3d (patch)
tree37c3fb4745e7d4415233d21c70eba1595fca85cc /src/test
parent8da5869fb738e51438dd1e0697c1b2c84eb11c59 (diff)
parentb86620a558dd662fe4261b8c0a2798b7c3d1f068 (diff)
downloadrust-339f574809bf8e4166b8de3cdbe7df181d37af3d.tar.gz
rust-339f574809bf8e4166b8de3cdbe7df181d37af3d.zip
Auto merge of #71949 - Dylan-DPC:rollup-0gg02wd, r=Dylan-DPC
Rollup of 6 pull requests

Successful merges:

 - #71510 (Btreemap iter intertwined)
 - #71727 (SipHasher with keys initialized to 0 should just use new())
 - #71889 (Explain our RwLock implementation)
 - #71905 (Add command aliases from Cargo to x.py commands)
 - #71914 (Backport 1.43.1 release notes to master)
 - #71921 (explain the types used in the open64 call)

Failed merges:

r? @ghost
Diffstat (limited to 'src/test')
-rw-r--r--src/test/ui/deriving/deriving-hash.rs2
-rw-r--r--src/test/ui/issues/issue-16530.rs4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/test/ui/deriving/deriving-hash.rs b/src/test/ui/deriving/deriving-hash.rs
index 68c68c235ef..8b51370bca5 100644
--- a/src/test/ui/deriving/deriving-hash.rs
+++ b/src/test/ui/deriving/deriving-hash.rs
@@ -24,7 +24,7 @@ struct Person {
 enum E { A=1, B }
 
 fn hash<T: Hash>(t: &T) -> u64 {
-    let mut s = SipHasher::new_with_keys(0, 0);
+    let mut s = SipHasher::new();
     t.hash(&mut s);
     s.finish()
 }
diff --git a/src/test/ui/issues/issue-16530.rs b/src/test/ui/issues/issue-16530.rs
index 22a6ef7fa09..25817a2a63d 100644
--- a/src/test/ui/issues/issue-16530.rs
+++ b/src/test/ui/issues/issue-16530.rs
@@ -7,9 +7,9 @@ use std::hash::{SipHasher, Hasher, Hash};
 struct Empty;
 
 pub fn main() {
-    let mut s1 = SipHasher::new_with_keys(0, 0);
+    let mut s1 = SipHasher::new();
     Empty.hash(&mut s1);
-    let mut s2 = SipHasher::new_with_keys(0, 0);
+    let mut s2 = SipHasher::new();
     Empty.hash(&mut s2);
     assert_eq!(s1.finish(), s2.finish());
 }