auto merge of #14368 : tedhorst/rust/master, r=alexcrichton

bors · bors · commit 11aa731b387d · 2014-05-23T14:56:24.000-07:00
diff --git a/src/libstd/hash/sip.rs b/src/libstd/hash/sip.rs
@@ -645,7 +645,7 @@ officia deserunt mollit anim id est laborum.";
             y: 2,
         };
         b.iter(|| {
-            assert_eq!(hash(&compound), 15783192367317361799);
+            assert_eq!(hash(&compound), 12506681940457338191);
         })
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -645,7 +645,7 @@ officia deserunt mollit anim id est laborum.";`
`645`	`645`	`y: 2,`
`646`	`646`	`};`
`647`	`647`	`b.iter(\|\| {`
`648`		`- assert_eq!(hash(&compound), 15783192367317361799);`
	`648`	`+ assert_eq!(hash(&compound), 12506681940457338191);`
`649`	`649`	`})`
`650`	`650`	`}`
`651`	`651`	`}`