diff options
| author | bors <bors@rust-lang.org> | 2019-12-11 05:31:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-12-11 05:31:28 +0000 |
| commit | ddca1e09c36a6ce21d95fec1619f23ba59b69c8a (patch) | |
| tree | 1d0ebc98f017b59a3a2a5b00ad2ef48cf894bc1e /src/libstd | |
| parent | a2333023594826dc5078ce7129fafb85471b7857 (diff) | |
| parent | 398ed7fe2e81ee6afe200c1d3faa22c6a51d8457 (diff) | |
| download | rust-ddca1e09c36a6ce21d95fec1619f23ba59b69c8a.tar.gz rust-ddca1e09c36a6ce21d95fec1619f23ba59b69c8a.zip | |
Auto merge of #67202 - JohnTitor:rollup-0xjm5pz, r=JohnTitor
Rollup of 9 pull requests Successful merges: - #66377 (Update RELEASES.md for 1.40.0) - #67134 (Ensure that we get a hard error on generic ZST constants if their bod…) - #67152 (Sort auto trait and blanket implementations display) - #67154 (Fix typos in src/libcore/alloc.rs docs) - #67168 (corrected comment in E0478) - #67178 (Move non clean impls items) - #67180 (doc: Use .copied() instead of .cloned() in Vec example) - #67181 (Update hashmap doc) - #67193 (In which we start tracking polonius in `-Z self-profile`) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/collections/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/collections/mod.rs b/src/libstd/collections/mod.rs index 522b8b25144..e8b9e9cb1f2 100644 --- a/src/libstd/collections/mod.rs +++ b/src/libstd/collections/mod.rs @@ -433,7 +433,7 @@ mod hash; #[stable(feature = "rust1", since = "1.0.0")] pub mod hash_map { - //! A hash map implemented with linear probing and Robin Hood bucket stealing. + //! A hash map implemented with quadratic probing and SIMD lookup. #[stable(feature = "rust1", since = "1.0.0")] pub use super::hash::map::*; } |