about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-11-02 14:29:31 -0700
committerGitHub <noreply@github.com>2016-11-02 14:29:31 -0700
commit5665bdf3e3953a3fe67e047794913a0c88a83bde (patch)
treec294643a3b5f7f6ccee7d331c75e73f245f74e76 /src/libstd
parent0ca9967af75f7a279dcf4921f119b2602b41dd71 (diff)
parent0befab23435fe6490ae2de30378f9bc834fcc1a8 (diff)
downloadrust-5665bdf3e3953a3fe67e047794913a0c88a83bde.tar.gz
rust-5665bdf3e3953a3fe67e047794913a0c88a83bde.zip
Auto merge of #37540 - jonathandturner:rollup, r=jonathandturner
Rollup of 10 pull requests

- Successful merges: #37351, #37405, #37473, #37482, #37488, #37498, #37502, #37513, #37517, #37523
- Failed merges: #37521
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/collections/hash/table.rs4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/libstd/collections/hash/table.rs b/src/libstd/collections/hash/table.rs
index ec0e457dc6a..a784d8e50f9 100644
--- a/src/libstd/collections/hash/table.rs
+++ b/src/libstd/collections/hash/table.rs
@@ -124,10 +124,6 @@ pub struct FullBucket<K, V, M> {
     table: M,
 }
 
-pub type EmptyBucketImm<'table, K, V> = EmptyBucket<K, V, &'table RawTable<K, V>>;
-pub type FullBucketImm<'table, K, V> = FullBucket<K, V, &'table RawTable<K, V>>;
-
-pub type EmptyBucketMut<'table, K, V> = EmptyBucket<K, V, &'table mut RawTable<K, V>>;
 pub type FullBucketMut<'table, K, V> = FullBucket<K, V, &'table mut RawTable<K, V>>;
 
 pub enum BucketState<K, V, M> {