diff options
| author | bors <bors@rust-lang.org> | 2017-06-22 12:48:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-06-22 12:48:54 +0000 |
| commit | 74fa27928aceda1362a2266d9b9bf129999bc00a (patch) | |
| tree | f6885a656b791f657e5ea561d732c91414a9621a /src/libstd | |
| parent | 6f01c84fc8ae1b07d8165ceccb2e432f45a2ff1a (diff) | |
| parent | 7f693e2cb9455fcfbe4de69236abc6a0ef98624b (diff) | |
| download | rust-74fa27928aceda1362a2266d9b9bf129999bc00a.tar.gz rust-74fa27928aceda1362a2266d9b9bf129999bc00a.zip | |
Auto merge of #42824 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
Rollup of 4 pull requests - Successful merges: #42799, #42804, #42805, #42806 - Failed merges:
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/collections/hash/map.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs index 8c4cbb66b45..aef88e3d563 100644 --- a/src/libstd/collections/hash/map.rs +++ b/src/libstd/collections/hash/map.rs @@ -2384,7 +2384,7 @@ impl BuildHasher for RandomState { /// [`Hasher`]: ../../hash/trait.Hasher.html #[stable(feature = "hashmap_default_hasher", since = "1.13.0")] #[allow(deprecated)] -#[derive(Debug)] +#[derive(Clone, Debug)] pub struct DefaultHasher(SipHasher13); impl DefaultHasher { |