about summary refs log tree commit diff
path: root/src/libcollections
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-06-30 03:46:25 +0000
committerbors <bors@rust-lang.org>2014-06-30 03:46:25 +0000
commite25eb6b223d86047dc807a167f3dd4bf492bbf41 (patch)
treeb0c22f04747ee2122e32e8c101e371be5fca01c8 /src/libcollections
parent9ae48286a99627391e30da3888217e6050230cfe (diff)
parentab1bd3adf673ef7a515242a2dcc09ce360d41d9c (diff)
downloadrust-e25eb6b223d86047dc807a167f3dd4bf492bbf41.tar.gz
rust-e25eb6b223d86047dc807a167f3dd4bf492bbf41.zip
auto merge of #15256 : erickt/rust/optimizations, r=alexcrichton
The bug #11084 causes `option::collect` and `result::collect` about twice as slower as it should because llvm is having some trouble optimizing away the scan closure. This gets rid of it so now those functions perform equivalent to a hand written version.

This also adds an impl of `Default` for `Rc` along the way.
Diffstat (limited to 'src/libcollections')
-rw-r--r--src/libcollections/hash/sip.rs2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/libcollections/hash/sip.rs b/src/libcollections/hash/sip.rs
index 887b0fb0b8a..4fd98538af7 100644
--- a/src/libcollections/hash/sip.rs
+++ b/src/libcollections/hash/sip.rs
@@ -265,8 +265,6 @@ pub fn hash_with_keys<T: Hash<SipState>>(k0: u64, k1: u64, value: &T) -> u64 {
     state.result()
 }
 
-
-
 #[cfg(test)]
 mod tests {
     use test::Bencher;