Skip to content

Commit bde2845

Browse files
authored
Update to hashbrown 0.9 (#546)
The behavior of `drain_filter` has changed in this release: rust-lang/hashbrown#186
1 parent 97010af commit bde2845

File tree

8 files changed

+16
-37
lines changed

8 files changed

+16
-37
lines changed

Cargo.lock

Lines changed: 2 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ crossbeam-queue = { version = "0.2.1", default-features = false, features = ["al
1818
either = { version = "1.5.3", default-features = false }
1919
fnv = { git = "https://github.com/dflemstr/rust-fnv", default-features = false } # TODO: https://github.com/servo/rust-fnv/pull/22
2020
futures = { version = "0.3.4", default-features = false }
21-
hashbrown = { version = "0.7.1", default-features = false }
21+
hashbrown = { version = "0.9.0", default-features = false }
2222
nohash-hasher = { version = "0.2.0", default-features = false }
2323
redshirt-core-proc-macros = { path = "../core-proc-macros" }
2424
redshirt-interface-interface = { path = "../interfaces/interface", default-features = false }

interfaces/syscalls/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ edition = "2018"
88
[dependencies]
99
futures = { version = "0.3.1", default-features = false, features = ["alloc"] }
1010
generic-array = { version = "0.13.2", default-features = false }
11-
hashbrown = { version = "0.7.1", default-features = false }
11+
hashbrown = { version = "0.9.0", default-features = false }
1212
lazy_static = { version = "1.4.0", features = ["spin_no_std"] }
1313
nohash-hasher = { version = "0.2.0", default-features = false }
1414
parity-scale-codec = { version = "1.3.0", default-features = false, features = ["derive"] }

kernel/standalone/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ derive_more = "0.99.8"
1414
either = { version = "1.5.3", default-features = false }
1515
fnv = { git = "https://github.com/dflemstr/rust-fnv", default-features = false } # TODO: https://github.com/servo/rust-fnv/pull/22
1616
futures = { version = "0.3.2", default-features = false, features = ["alloc"] }
17-
hashbrown = { version = "0.7.1", default-features = false }
17+
hashbrown = { version = "0.9.0", default-features = false }
1818
lazy_static = "1.4"
1919
libm = "0.2.1"
2020
linked_list_allocator = { version = "0.8.2", features = ["alloc_ref"] }

kernel/standalone/src/arch/x86_64/apic/timers.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ impl futures::task::ArcWake for TimerWaker {
465465
// Remove from `active_timers` all the timers that have fired.
466466
for (_, timer) in shared
467467
.active_timers
468-
.drain_filter(|_, timer| timer.apic_timer_firing_tsc_value.get() > now)
468+
.drain_filter(|_, timer| timer.apic_timer_firing_tsc_value.get() <= now)
469469
{
470470
debug_assert!(timer.apic_timer_firing_tsc_value.get() <= now);
471471
if timer.timer.target_tsc_value.get() <= now {

modules/Cargo.lock

Lines changed: 8 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modules/network-manager/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ publish = false
99
[dependencies]
1010
fnv = { version = "1.0.7", default-features = false }
1111
futures = "0.3"
12-
hashbrown = { version = "0.6.3", default-features = false }
12+
hashbrown = { version = "0.9.0", default-features = false }
1313
log = "0.4"
1414
parity-scale-codec = "1.0.5"
1515
rand = "0.7.3"

modules/pci-printer/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ publish = false
88

99
[dependencies]
1010
fnv = { git = "https://github.com/dflemstr/rust-fnv", default-features = false } # TODO: https://github.com/servo/rust-fnv/pull/22
11-
hashbrown = { version = "0.7.1", default-features = false }
11+
hashbrown = { version = "0.9.0", default-features = false }
1212
lazy_static = "1"
1313
log = "0.4"
1414
redshirt-pci-interface = { path = "../../interfaces/pci" }

0 commit comments

Comments
 (0)