Skip to content

Commit 9370f0f

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 6856b5c + adf06c2 commit 9370f0f

File tree

12 files changed

+1182
-186
lines changed

12 files changed

+1182
-186
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ matrix:
3333
- name: "x86_64-unknown-linux-gnu (stable)"
3434
rust: stable
3535
env: TARGET=x86_64-unknown-linux-gnu
36-
- name: "x86_64-unknown-linux-gnu (Rust 1.32.0)"
37-
rust: 1.32.0
36+
- name: "x86_64-unknown-linux-gnu (Rust 1.36.0)"
37+
rust: 1.36.0
3838
env: TARGET=x86_64-unknown-linux-gnu
3939
- name: "i686-unknown-linux-gnu"
4040
env: TARGET=i686-unknown-linux-gnu CROSS=1

CHANGELOG.md

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,38 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
77

88
## [Unreleased]
99

10+
## [v0.9.1] - 2020-09-28
11+
12+
## Added
13+
- Added safe methods to `RawTable` (#202):
14+
- `get`: `find` and `as_ref`
15+
- `get_mut`: `find` and `as_mut`
16+
- `insert_entry`: `insert` and `as_mut`
17+
- `remove_entry`: `find` and `remove`
18+
- `erase_entry`: `find` and `erase`
19+
20+
## Changed
21+
- Removed `from_key_hashed_nocheck`'s `Q: Hash`. (#200)
22+
- Made `RawTable::drain` safe. (#201)
23+
24+
## [v0.9.0] - 2020-09-03
25+
26+
### Fixed
27+
- `drain_filter` now removes and yields items that do match the predicate,
28+
rather than items that don't. This is a **breaking change** to match the
29+
behavior of the `drain_filter` methods in `std`. (#187)
30+
31+
### Added
32+
- Added `replace_entry_with` to `OccupiedEntry`, and `and_replace_entry_with` to `Entry`. (#190)
33+
- Implemented `FusedIterator` and `size_hint` for `DrainFilter`. (#188)
34+
35+
### Changed
36+
- The minimum Rust version has been bumped to 1.36 (due to `crossbeam` dependency). (#193)
37+
- Updated `ahash` dependency to 0.4. (#198)
38+
- `HashMap::with_hasher` and `HashSet::with_hasher` are now `const fn`. (#195)
39+
- Removed `T: Hash + Eq` and `S: BuildHasher` bounds on `HashSet::new`,
40+
`with_capacity`, `with_hasher`, and `with_capacity_and_hasher`. (#185)
41+
1042
## [v0.8.2] - 2020-08-08
1143

1244
### Changed
@@ -231,7 +263,9 @@ This release was _yanked_ due to a breaking change for users of `no-default-feat
231263

232264
- Initial release
233265

234-
[Unreleased]: https://github.com/rust-lang/hashbrown/compare/v0.8.2...HEAD
266+
[Unreleased]: https://github.com/rust-lang/hashbrown/compare/v0.9.1...HEAD
267+
[v0.9.1]: https://github.com/rust-lang/hashbrown/compare/v0.9.0...v0.9.1
268+
[v0.9.0]: https://github.com/rust-lang/hashbrown/compare/v0.8.2...v0.9.0
235269
[v0.8.2]: https://github.com/rust-lang/hashbrown/compare/v0.8.1...v0.8.2
236270
[v0.8.1]: https://github.com/rust-lang/hashbrown/compare/v0.8.0...v0.8.1
237271
[v0.8.0]: https://github.com/rust-lang/hashbrown/compare/v0.7.2...v0.8.0

Cargo.toml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "hashbrown"
3-
version = "0.8.2"
3+
version = "0.9.1"
44
authors = ["Amanieu d'Antras <amanieu@gmail.com>"]
55
description = "A Rust port of Google's SwissTable hash map"
66
license = "Apache-2.0/MIT"
@@ -10,11 +10,10 @@ keywords = ["hash", "no_std", "hashmap", "swisstable"]
1010
categories = ["data-structures", "no-std"]
1111
exclude = [".travis.yml", "bors.toml", "/ci/*"]
1212
edition = "2018"
13-
build = "build.rs"
1413

1514
[dependencies]
1615
# For the default hasher
17-
ahash = { version = "0.3.2", optional = true, default-features = false }
16+
ahash = { version = "0.4.4", optional = true, default-features = false }
1817

1918
# For external trait impls
2019
rayon = { version = "1.0", optional = true }
@@ -25,9 +24,6 @@ core = { version = "1.0.0", optional = true, package = "rustc-std-workspace-core
2524
compiler_builtins = { version = "0.1.2", optional = true }
2625
alloc = { version = "1.0.0", optional = true, package = "rustc-std-workspace-alloc" }
2726

28-
[build-dependencies]
29-
autocfg = "1"
30-
3127
[dev-dependencies]
3228
lazy_static = "1.2"
3329
rand = { version = "0.7.3", features = ["small_rng"] }

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ hashbrown
44
[![Build Status](https://travis-ci.com/rust-lang/hashbrown.svg?branch=master)](https://travis-ci.com/rust-lang/hashbrown)
55
[![Crates.io](https://img.shields.io/crates/v/hashbrown.svg)](https://crates.io/crates/hashbrown)
66
[![Documentation](https://docs.rs/hashbrown/badge.svg)](https://docs.rs/hashbrown)
7+
[![Rust](https://img.shields.io/badge/rust-1.36.0%2B-blue.svg?maxAge=3600)](https://github.com/rust-lang/hashbrown)
78

89
This crate is a Rust port of Google's high-performance [SwissTable] hash
910
map, adapted to make it a drop-in replacement for Rust's standard `HashMap`
@@ -84,7 +85,7 @@ Add this to your `Cargo.toml`:
8485

8586
```toml
8687
[dependencies]
87-
hashbrown = "0.8"
88+
hashbrown = "0.9"
8889
```
8990

9091
Then:

build.rs

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/lib.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,12 @@
1313
#![cfg_attr(
1414
feature = "nightly",
1515
feature(
16-
alloc_layout_extra,
17-
allocator_api,
18-
ptr_offset_from,
1916
test,
2017
core_intrinsics,
2118
dropck_eyepatch,
2219
min_specialization,
2320
extend_one,
21+
allocator_api
2422
)
2523
)]
2624
#![allow(
@@ -36,11 +34,8 @@
3634
#[macro_use]
3735
extern crate std;
3836

39-
#[cfg(has_extern_crate_alloc)]
4037
#[cfg_attr(test, macro_use)]
4138
extern crate alloc;
42-
#[cfg(not(has_extern_crate_alloc))]
43-
extern crate std as alloc;
4439

4540
#[cfg(feature = "nightly")]
4641
#[cfg(doctest)]

0 commit comments

Comments
 (0)