Skip to content

Commit 47bc623

Browse files
authored
Merge branch 'master' into fix_doc
2 parents dfe2496 + 5d9988c commit 47bc623

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

.github/workflows/rust.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
thumbv6m-none-eabi,
5151
x86_64-pc-windows-gnu,
5252
]
53-
channel: [1.58.1, nightly]
53+
channel: [1.61.0, nightly]
5454
include:
5555
- os: macos-latest
5656
target: x86_64-apple-darwin
@@ -60,13 +60,13 @@ jobs:
6060
channel: nightly
6161
- os: macos-latest
6262
target: x86_64-apple-darwin
63-
channel: 1.58.1
63+
channel: 1.61.0
6464
- os: windows-latest
6565
target: x86_64-pc-windows-msvc
66-
channel: 1.58.1
66+
channel: 1.61.0
6767
- os: ubuntu-latest
6868
target: x86_64-unknown-linux-gnu
69-
channel: 1.56.1
69+
channel: 1.61.0
7070
- os: ubuntu-latest
7171
target: x86_64-unknown-linux-gnu
7272
channel: beta

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ hashbrown
44
[![Build Status](https://github.com/rust-lang/hashbrown/actions/workflows/rust.yml/badge.svg)](https://github.com/rust-lang/hashbrown/actions)
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.56.1%2B-blue.svg?maxAge=3600)](https://github.com/rust-lang/hashbrown)
7+
[![Rust](https://img.shields.io/badge/rust-1.61.0%2B-blue.svg?maxAge=3600)](https://github.com/rust-lang/hashbrown)
88

99
This crate is a Rust port of Google's high-performance [SwissTable] hash
1010
map, adapted to make it a drop-in replacement for Rust's standard `HashMap`

src/map.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ impl<K, V, S, A: Allocator + Clone> HashMap<K, V, S, A> {
577577
/// map.insert(1, 2);
578578
/// ```
579579
#[cfg_attr(feature = "inline-more", inline)]
580-
pub fn with_hasher_in(hash_builder: S, alloc: A) -> Self {
580+
pub const fn with_hasher_in(hash_builder: S, alloc: A) -> Self {
581581
Self {
582582
hash_builder,
583583
table: RawTable::new_in(alloc),

src/raw/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ impl<T, A: Allocator + Clone> RawTable<T, A> {
426426
/// leave the data pointer dangling since that bucket is never written to
427427
/// due to our load factor forcing us to always have at least 1 free bucket.
428428
#[inline]
429-
pub fn new_in(alloc: A) -> Self {
429+
pub const fn new_in(alloc: A) -> Self {
430430
Self {
431431
table: RawTableInner::new_in(alloc),
432432
marker: PhantomData,

src/set.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ where
551551
/// set.insert(2);
552552
/// ```
553553
#[cfg_attr(feature = "inline-more", inline)]
554-
pub fn with_hasher_in(hasher: S, alloc: A) -> Self {
554+
pub const fn with_hasher_in(hasher: S, alloc: A) -> Self {
555555
Self {
556556
map: HashMap::with_hasher_in(hasher, alloc),
557557
}

0 commit comments

Comments
 (0)